diff --git a/Accelerators/Vtkm/vtkmAverageToCells.h b/Accelerators/Vtkm/vtkmAverageToCells.h
index b980262766ac84b63d7303c64b2b6de27d7c5649..f85b502743c30de76cc42d881422fa84084baff2 100644
--- a/Accelerators/Vtkm/vtkmAverageToCells.h
+++ b/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;
diff --git a/Accelerators/Vtkm/vtkmAverageToPoints.h b/Accelerators/Vtkm/vtkmAverageToPoints.h
index 051f9cb3b03d53a8560a01b308fae8014e536939..7934028be9f8c21634a63602571242990eaf4d48 100644
--- a/Accelerators/Vtkm/vtkmAverageToPoints.h
+++ b/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;
diff --git a/Accelerators/Vtkm/vtkmCleanGrid.h b/Accelerators/Vtkm/vtkmCleanGrid.h
index f38cbcaa35d929759eb4713ef373312f5449a4ad..de9e1bcfdd3738fbe6555adc14fe7d8f782e1545 100644
--- a/Accelerators/Vtkm/vtkmCleanGrid.h
+++ b/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;
diff --git a/Accelerators/Vtkm/vtkmClip.h b/Accelerators/Vtkm/vtkmClip.h
index b9a26ee9f42757d7e1960156e16b9fd9448ea6e8..c37ef315fae491056f48dc5e5c98934f7f00cd57 100644
--- a/Accelerators/Vtkm/vtkmClip.h
+++ b/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;
diff --git a/Accelerators/Vtkm/vtkmContour.h b/Accelerators/Vtkm/vtkmContour.h
index 6a414a789fa15bba71a5d57440dd86fe37648e0d..05bd542d00ad77d1e72dbf0b6b117ee4b7fb1122 100644
--- a/Accelerators/Vtkm/vtkmContour.h
+++ b/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;
diff --git a/Accelerators/Vtkm/vtkmExternalFaces.h b/Accelerators/Vtkm/vtkmExternalFaces.h
index c782adef2dafa76adbb7cb8b064d6db4b03b4138..8fe22d24d296ed7f628913e1a502fbd2778cba82 100644
--- a/Accelerators/Vtkm/vtkmExternalFaces.h
+++ b/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 *);
diff --git a/Accelerators/Vtkm/vtkmExtractVOI.h b/Accelerators/Vtkm/vtkmExtractVOI.h
index 8040060e4cfedeed313261c632e849d6bb4167ee..3843ee840629fae0ad5cd4e76247d640146ec5a7 100644
--- a/Accelerators/Vtkm/vtkmExtractVOI.h
+++ b/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;
diff --git a/Accelerators/Vtkm/vtkmGradient.h b/Accelerators/Vtkm/vtkmGradient.h
index 1c78673872938ef607da188eff455b31b4bf84f8..18ace82ce6de1f862461875b21ae8ac78e1cd6a2 100644
--- a/Accelerators/Vtkm/vtkmGradient.h
+++ b/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;
diff --git a/Accelerators/Vtkm/vtkmLevelOfDetail.h b/Accelerators/Vtkm/vtkmLevelOfDetail.h
index a1d4d2f9fdcb8dd59a0a183a1d562915b3751965..567f186c3ef48b329f5aa0cab749aaff71b9b392 100644
--- a/Accelerators/Vtkm/vtkmLevelOfDetail.h
+++ b/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];
diff --git a/Accelerators/Vtkm/vtkmPolyDataNormals.h b/Accelerators/Vtkm/vtkmPolyDataNormals.h
index 573162bdb28a7e502744a40a464eccf415860e56..da710a974f7f0e8ed6f83a366c1059870ff5d9cf 100644
--- a/Accelerators/Vtkm/vtkmPolyDataNormals.h
+++ b/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;
diff --git a/Accelerators/Vtkm/vtkmThreshold.h b/Accelerators/Vtkm/vtkmThreshold.h
index 768e051d2eb91d58d5cb844929da85d43e2ad8e3..d11b1d07a744ae02dc8c0358332f9e72fe9194cc 100644
--- a/Accelerators/Vtkm/vtkmThreshold.h
+++ b/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;
diff --git a/Accelerators/Vtkm/vtkmTriangleMeshPointNormals.h b/Accelerators/Vtkm/vtkmTriangleMeshPointNormals.h
index 529bba3805bf677f03c710d494bc0574e6e72449..99972cb4a39803490968c1d9cc0d5b887e8f0f98 100644
--- a/Accelerators/Vtkm/vtkmTriangleMeshPointNormals.h
+++ b/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;
diff --git a/CMake/vtkObjectFactory.h.in b/CMake/vtkObjectFactory.h.in
index ad8c9a45cdfe3e94a43a4074c926d5e356260304..1db0f552808d7c68eda8bc646f109498c2badaab 100644
--- a/CMake/vtkObjectFactory.h.in
+++ b/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();
diff --git a/Charts/Core/Testing/Cxx/TestContext.cxx b/Charts/Core/Testing/Cxx/TestContext.cxx
index e3537fdc8858844123ccb9dcaabad3c707eab29a..470a02ded32a87ad70710c0f31e9daab2b8a8eec 100644
--- a/Charts/Core/Testing/Cxx/TestContext.cxx
+++ b/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;
};
//----------------------------------------------------------------------------
diff --git a/Charts/Core/Testing/Cxx/TestContextUnicode.cxx b/Charts/Core/Testing/Cxx/TestContextUnicode.cxx
index dd509b37ce7d9fe8cb9667f6fb309064d2eefa31..0150cdb6866861370ce4968fe172c6074849b3b3 100644
--- a/Charts/Core/Testing/Cxx/TestContextUnicode.cxx
+++ b/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;
};
diff --git a/Charts/Core/Testing/Cxx/TestControlPointsItemEvents.cxx b/Charts/Core/Testing/Cxx/TestControlPointsItemEvents.cxx
index 18c20529c8bbe38da9d2aa6fb9407cf0894a4882..4d375f75c7e5b1999c30f7f76d96b86c08e44047 100644
--- a/Charts/Core/Testing/Cxx/TestControlPointsItemEvents.cxx
+++ b/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 );
diff --git a/Charts/Core/Testing/Cxx/TestDiagram.cxx b/Charts/Core/Testing/Cxx/TestDiagram.cxx
index 2dd81ec43a9dcd0351be372c334614780e065e7b..852143d544de38cf8c6049b5b3a88a701cf93785 100644
--- a/Charts/Core/Testing/Cxx/TestDiagram.cxx
+++ b/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;
};
//----------------------------------------------------------------------------
diff --git a/Charts/Core/vtkAxis.h b/Charts/Core/vtkAxis.h
index 387dafdf62eac7a69cb0068d680a67c92a003a0d..4ef88175786bdae6ffe1410fbd75067f94013df2 100644
--- a/Charts/Core/vtkAxis.h
+++ b/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.
diff --git a/Charts/Core/vtkAxisExtended.h b/Charts/Core/vtkAxisExtended.h
index 0278a42f81821c1921c4db3b66e6001d77edc70f..22ee2886a050c47f3e604f99c715ec2cf9239d74 100644
--- a/Charts/Core/vtkAxisExtended.h
+++ b/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.
diff --git a/Charts/Core/vtkCategoryLegend.h b/Charts/Core/vtkCategoryLegend.h
index 276bff84df0b2653a3eef679b13e4506d4f5f92b..a9a9cfdf84a087d845cb0b94bb1e14d1a88b0676 100644
--- a/Charts/Core/vtkCategoryLegend.h
+++ b/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;
diff --git a/Charts/Core/vtkChart.h b/Charts/Core/vtkChart.h
index dfa735e484f25b16d0044c35c170132e758a8562..79ccd8224912789feed484150f03a626d2cf8426 100644
--- a/Charts/Core/vtkChart.h
+++ b/Charts/Core/vtkChart.h
@@ -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
diff --git a/Charts/Core/vtkChartBox.h b/Charts/Core/vtkChartBox.h
index 2bcc1523eb3331a599d3e2042e0b3f13cee7a7c0..75fe180a4788098191a4ca38ec50523b215c5140 100644
--- a/Charts/Core/vtkChartBox.h
+++ b/Charts/Core/vtkChartBox.h
@@ -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;
//@{
/**
diff --git a/Charts/Core/vtkChartHistogram2D.h b/Charts/Core/vtkChartHistogram2D.h
index cc348fff5ba45c04da982024cb0b14f184532b40..15a06b60e1b5e4e433fb96adbbcebcf974de3b1f 100644
--- a/Charts/Core/vtkChartHistogram2D.h
+++ b/Charts/Core/vtkChartHistogram2D.h
@@ -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;
diff --git a/Charts/Core/vtkChartLegend.h b/Charts/Core/vtkChartLegend.h
index 2bef895f325d71fb7dd7c3dacff42aa0b51d6ef8..df36c891a2ef2938da4749eb619ff69ab1968865 100644
--- a/Charts/Core/vtkChartLegend.h
+++ b/Charts/Core/vtkChartLegend.h
@@ -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.
diff --git a/Charts/Core/vtkChartMatrix.h b/Charts/Core/vtkChartMatrix.h
index 7432af634c7c4677bad2dbc92176c6948a05c3e0..ecced45ef94bae3051d25bf0a03bf2dc528a00a7 100644
--- a/Charts/Core/vtkChartMatrix.h
+++ b/Charts/Core/vtkChartMatrix.h
@@ -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;
/**
* Set the width and height of the chart matrix. This will cause an immediate
@@ -149,7 +149,7 @@ public:
protected:
vtkChartMatrix();
- ~vtkChartMatrix() VTK_OVERRIDE;
+ ~vtkChartMatrix() override;
// The number of charts in x and y.
vtkVector2i Size;
diff --git a/Charts/Core/vtkChartParallelCoordinates.h b/Charts/Core/vtkChartParallelCoordinates.h
index faa799d93380a2824cb26b8204a9598526d9b777..1aaa6d51e26f793fca0a8700ca5a1919a8c6441a 100644
--- a/Charts/Core/vtkChartParallelCoordinates.h
+++ b/Charts/Core/vtkChartParallelCoordinates.h
@@ -37,7 +37,7 @@ class VTKCHARTSCORE_EXPORT vtkChartParallelCoordinates : public vtkChart
{
public:
vtkTypeMacro(vtkChartParallelCoordinates, vtkChart);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
/**
* Creates a parallel coordinates 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;
/**
* Set the visibility of the specified column.
@@ -85,28 +85,28 @@ 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 axis specified by axisIndex.
*/
- vtkAxis* GetAxis(int axisIndex) VTK_OVERRIDE;
+ vtkAxis* GetAxis(int axisIndex) override;
/**
* Get the number of axes in the current chart.
*/
- vtkIdType GetNumberOfAxes() VTK_OVERRIDE;
+ vtkIdType GetNumberOfAxes() override;
/**
* Request that the chart recalculates the range of its axes. Especially
* useful in applications after the parameters of plots have been modified.
*/
- void RecalculateBounds() VTK_OVERRIDE;
+ void RecalculateBounds() override;
/**
* Set plot to use for the chart. Since this type of chart can
@@ -117,41 +117,41 @@ 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 enter event.
*/
- bool MouseEnterEvent(const vtkContextMouseEvent &mouse) VTK_OVERRIDE;
+ bool MouseEnterEvent(const vtkContextMouseEvent &mouse) override;
/**
* Mouse move event.
*/
- bool MouseMoveEvent(const vtkContextMouseEvent &mouse) VTK_OVERRIDE;
+ bool MouseMoveEvent(const vtkContextMouseEvent &mouse) override;
/**
* Mouse leave event.
*/
- bool MouseLeaveEvent(const vtkContextMouseEvent &mouse) VTK_OVERRIDE;
+ bool MouseLeaveEvent(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;
/**
* Mouse wheel event, positive delta indicates forward movement of the wheel.
*/
- bool MouseWheelEvent(const vtkContextMouseEvent &mouse, int delta) VTK_OVERRIDE;
+ bool MouseWheelEvent(const vtkContextMouseEvent &mouse, int delta) override;
protected:
vtkChartParallelCoordinates();
- ~vtkChartParallelCoordinates() VTK_OVERRIDE;
+ ~vtkChartParallelCoordinates() override;
//@{
/**
diff --git a/Charts/Core/vtkChartPie.h b/Charts/Core/vtkChartPie.h
index 79991969c2cac539d3af0b9a26fd47e3d957b0fc..1c978342950ba8410a25f09c539afe479d8c933e 100644
--- a/Charts/Core/vtkChartPie.h
+++ b/Charts/Core/vtkChartPie.h
@@ -35,7 +35,7 @@ class VTKCHARTSCORE_EXPORT vtkChartPie : public vtkChart
{
public:
vtkTypeMacro(vtkChartPie, vtkChart);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
/**
* Creates a 2D Chart object.
@@ -47,88 +47,88 @@ 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;
/**
* Add a plot to the chart.
*/
- vtkPlot * AddPlot(int type) VTK_OVERRIDE;
+ vtkPlot * AddPlot(int type) override;
/**
* Add a plot to the chart. Return the index of the plot, -1 if it failed.
*/
- vtkIdType AddPlot(vtkPlot* plot) VTK_OVERRIDE
+ vtkIdType AddPlot(vtkPlot* plot) override
{ return Superclass::AddPlot(plot); }
/**
* 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;
/**
* Set whether the chart should draw a legend.
*/
- void SetShowLegend(bool visible) VTK_OVERRIDE;
+ void SetShowLegend(bool visible) override;
/**
* Get the legend for the chart, if available. Can return nullptr if there is no
* legend.
*/
- vtkChartLegend * GetLegend() VTK_OVERRIDE;
+ vtkChartLegend * GetLegend() override;
/**
* Set the vtkContextScene for the item, always set for an item in a scene.
*/
- void SetScene(vtkContextScene *scene) VTK_OVERRIDE;
+ void SetScene(vtkContextScene *scene) override;
/**
* 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 enter event.
*/
- bool MouseEnterEvent(const vtkContextMouseEvent &mouse) VTK_OVERRIDE;
+ bool MouseEnterEvent(const vtkContextMouseEvent &mouse) override;
/**
* Mouse move event.
*/
- bool MouseMoveEvent(const vtkContextMouseEvent &mouse) VTK_OVERRIDE;
+ bool MouseMoveEvent(const vtkContextMouseEvent &mouse) override;
/**
* Mouse leave event.
*/
- bool MouseLeaveEvent(const vtkContextMouseEvent &mouse) VTK_OVERRIDE;
+ bool MouseLeaveEvent(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;
/**
* Mouse wheel event, positive delta indicates forward movement of the wheel.
*/
- bool MouseWheelEvent(const vtkContextMouseEvent &mouse, int delta) VTK_OVERRIDE;
+ bool MouseWheelEvent(const vtkContextMouseEvent &mouse, int delta) override;
protected:
vtkChartPie();
- ~vtkChartPie() VTK_OVERRIDE;
+ ~vtkChartPie() override;
/**
* Recalculate the necessary transforms.
diff --git a/Charts/Core/vtkChartXY.h b/Charts/Core/vtkChartXY.h
index f8896ecee28d99469f90ab9a84a7adf9bdbf65a2..b928426455e99b0652f8474f043a02f257fd6745 100644
--- a/Charts/Core/vtkChartXY.h
+++ b/Charts/Core/vtkChartXY.h
@@ -44,7 +44,7 @@ class VTKCHARTSCORE_EXPORT vtkChartXY : public vtkChart
{
public:
vtkTypeMacro(vtkChartXY, vtkChart);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Creates a 2D Chart object.
@@ -56,38 +56,38 @@ 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;
/**
* Add a plot to the chart, defaults to using the name of the y column
*/
- vtkPlot* AddPlot(int type) VTK_OVERRIDE;
+ vtkPlot* AddPlot(int type) override;
/**
* Adds a plot to the chart
*/
- vtkIdType AddPlot(vtkPlot* plot) VTK_OVERRIDE;
+ vtkIdType AddPlot(vtkPlot* plot) override;
/**
* Remove the plot at the specified index, returns true if successful,
* false if the index was invalid.
*/
- bool RemovePlot(vtkIdType index) VTK_OVERRIDE;
+ bool RemovePlot(vtkIdType index) override;
/**
* Remove all plots from the chart.
*/
- void ClearPlots() VTK_OVERRIDE;
+ void ClearPlots() 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;
/**
* Get the index of the specified plot, returns -1 if the plot does not
@@ -128,7 +128,7 @@ public:
/**
* Get the number of plots the chart contains.
*/
- vtkIdType GetNumberOfPlots() VTK_OVERRIDE;
+ vtkIdType GetNumberOfPlots() override;
/**
* Figure out which quadrant the plot is in.
@@ -145,17 +145,17 @@ public:
* position enum, valid values are vtkAxis::LEFT, vtkAxis::BOTTOM,
* vtkAxis::RIGHT and vtkAxis::TOP.
*/
- vtkAxis* GetAxis(int axisIndex) VTK_OVERRIDE;
+ vtkAxis* GetAxis(int axisIndex) override;
/**
* Set whether the chart should draw a legend.
*/
- void SetShowLegend(bool visible) VTK_OVERRIDE;
+ void SetShowLegend(bool visible) override;
/**
* Get the vtkChartLegend object that will be displayed by the chart.
*/
- vtkChartLegend* GetLegend() VTK_OVERRIDE;
+ vtkChartLegend* GetLegend() override;
/**
* Set the vtkTooltipItem object that will be displayed by the chart.
@@ -170,13 +170,13 @@ public:
/**
* Get the number of axes in the current chart.
*/
- vtkIdType GetNumberOfAxes() VTK_OVERRIDE;
+ vtkIdType GetNumberOfAxes() override;
/**
* Request that the chart recalculates the range of its axes. Especially
* useful in applications after the parameters of plots have been modified.
*/
- void RecalculateBounds() VTK_OVERRIDE;
+ void RecalculateBounds() override;
/**
* Set the selection method, which controls how selections are handled by the
@@ -185,7 +185,7 @@ public:
* for finer-grained selections specific to each plot, and so to each XY
* column pair.
*/
- void SetSelectionMethod(int method) VTK_OVERRIDE;
+ void SetSelectionMethod(int method) override;
//@{
/**
@@ -291,46 +291,46 @@ 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 enter event.
*/
- bool MouseEnterEvent(const vtkContextMouseEvent& mouse) VTK_OVERRIDE;
+ bool MouseEnterEvent(const vtkContextMouseEvent& mouse) override;
/**
* Mouse move event.
*/
- bool MouseMoveEvent(const vtkContextMouseEvent& mouse) VTK_OVERRIDE;
+ bool MouseMoveEvent(const vtkContextMouseEvent& mouse) override;
/**
* Mouse leave event.
*/
- bool MouseLeaveEvent(const vtkContextMouseEvent& mouse) VTK_OVERRIDE;
+ bool MouseLeaveEvent(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;
/**
* Mouse wheel event, positive delta indicates forward movement of the wheel.
*/
- bool MouseWheelEvent(const vtkContextMouseEvent& mouse, int delta) VTK_OVERRIDE;
+ bool MouseWheelEvent(const vtkContextMouseEvent& mouse, int delta) override;
/**
* Key press event.
*/
- bool KeyPressEvent(const vtkContextKeyEvent& key) VTK_OVERRIDE;
+ bool KeyPressEvent(const vtkContextKeyEvent& key) override;
protected:
vtkChartXY();
- ~vtkChartXY() VTK_OVERRIDE;
+ ~vtkChartXY() override;
/**
* Recalculate the necessary transforms.
diff --git a/Charts/Core/vtkChartXYZ.h b/Charts/Core/vtkChartXYZ.h
index 7e7e9d6f1069e43299553b7823e09d4d077dfe1c..39d56c0d719ad84322dcb590e1f01632ee07357e 100644
--- a/Charts/Core/vtkChartXYZ.h
+++ b/Charts/Core/vtkChartXYZ.h
@@ -46,7 +46,7 @@ class VTKCHARTSCORE_EXPORT vtkChartXYZ : public vtkContextItem
{
public:
vtkTypeMacro(vtkChartXYZ, vtkContextItem);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
static vtkChartXYZ * New();
@@ -107,12 +107,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, called whenever the chart needs to be drawn.
*/
- bool Paint(vtkContext2D *painter) VTK_OVERRIDE;
+ bool Paint(vtkContext2D *painter) override;
/**
* Adds a plot to the chart.
@@ -140,33 +140,33 @@ public:
/**
* Returns true if the transform is interactive, false otherwise.
*/
- bool Hit(const vtkContextMouseEvent &mouse) VTK_OVERRIDE;
+ bool Hit(const vtkContextMouseEvent &mouse) override;
/**
* Mouse press event. Keep track of zoom anchor position.
*/
- bool MouseButtonPressEvent(const vtkContextMouseEvent &mouse) VTK_OVERRIDE;
+ bool MouseButtonPressEvent(const vtkContextMouseEvent &mouse) override;
/**
* Mouse move event. Perform pan or zoom as specified by the mouse bindings.
*/
- bool MouseMoveEvent(const vtkContextMouseEvent &mouse) VTK_OVERRIDE;
+ bool MouseMoveEvent(const vtkContextMouseEvent &mouse) override;
/**
* Mouse wheel event. Zooms in or out.
*/
- bool MouseWheelEvent(const vtkContextMouseEvent &mouse, int delta) VTK_OVERRIDE;
+ bool MouseWheelEvent(const vtkContextMouseEvent &mouse, int delta) override;
/**
* Key press event. This allows the user to snap the chart to one of three
* different 2D views. "x" changes the view so we're looking down the X axis.
* Similar behavior occurs for "y" or "z".
*/
- bool KeyPressEvent(const vtkContextKeyEvent &key) VTK_OVERRIDE;
+ bool KeyPressEvent(const vtkContextKeyEvent &key) override;
protected:
vtkChartXYZ();
- ~vtkChartXYZ() VTK_OVERRIDE;
+ ~vtkChartXYZ() override;
/**
* Calculate the transformation matrices used to draw data points and axes
diff --git a/Charts/Core/vtkColorLegend.h b/Charts/Core/vtkColorLegend.h
index 6fa3d4d1df135b338ff6f8cfd1ea0acb76fc03c1..6db45fc547302612c1771c17d38bc4b94abf69bc 100644
--- a/Charts/Core/vtkColorLegend.h
+++ b/Charts/Core/vtkColorLegend.h
@@ -39,7 +39,7 @@ class VTKCHARTSCORE_EXPORT vtkColorLegend: public vtkChartLegend
{
public:
vtkTypeMacro(vtkColorLegend, vtkChartLegend);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
static vtkColorLegend* New();
/**
@@ -61,14 +61,14 @@ 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 the texture into a rectangle defined by the bounds. If
* MaskAboveCurve is true and a shape has been provided by a subclass, it
* draws the texture into the shape
*/
- bool Paint(vtkContext2D *painter) VTK_OVERRIDE;
+ bool Paint(vtkContext2D *painter) override;
//@{
/**
@@ -82,7 +82,7 @@ public:
/**
* Set the point this legend is anchored to.
*/
- void SetPoint(float x, float y) VTK_OVERRIDE;
+ void SetPoint(float x, float y) override;
/**
* Set the size of the scalar bar drawn by this legend.
@@ -109,7 +109,7 @@ public:
* height being the total width/height required by the axis. In order to
* ensure the numbers are correct, Update() should be called first.
*/
- vtkRectf GetBoundingRect(vtkContext2D* painter) VTK_OVERRIDE;
+ vtkRectf GetBoundingRect(vtkContext2D* painter) override;
//@{
/**
@@ -141,11 +141,11 @@ public:
/**
* Mouse move event.
*/
- bool MouseMoveEvent(const vtkContextMouseEvent &mouse) VTK_OVERRIDE;
+ bool MouseMoveEvent(const vtkContextMouseEvent &mouse) override;
protected:
vtkColorLegend();
- ~vtkColorLegend() VTK_OVERRIDE;
+ ~vtkColorLegend() override;
/**
* Need to be reimplemented by subclasses, ComputeTexture() is called at
diff --git a/Charts/Core/vtkColorTransferControlPointsItem.h b/Charts/Core/vtkColorTransferControlPointsItem.h
index 196932ad327cc21b01fc61ab5916577d03b50e48..e5f24b5f78b52c0ffc32a3094f8444b51da7a07c 100644
--- a/Charts/Core/vtkColorTransferControlPointsItem.h
+++ b/Charts/Core/vtkColorTransferControlPointsItem.h
@@ -37,7 +37,7 @@ class VTKCHARTSCORE_EXPORT vtkColorTransferControlPointsItem: public vtkControlP
{
public:
vtkTypeMacro(vtkColorTransferControlPointsItem, vtkControlPointsItem);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
/**
* Creates a piecewise control points object
@@ -58,35 +58,35 @@ public:
/**
* Return the number of points in the color transfer function.
*/
- vtkIdType GetNumberOfPoints()const VTK_OVERRIDE;
+ vtkIdType GetNumberOfPoints()const override;
/**
* Returns the x and y coordinates as well as the midpoint and sharpness
* of the control point corresponding to the index.
* Note: The y (point[1]) is always 0.5
*/
- void GetControlPoint(vtkIdType index, double *point)const VTK_OVERRIDE;
+ void GetControlPoint(vtkIdType index, double *point)const override;
/**
* Sets the x and y coordinates as well as the midpoint and sharpness
* of the control point corresponding to the index.
* Changing the y has no effect, it will always be 0.5
*/
- void SetControlPoint(vtkIdType index, double *point) VTK_OVERRIDE;
+ void SetControlPoint(vtkIdType index, double *point) override;
/**
* Add a point to the function. Returns the index of the point (0 based),
* or -1 on error.
* Subclasses should reimplement this function to do the actual work.
*/
- vtkIdType AddPoint(double* newPos) VTK_OVERRIDE;
+ vtkIdType AddPoint(double* newPos) override;
/**
* Remove a point of the function. Returns the index of the point (0 based),
* or -1 on error.
* Subclasses should reimplement this function to do the actual work.
*/
- vtkIdType RemovePoint(double* pos) VTK_OVERRIDE;
+ vtkIdType RemovePoint(double* pos) override;
//@{
/**
@@ -100,27 +100,27 @@ public:
protected:
vtkColorTransferControlPointsItem();
- ~vtkColorTransferControlPointsItem() VTK_OVERRIDE;
+ ~vtkColorTransferControlPointsItem() override;
/**
* Returns true if control points are to be rendered in log-space. This is
* true when vtkScalarsToColors is using log-scale, for example. Default
* implementation always return false.
*/
- bool UsingLogScale() VTK_OVERRIDE;
+ bool UsingLogScale() override;
- void emitEvent(unsigned long event, void* params) VTK_OVERRIDE;
+ void emitEvent(unsigned long event, void* params) override;
- vtkMTimeType GetControlPointsMTime() VTK_OVERRIDE;
+ vtkMTimeType GetControlPointsMTime() override;
- void DrawPoint(vtkContext2D* painter, vtkIdType index) VTK_OVERRIDE;
- void EditPoint(float tX, float tY) VTK_OVERRIDE;
+ void DrawPoint(vtkContext2D* painter, vtkIdType index) override;
+ void EditPoint(float tX, float tY) override;
/**
* Compute the bounds for this item. Overridden to use the
* vtkColorTransferFunction range.
*/
- void ComputeBounds(double* bounds) VTK_OVERRIDE;
+ void ComputeBounds(double* bounds) override;
vtkColorTransferFunction* ColorTransferFunction;
diff --git a/Charts/Core/vtkColorTransferFunctionItem.h b/Charts/Core/vtkColorTransferFunctionItem.h
index aaa56bd1f5a737b521d430807d7a7441025b3c4c..30c16f0dfa53c7cd66ab61597e637e55de20d8a8 100644
--- a/Charts/Core/vtkColorTransferFunctionItem.h
+++ b/Charts/Core/vtkColorTransferFunctionItem.h
@@ -30,14 +30,14 @@ class VTKCHARTSCORE_EXPORT vtkColorTransferFunctionItem: public vtkScalarsToColo
public:
static vtkColorTransferFunctionItem* New();
vtkTypeMacro(vtkColorTransferFunctionItem, vtkScalarsToColorsItem);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
void SetColorTransferFunction(vtkColorTransferFunction* t);
vtkGetObjectMacro(ColorTransferFunction, vtkColorTransferFunction);
protected:
vtkColorTransferFunctionItem();
- ~vtkColorTransferFunctionItem() VTK_OVERRIDE;
+ ~vtkColorTransferFunctionItem() override;
// Description:
// Returns true if we are rendering in log space.
@@ -46,9 +46,9 @@ protected:
// Description:
// Reimplemented to return the range of the lookup table
- void ComputeBounds(double bounds[4]) VTK_OVERRIDE;
+ void ComputeBounds(double bounds[4]) override;
- void ComputeTexture() VTK_OVERRIDE;
+ void ComputeTexture() override;
vtkColorTransferFunction* ColorTransferFunction;
private:
vtkColorTransferFunctionItem(const vtkColorTransferFunctionItem&) VTK_DELETE_FUNCTION;
diff --git a/Charts/Core/vtkCompositeControlPointsItem.h b/Charts/Core/vtkCompositeControlPointsItem.h
index 5c2ff620791b9abc6bc88f0d554d70857b1aa2cb..b5f048e13fd152421c2693f0b0f4dc5e45c506eb 100644
--- a/Charts/Core/vtkCompositeControlPointsItem.h
+++ b/Charts/Core/vtkCompositeControlPointsItem.h
@@ -41,7 +41,7 @@ class VTKCHARTSCORE_EXPORT vtkCompositeControlPointsItem:
{
public:
vtkTypeMacro(vtkCompositeControlPointsItem, vtkColorTransferControlPointsItem);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
/**
* Creates a piecewise control points object
@@ -88,14 +88,14 @@ public:
* or -1 on error.
* Subclasses should reimplement this function to do the actual work.
*/
- vtkIdType AddPoint(double* newPos) VTK_OVERRIDE;
+ vtkIdType AddPoint(double* newPos) override;
/**
* Remove a point of the function. Returns the index of the point (0 based),
* or -1 on error.
* Subclasses should reimplement this function to do the actual work.
*/
- vtkIdType RemovePoint(double* pos) VTK_OVERRIDE;
+ vtkIdType RemovePoint(double* pos) override;
//@{
/**
@@ -113,30 +113,30 @@ public:
/**
* Mouse move event. To take care of some special Key stroke
*/
- bool MouseMoveEvent(const vtkContextMouseEvent &mouse) VTK_OVERRIDE;
- bool MouseDoubleClickEvent(const vtkContextMouseEvent &mouse) VTK_OVERRIDE;
- bool MouseButtonPressEvent(const vtkContextMouseEvent &mouse) VTK_OVERRIDE;
+ bool MouseMoveEvent(const vtkContextMouseEvent &mouse) override;
+ bool MouseDoubleClickEvent(const vtkContextMouseEvent &mouse) override;
+ bool MouseButtonPressEvent(const vtkContextMouseEvent &mouse) override;
//@}
protected:
vtkCompositeControlPointsItem();
- ~vtkCompositeControlPointsItem() VTK_OVERRIDE;
+ ~vtkCompositeControlPointsItem() override;
/**
* Returns true if control points are to be rendered in log-space. This is
* true when vtkScalarsToColors is using log-scale, for example.
*/
- bool UsingLogScale() VTK_OVERRIDE;
+ bool UsingLogScale() override;
- void emitEvent(unsigned long event, void* params) VTK_OVERRIDE;
+ void emitEvent(unsigned long event, void* params) override;
- vtkMTimeType GetControlPointsMTime() VTK_OVERRIDE;
+ vtkMTimeType GetControlPointsMTime() override;
- vtkIdType GetNumberOfPoints()const VTK_OVERRIDE;
- void DrawPoint(vtkContext2D* painter, vtkIdType index) VTK_OVERRIDE;
- void GetControlPoint(vtkIdType index, double* pos)const VTK_OVERRIDE;
- void SetControlPoint(vtkIdType index, double *point) VTK_OVERRIDE;
- void EditPoint(float tX, float tY) VTK_OVERRIDE;
+ vtkIdType GetNumberOfPoints()const override;
+ void DrawPoint(vtkContext2D* painter, vtkIdType index) override;
+ void GetControlPoint(vtkIdType index, double* pos)const override;
+ void SetControlPoint(vtkIdType index, double *point) override;
+ void EditPoint(float tX, float tY) override;
virtual void EditPointCurve(vtkIdType idx);
void MergeTransferFunctions();
diff --git a/Charts/Core/vtkCompositeTransferFunctionItem.h b/Charts/Core/vtkCompositeTransferFunctionItem.h
index 5491f5b461577f2923a34c95797ddf604d2c067b..2533cfbc6f2548964eac145289b303da604b2318 100644
--- a/Charts/Core/vtkCompositeTransferFunctionItem.h
+++ b/Charts/Core/vtkCompositeTransferFunctionItem.h
@@ -28,26 +28,26 @@ class VTKCHARTSCORE_EXPORT vtkCompositeTransferFunctionItem: public vtkColorTran
public:
static vtkCompositeTransferFunctionItem* New();
vtkTypeMacro(vtkCompositeTransferFunctionItem, vtkColorTransferFunctionItem);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
void SetOpacityFunction(vtkPiecewiseFunction* opacity);
vtkGetObjectMacro(OpacityFunction, vtkPiecewiseFunction);
protected:
vtkCompositeTransferFunctionItem();
- ~vtkCompositeTransferFunctionItem() VTK_OVERRIDE;
+ ~vtkCompositeTransferFunctionItem() override;
// Description:
// Returns true if we are rendering in log space.
// Since vtkPiecewiseFunction doesn't support log, we show this transfer
// function in non-log space always.
- bool UsingLogScale()VTK_OVERRIDE { return false; }
+ bool UsingLogScale() override { return false; }
// Description:
// Reimplemented to return the range of the piecewise function
- void ComputeBounds(double bounds[4]) VTK_OVERRIDE;
+ void ComputeBounds(double bounds[4]) override;
- void ComputeTexture() VTK_OVERRIDE;
+ void ComputeTexture() override;
vtkPiecewiseFunction* OpacityFunction;
private:
diff --git a/Charts/Core/vtkContextArea.h b/Charts/Core/vtkContextArea.h
index baacf309cf41240415aca9d39134af590cd07421..d73c79f027b54ba841eea23af9c62d56ea27da2c 100644
--- a/Charts/Core/vtkContextArea.h
+++ b/Charts/Core/vtkContextArea.h
@@ -56,7 +56,7 @@ class VTKCHARTSCORE_EXPORT vtkContextArea: public vtkAbstractContextItem
public:
typedef vtkTuple<int, 4> Margins;
vtkTypeMacro(vtkContextArea, vtkAbstractContextItem)
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
static vtkContextArea *New();
@@ -74,7 +74,7 @@ public:
/**
* Paint event for the item, called whenever the item needs to be drawn.
*/
- bool Paint(vtkContext2D *painter) VTK_OVERRIDE;
+ bool Paint(vtkContext2D *painter) override;
//@{
/**
@@ -182,7 +182,7 @@ public:
protected:
vtkContextArea();
- ~vtkContextArea() VTK_OVERRIDE;
+ ~vtkContextArea() override;
/**
* Sync the Axes locations with Geometry, and update the DrawAreaGeometry
diff --git a/Charts/Core/vtkControlPointsItem.h b/Charts/Core/vtkControlPointsItem.h
index efac060fca45921451467a63e9577f6063d376dd..4911cc6e3a36648cc258e93462c1654cfe5e3a63 100644
--- a/Charts/Core/vtkControlPointsItem.h
+++ b/Charts/Core/vtkControlPointsItem.h
@@ -42,7 +42,7 @@ class VTKCHARTSCORE_EXPORT vtkControlPointsItem: public vtkPlot
{
public:
vtkTypeMacro(vtkControlPointsItem, vtkPlot);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
// Events fires by this class (and subclasses).
// \li CurrentPointChangedEvent is fired when the current point index is changed.
@@ -59,7 +59,7 @@ public:
* Bounds of the item, typically the bound of all the control points
* except if custom bounds have been set \sa SetUserBounds.
*/
- void GetBounds(double bounds[4]) VTK_OVERRIDE;
+ void GetBounds(double bounds[4]) override;
//@{
/**
@@ -95,7 +95,7 @@ public:
* on the scene zoom factor. Selected and unselected points are drawn
* with a different color.
*/
- bool Paint(vtkContext2D *painter) VTK_OVERRIDE;
+ bool Paint(vtkContext2D *painter) override;
/**
* Select a point by its ID
@@ -147,7 +147,7 @@ public:
/**
* Select all points in the specified rectangle.
*/
- bool SelectPoints(const vtkVector2f& min, const vtkVector2f& max) VTK_OVERRIDE;
+ bool SelectPoints(const vtkVector2f& min, const vtkVector2f& max) override;
/**
* Return the number of selected points.
@@ -351,21 +351,21 @@ public:
/**
* Mouse button down event.
*/
- bool MouseButtonPressEvent(const vtkContextMouseEvent &mouse) VTK_OVERRIDE;
- bool MouseDoubleClickEvent(const vtkContextMouseEvent &mouse) VTK_OVERRIDE;
+ bool MouseButtonPressEvent(const vtkContextMouseEvent &mouse) override;
+ bool MouseDoubleClickEvent(const vtkContextMouseEvent &mouse) override;
//@}
/**
* Mouse move event.
*/
- bool MouseMoveEvent(const vtkContextMouseEvent &mouse) VTK_OVERRIDE;
+ bool MouseMoveEvent(const vtkContextMouseEvent &mouse) override;
- bool KeyPressEvent(const vtkContextKeyEvent &key) VTK_OVERRIDE;
- bool KeyReleaseEvent(const vtkContextKeyEvent &key) VTK_OVERRIDE;
+ bool KeyPressEvent(const vtkContextKeyEvent &key) override;
+ bool KeyReleaseEvent(const vtkContextKeyEvent &key) override;
protected:
vtkControlPointsItem();
- ~vtkControlPointsItem() VTK_OVERRIDE;
+ ~vtkControlPointsItem() override;
void StartChanges();
void EndChanges();
@@ -390,7 +390,7 @@ protected:
/**
* Returns true if the supplied x, y coordinate is on a control point.
*/
- bool Hit(const vtkContextMouseEvent &mouse) VTK_OVERRIDE;
+ bool Hit(const vtkContextMouseEvent &mouse) override;
//@{
/**
@@ -433,7 +433,7 @@ protected:
/**
* Mouse button release event.
*/
- bool MouseButtonReleaseEvent(const vtkContextMouseEvent &mouse) VTK_OVERRIDE;
+ bool MouseButtonReleaseEvent(const vtkContextMouseEvent &mouse) override;
/**
* Generate label for a control point.
diff --git a/Charts/Core/vtkInteractiveArea.h b/Charts/Core/vtkInteractiveArea.h
index 209f6b728c06d43921025d8bea497950ad31f33e..b85e52994b4ed85307f565b9b0e89387440dc742 100644
--- a/Charts/Core/vtkInteractiveArea.h
+++ b/Charts/Core/vtkInteractiveArea.h
@@ -37,17 +37,17 @@ public:
vtkTypeMacro(vtkInteractiveArea, vtkContextArea)
static vtkInteractiveArea* New();
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
///@{
/**
* \brief vtkAbstractContextItem API
*/
- bool Paint(vtkContext2D *painter) VTK_OVERRIDE;
- bool Hit(const vtkContextMouseEvent& mouse) VTK_OVERRIDE;
- bool MouseWheelEvent(const vtkContextMouseEvent& mouse, int delta) VTK_OVERRIDE;
- bool MouseMoveEvent(const vtkContextMouseEvent &mouse) VTK_OVERRIDE;
- bool MouseButtonPressEvent(const vtkContextMouseEvent &mouse) VTK_OVERRIDE;
+ bool Paint(vtkContext2D *painter) override;
+ bool Hit(const vtkContextMouseEvent& mouse) override;
+ bool MouseWheelEvent(const vtkContextMouseEvent& mouse, int delta) override;
+ bool MouseMoveEvent(const vtkContextMouseEvent &mouse) override;
+ bool MouseButtonPressEvent(const vtkContextMouseEvent &mouse) override;
///@}
protected:
@@ -58,7 +58,7 @@ protected:
/**
* \brief vtkContextArea API
*/
- void SetAxisRange(vtkRectd const& data) VTK_OVERRIDE;
+ void SetAxisRange(vtkRectd const& data) override;
private:
/**
@@ -69,7 +69,7 @@ private:
/**
* Re-computes the transformation expressing the current zoom, panning, etc.
*/
- void ComputeViewTransform() VTK_OVERRIDE;
+ void ComputeViewTransform() override;
void ComputeZoom(vtkVector2d const& origin, vtkVector2d & scale,
vtkVector2d& shift, vtkVector2d& factor);
diff --git a/Charts/Core/vtkLookupTableItem.h b/Charts/Core/vtkLookupTableItem.h
index 08afab379b5c67d6118f81f8b292a31311a6560c..4f242b2953d3df6b03b64a71a54a4a835a9ce195 100644
--- a/Charts/Core/vtkLookupTableItem.h
+++ b/Charts/Core/vtkLookupTableItem.h
@@ -29,21 +29,21 @@ class VTKCHARTSCORE_EXPORT vtkLookupTableItem: public vtkScalarsToColorsItem
public:
static vtkLookupTableItem* New();
vtkTypeMacro(vtkLookupTableItem, vtkScalarsToColorsItem);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
void SetLookupTable(vtkLookupTable* t);
vtkGetObjectMacro(LookupTable, vtkLookupTable);
protected:
vtkLookupTableItem();
- ~vtkLookupTableItem() VTK_OVERRIDE;
+ ~vtkLookupTableItem() override;
// Description:
// Reimplemented to return the range of the lookup table
- void ComputeBounds(double bounds[4]) VTK_OVERRIDE;
+ void ComputeBounds(double bounds[4]) override;
- void ComputeTexture() VTK_OVERRIDE;
+ void ComputeTexture() override;
vtkLookupTable* LookupTable;
private:
diff --git a/Charts/Core/vtkPiecewiseControlPointsItem.h b/Charts/Core/vtkPiecewiseControlPointsItem.h
index 53f507c9ca0939ec6c6098ff5e4473cbaefe9af5..0af77e12298d870d8121a123c1bac3a61b0955df 100644
--- a/Charts/Core/vtkPiecewiseControlPointsItem.h
+++ b/Charts/Core/vtkPiecewiseControlPointsItem.h
@@ -37,7 +37,7 @@ class VTKCHARTSCORE_EXPORT vtkPiecewiseControlPointsItem: public vtkControlPoint
{
public:
vtkTypeMacro(vtkPiecewiseControlPointsItem, vtkControlPointsItem);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
/**
* Creates a piecewise control points object
@@ -60,14 +60,14 @@ public:
* or -1 on error.
* Subclasses should reimplement this function to do the actual work.
*/
- vtkIdType AddPoint(double* newPos) VTK_OVERRIDE;
+ vtkIdType AddPoint(double* newPos) override;
/**
* Remove a point of the function. Returns the index of the point (0 based),
* or -1 on error.
* Subclasses should reimplement this function to do the actual work.
*/
- vtkIdType RemovePoint(double* pos) VTK_OVERRIDE;
+ vtkIdType RemovePoint(double* pos) override;
//@{
/**
@@ -80,16 +80,16 @@ public:
protected:
vtkPiecewiseControlPointsItem();
- ~vtkPiecewiseControlPointsItem() VTK_OVERRIDE;
+ ~vtkPiecewiseControlPointsItem() override;
- void emitEvent(unsigned long event, void* params = nullptr) VTK_OVERRIDE;
+ void emitEvent(unsigned long event, void* params = nullptr) override;
- vtkMTimeType GetControlPointsMTime() VTK_OVERRIDE;
+ vtkMTimeType GetControlPointsMTime() override;
- vtkIdType GetNumberOfPoints()const VTK_OVERRIDE;
- void GetControlPoint(vtkIdType index, double *point)const VTK_OVERRIDE;
- void SetControlPoint(vtkIdType index, double *point) VTK_OVERRIDE;
- void EditPoint(float tX, float tY) VTK_OVERRIDE;
+ vtkIdType GetNumberOfPoints()const override;
+ void GetControlPoint(vtkIdType index, double *point)const override;
+ void SetControlPoint(vtkIdType index, double *point) override;
+ void EditPoint(float tX, float tY) override;
vtkPiecewiseFunction* PiecewiseFunction;
diff --git a/Charts/Core/vtkPiecewiseFunctionItem.h b/Charts/Core/vtkPiecewiseFunctionItem.h
index 65fd35961f9514b2c5a2badb814030bd2d664abf..fa062df92cd66830a33fbf843238a40d0f4ad68c 100644
--- a/Charts/Core/vtkPiecewiseFunctionItem.h
+++ b/Charts/Core/vtkPiecewiseFunctionItem.h
@@ -28,22 +28,22 @@ class VTKCHARTSCORE_EXPORT vtkPiecewiseFunctionItem: public vtkScalarsToColorsIt
public:
static vtkPiecewiseFunctionItem* New();
vtkTypeMacro(vtkPiecewiseFunctionItem, vtkScalarsToColorsItem);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
void SetPiecewiseFunction(vtkPiecewiseFunction* t);
vtkGetObjectMacro(PiecewiseFunction, vtkPiecewiseFunction);
protected:
vtkPiecewiseFunctionItem();
- ~vtkPiecewiseFunctionItem() VTK_OVERRIDE;
+ ~vtkPiecewiseFunctionItem() override;
// Description:
// Reimplemented to return the range of the piecewise function
- void ComputeBounds(double bounds[4]) VTK_OVERRIDE;
+ void ComputeBounds(double bounds[4]) override;
// Description
// Compute the texture from the PiecewiseFunction
- void ComputeTexture() VTK_OVERRIDE;
+ void ComputeTexture() override;
vtkPiecewiseFunction* PiecewiseFunction;
diff --git a/Charts/Core/vtkPiecewisePointHandleItem.h b/Charts/Core/vtkPiecewisePointHandleItem.h
index d79ce74b71fa78d78a883b45686f02a9ff7eb307..829c5406a5629213fc138ed7b407449d0cd49ac4 100644
--- a/Charts/Core/vtkPiecewisePointHandleItem.h
+++ b/Charts/Core/vtkPiecewisePointHandleItem.h
@@ -40,7 +40,7 @@ class VTKCHARTSCORE_EXPORT vtkPiecewisePointHandleItem : public vtkContextItem
{
public:
vtkTypeMacro(vtkPiecewisePointHandleItem, vtkContextItem);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
static vtkPiecewisePointHandleItem *New();
static void CallRedraw(vtkObject* sender, unsigned long event, void* receiver, void* params);
@@ -48,12 +48,12 @@ public:
/**
* Set the parent item, which should be a vtkControlPointItem
*/
- void SetParent(vtkAbstractContextItem *parent) VTK_OVERRIDE;
+ void SetParent(vtkAbstractContextItem *parent) override;
/**
* Paint event for the item.
*/
- bool Paint(vtkContext2D *painter) VTK_OVERRIDE;
+ bool Paint(vtkContext2D *painter) override;
//@{
/**
@@ -80,26 +80,26 @@ public:
/**
* Returns 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:
vtkPiecewisePointHandleItem();
- ~vtkPiecewisePointHandleItem() VTK_OVERRIDE;
+ ~vtkPiecewisePointHandleItem() override;
/**
* Redraw all the handles
diff --git a/Charts/Core/vtkPlot.h b/Charts/Core/vtkPlot.h
index 1e88c0e31d936ac7653be42e0c51283ef99b7ce7..ef398fe48c0aad59e5afe8848c4c75abcc92838c 100644
--- a/Charts/Core/vtkPlot.h
+++ b/Charts/Core/vtkPlot.h
@@ -47,7 +47,7 @@ class VTKCHARTSCORE_EXPORT vtkPlot : public vtkContextItem
{
public:
vtkTypeMacro(vtkPlot, vtkContextItem);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
//@{
/**
@@ -380,7 +380,7 @@ public:
protected:
vtkPlot();
- ~vtkPlot() VTK_OVERRIDE;
+ ~vtkPlot() override;
/**
* Get the properly formatted number for the supplied position and axis.
diff --git a/Charts/Core/vtkPlot3D.h b/Charts/Core/vtkPlot3D.h
index 4e949039bad5d375930d8f062845bc3c6c584971..3567367d801087b2560714062e54119f7aa00434 100644
--- a/Charts/Core/vtkPlot3D.h
+++ b/Charts/Core/vtkPlot3D.h
@@ -45,7 +45,7 @@ class VTKCHARTSCORE_EXPORT vtkPlot3D : public vtkContextItem
{
public:
vtkTypeMacro(vtkPlot3D, vtkContextItem);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
//@{
/**
@@ -129,7 +129,7 @@ public:
protected:
vtkPlot3D();
- ~vtkPlot3D() VTK_OVERRIDE;
+ ~vtkPlot3D() override;
/**
* Generate a bounding cube for our data.
diff --git a/Charts/Core/vtkPlotArea.h b/Charts/Core/vtkPlotArea.h
index 1688d4f3d4e23cc185cd07db57b50ecb5ec45f77..9ecb23f09fed108610c44c187d9cd7f00541a060 100644
--- a/Charts/Core/vtkPlotArea.h
+++ b/Charts/Core/vtkPlotArea.h
@@ -33,7 +33,7 @@ class VTKCHARTSCORE_EXPORT vtkPlotArea : public vtkPlot
public:
static vtkPlotArea* New();
vtkTypeMacro(vtkPlotArea, vtkPlot);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Convenience method to set the input arrays. vtkPlotArea supports the
@@ -49,8 +49,8 @@ public:
* Overridden to set the brush color.
*/
void SetColor(unsigned char r, unsigned char g, unsigned char b,
- unsigned char a) VTK_OVERRIDE;
- void SetColor(double r, double g, double b) VTK_OVERRIDE;
+ unsigned char a) override;
+ void SetColor(double r, double g, double b) override;
//@}
//@{
@@ -64,24 +64,24 @@ public:
/**
* Perform any updates to the item that may be necessary before rendering.
*/
- void Update() VTK_OVERRIDE;
+ void Update() override;
/**
* Get the bounds for this plot as (Xmin, Xmax, Ymin, Ymax).
*/
- void GetBounds(double bounds[4]) VTK_OVERRIDE;
+ void GetBounds(double bounds[4]) override;
/**
* Subclasses that build data caches to speed up painting should override this
* method to update such caches. This is called on each Paint, hence
* subclasses must add checks to avoid rebuilding of cache, unless necessary.
*/
- void UpdateCache() VTK_OVERRIDE;
+ void UpdateCache() override;
/**
* Paint event for the XY plot, called whenever the chart needs to be drawn
*/
- bool Paint(vtkContext2D *painter) VTK_OVERRIDE;
+ bool Paint(vtkContext2D *painter) override;
/**
* Paint legend event for the plot, called whenever the legend needs the
@@ -91,7 +91,7 @@ public:
* by Plots that return more than one label.
*/
bool PaintLegend(vtkContext2D *painter, const vtkRectf& rect,
- int legendIndex) VTK_OVERRIDE;
+ int legendIndex) override;
/**
* Function to query a plot for the nearest point to the specified coordinate.
@@ -100,7 +100,7 @@ public:
*/
vtkIdType GetNearestPoint(const vtkVector2f& point,
const vtkVector2f& tolerance,
- vtkVector2f* location) VTK_OVERRIDE;
+ vtkVector2f* location) override;
/**
* Generate and return the tooltip label string for this plot
@@ -108,11 +108,11 @@ public:
*/
vtkStdString GetTooltipLabel(const vtkVector2d &plotPos,
vtkIdType seriesIndex,
- vtkIdType segmentIndex) VTK_OVERRIDE;
+ vtkIdType segmentIndex) override;
protected:
vtkPlotArea();
- ~vtkPlotArea() VTK_OVERRIDE;
+ ~vtkPlotArea() override;
/**
* Name of the valid point mask array.
diff --git a/Charts/Core/vtkPlotBag.h b/Charts/Core/vtkPlotBag.h
index f10ead0a0fd3828d7990ed7916a3a6eab353bcae..65d83d07b5f3f9b1ba4543cd85839fb64686baee 100644
--- a/Charts/Core/vtkPlotBag.h
+++ b/Charts/Core/vtkPlotBag.h
@@ -42,7 +42,7 @@ class VTKCHARTSCORE_EXPORT vtkPlotBag : public vtkPlotPoints
{
public:
vtkTypeMacro(vtkPlotBag, vtkPlotPoints);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
/**
* Creates a new Bag Plot object.
@@ -54,12 +54,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 XY plot, called whenever the chart needs to be drawn.
*/
- bool Paint(vtkContext2D *painter) VTK_OVERRIDE;
+ bool Paint(vtkContext2D *painter) override;
/**
* Paint legend event for the XY plot, called whenever the legend needs the
@@ -68,13 +68,13 @@ public:
* and 3). The plot can choose how to fill the space supplied.
*/
bool PaintLegend(vtkContext2D *painter, const vtkRectf& rect,
- int legendIndex) VTK_OVERRIDE;
+ int legendIndex) override;
/**
* Get the plot labels. If this array has a length greater than 1 the index
* refers to the stacked objects in the plot. See vtkPlotBar for example.
*/
- vtkStringArray *GetLabels() VTK_OVERRIDE;
+ vtkStringArray *GetLabels() override;
/**
* Generate and return the tooltip label string for this plot
@@ -82,7 +82,7 @@ public:
*/
vtkStdString GetTooltipLabel(const vtkVector2d &plotPos,
vtkIdType seriesIndex,
- vtkIdType segmentIndex) VTK_OVERRIDE;
+ vtkIdType segmentIndex) override;
//@{
/**
@@ -92,9 +92,9 @@ public:
* Inherited method will call the last SetInputData method with default
* paramaters.
*/
- void SetInputData(vtkTable *table) VTK_OVERRIDE;
+ void SetInputData(vtkTable *table) override;
void SetInputData(vtkTable *table, const vtkStdString &yColumn,
- const vtkStdString &densityColumn) VTK_OVERRIDE;
+ const vtkStdString &densityColumn) override;
virtual void SetInputData(vtkTable *table, const vtkStdString &xColumn,
const vtkStdString &yColumn,
const vtkStdString &densityColumn);
@@ -131,7 +131,7 @@ public:
protected:
vtkPlotBag();
- ~vtkPlotBag() VTK_OVERRIDE;
+ ~vtkPlotBag() override;
void UpdateTableCache(vtkDataArray*);
diff --git a/Charts/Core/vtkPlotBar.cxx b/Charts/Core/vtkPlotBar.cxx
index 8bd539f91e6e9b31c10a17b20d4d6e4a377adb66..c65d27b311c5342c73d87dc55dcd39354fccf3f3 100644
--- a/Charts/Core/vtkPlotBar.cxx
+++ b/Charts/Core/vtkPlotBar.cxx
@@ -137,7 +137,7 @@ class vtkPlotBarSegment : public vtkObject {
this->Colors = nullptr;
}
- ~vtkPlotBarSegment() VTK_OVERRIDE
+ ~vtkPlotBarSegment() override
{
delete this->Sorted;
}
diff --git a/Charts/Core/vtkPlotBar.h b/Charts/Core/vtkPlotBar.h
index e6f096afb30583b65249f285deb767b2a9f26e27..e21fdf295bc242b6b03514adb766477dd0ba2870 100644
--- a/Charts/Core/vtkPlotBar.h
+++ b/Charts/Core/vtkPlotBar.h
@@ -43,7 +43,7 @@ class VTKCHARTSCORE_EXPORT vtkPlotBar : public vtkPlot
{
public:
vtkTypeMacro(vtkPlotBar, vtkPlot);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
/**
* Enum of bar chart oritentation types
@@ -61,12 +61,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 XY plot, called whenever the chart needs to be drawn
*/
- bool Paint(vtkContext2D *painter) VTK_OVERRIDE;
+ bool Paint(vtkContext2D *painter) override;
/**
* Paint legend event for the XY plot, called whenever the legend needs the
@@ -75,23 +75,23 @@ public:
* and 3). The plot can choose how to fill the space supplied.
*/
bool PaintLegend(vtkContext2D *painter, const vtkRectf& rect,
- int legendIndex) VTK_OVERRIDE;
+ int legendIndex) override;
//@{
/**
* Set the plot color
*/
void SetColor(unsigned char r, unsigned char g, unsigned char b,
- unsigned char a) VTK_OVERRIDE;
- void SetColor(double r, double g, double b) VTK_OVERRIDE;
- void GetColor(double rgb[3]) VTK_OVERRIDE;
+ unsigned char a) override;
+ void SetColor(double r, double g, double b) override;
+ void GetColor(double rgb[3]) override;
//@}
//@{
/**
* Set the width of the line.
*/
- void SetWidth(float _arg) VTK_OVERRIDE
+ void SetWidth(float _arg) override
{
vtkDebugMacro(<< this->GetClassName() << " (" << this << "): setting Width to " << _arg);
if (this->Width != _arg)
@@ -106,7 +106,7 @@ public:
/**
* Get the width of the line.
*/
- float GetWidth() VTK_OVERRIDE
+ float GetWidth() override
{
vtkDebugMacro(<< this->GetClassName() << " (" << this << "): returning Width of " << this->Width );
return this->Width;
@@ -141,17 +141,17 @@ public:
/**
* Get the bounds for this mapper as (Xmin,Xmax,Ymin,Ymax).
*/
- void GetBounds(double bounds[4]) VTK_OVERRIDE;
+ void GetBounds(double bounds[4]) override;
/**
* Get un-log-scaled bounds for this mapper as (Xmin,Xmax,Ymin,Ymax).
*/
- void GetUnscaledInputBounds(double bounds[4]) VTK_OVERRIDE;
+ void GetUnscaledInputBounds(double bounds[4]) override;
/**
* When used to set additional arrays, stacked bars are created.
*/
- void SetInputArray(int index, const vtkStdString &name) VTK_OVERRIDE;
+ void SetInputArray(int index, const vtkStdString &name) override;
/**
* Set the color series to use if this becomes a stacked bar plot.
@@ -204,7 +204,7 @@ public:
/**
* Get the plot labels.
*/
- vtkStringArray *GetLabels() VTK_OVERRIDE;
+ vtkStringArray *GetLabels() override;
/**
* Set the group name of the bar chart - can be displayed on the X axis.
@@ -222,12 +222,12 @@ public:
*/
vtkStdString GetTooltipLabel(const vtkVector2d &plotPos,
vtkIdType seriesIndex,
- vtkIdType segmentIndex) VTK_OVERRIDE;
+ vtkIdType segmentIndex) override;
/**
* Select all points in the specified rectangle.
*/
- bool SelectPoints(const vtkVector2f& min, const vtkVector2f& max) VTK_OVERRIDE;
+ bool SelectPoints(const vtkVector2f& min, const vtkVector2f& max) override;
/**
* Function to query a plot for the nearest point to the specified coordinate.
@@ -236,7 +236,7 @@ public:
*/
vtkIdType GetNearestPoint(const vtkVector2f& point,
const vtkVector2f& tolerance,
- vtkVector2f* location) VTK_OVERRIDE;
+ vtkVector2f* location) override;
/**
* Function to query a plot for the nearest point to the specified coordinate.
@@ -262,7 +262,7 @@ public:
protected:
vtkPlotBar();
- ~vtkPlotBar() VTK_OVERRIDE;
+ ~vtkPlotBar() override;
/**
* Update the table cache.
diff --git a/Charts/Core/vtkPlotBox.h b/Charts/Core/vtkPlotBox.h
index 7d8a7f884c227ca676688def38fd30ea32778a83..6aa9ecffe8caad3c7246051718fce0cde449c556 100644
--- a/Charts/Core/vtkPlotBox.h
+++ b/Charts/Core/vtkPlotBox.h
@@ -39,7 +39,7 @@ class VTKCHARTSCORE_EXPORT vtkPlotBox : public vtkPlot
{
public:
vtkTypeMacro(vtkPlotBox, vtkPlot);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
/**
* Creates a box plot.
@@ -51,12 +51,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 plot, called whenever the chart needs to be drawn
*/
- bool Paint(vtkContext2D *painter) VTK_OVERRIDE;
+ bool Paint(vtkContext2D *painter) override;
/**
* Paint legend event for the plot, called whenever the legend needs the
@@ -65,15 +65,15 @@ public:
* and 3). The plot can choose how to fill the space supplied.
*/
bool PaintLegend(vtkContext2D *painter, const vtkRectf& rect,
- int legendIndex) VTK_OVERRIDE;
+ int legendIndex) override;
//@{
/**
* This is a convenience function to set the input table.
*/
- void SetInputData(vtkTable *table) VTK_OVERRIDE;
+ void SetInputData(vtkTable *table) override;
void SetInputData(vtkTable *table, const vtkStdString&,
- const vtkStdString&) VTK_OVERRIDE
+ const vtkStdString&) override
{
this->SetInputData(table);
}
@@ -83,7 +83,7 @@ public:
* Get the plot labels. If this array has a length greater than 1 the index
* refers to the stacked objects in the plot.
*/
- vtkStringArray *GetLabels() VTK_OVERRIDE;
+ vtkStringArray *GetLabels() override;
/**
* Function to query a plot for the nearest point to the specified coordinate.
@@ -92,7 +92,7 @@ public:
*/
vtkIdType GetNearestPoint(const vtkVector2f& point,
const vtkVector2f& tolerance,
- vtkVector2f* location) VTK_OVERRIDE;
+ vtkVector2f* location) override;
//@{
/**
@@ -130,7 +130,7 @@ public:
protected:
vtkPlotBox();
- ~vtkPlotBox() VTK_OVERRIDE;
+ ~vtkPlotBox() override;
void DrawBoxPlot(int, unsigned char*, double, vtkContext2D*);
diff --git a/Charts/Core/vtkPlotFunctionalBag.h b/Charts/Core/vtkPlotFunctionalBag.h
index 30b59e153322fe0d77fd0e1dcc5a7747126d941f..88c896097b77f728ff4109c5bc10f6b9b545f2b3 100644
--- a/Charts/Core/vtkPlotFunctionalBag.h
+++ b/Charts/Core/vtkPlotFunctionalBag.h
@@ -46,7 +46,7 @@ class VTKCHARTSCORE_EXPORT vtkPlotFunctionalBag : public vtkPlot
{
public:
vtkTypeMacro(vtkPlotFunctionalBag, vtkPlot);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
/**
* Creates a functional bag plot object.
@@ -62,19 +62,19 @@ public:
/**
* Reimplemented to enforce visibility when selected.
*/
- bool GetVisible() VTK_OVERRIDE;
+ bool GetVisible() override;
/**
* Perform any updates to the item that may be necessary before rendering.
* 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 plot, called whenever the chart needs to be drawn.
*/
- bool Paint(vtkContext2D *painter) VTK_OVERRIDE;
+ bool Paint(vtkContext2D *painter) override;
/**
* Paint legend event for the plot, called whenever the legend needs the
@@ -83,18 +83,18 @@ public:
* and 3). The plot can choose how to fill the space supplied.
*/
bool PaintLegend(vtkContext2D *painter, const vtkRectf& rect,
- int legendIndex) VTK_OVERRIDE;
+ int legendIndex) override;
/**
* Get the bounds for this plot as (Xmin, Xmax, Ymin, Ymax).
*/
- void GetBounds(double bounds[4]) VTK_OVERRIDE;
+ void GetBounds(double bounds[4]) override;
/**
* Get the non-log-scaled bounds on chart inputs for this plot as
* (Xmin, Xmax, Ymin, Ymax).
*/
- void GetUnscaledInputBounds(double bounds[4]) VTK_OVERRIDE;
+ void GetUnscaledInputBounds(double bounds[4]) override;
//@{
/**
@@ -117,21 +117,21 @@ public:
*/
vtkIdType GetNearestPoint(const vtkVector2f& point,
const vtkVector2f& tolerance,
- vtkVector2f* location) VTK_OVERRIDE;
+ vtkVector2f* location) override;
/**
* Select all points in the specified rectangle.
*/
- bool SelectPoints(const vtkVector2f& min, const vtkVector2f& max) VTK_OVERRIDE;
+ bool SelectPoints(const vtkVector2f& min, const vtkVector2f& max) override;
/**
* Select all points in the specified polygon.
*/
- bool SelectPointsInPolygon(const vtkContextPolygon &polygon) VTK_OVERRIDE;
+ bool SelectPointsInPolygon(const vtkContextPolygon &polygon) override;
protected:
vtkPlotFunctionalBag();
- ~vtkPlotFunctionalBag() VTK_OVERRIDE;
+ ~vtkPlotFunctionalBag() override;
/**
* Populate the data arrays ready to operate on input data.
diff --git a/Charts/Core/vtkPlotGrid.h b/Charts/Core/vtkPlotGrid.h
index 12de49d8bac30a32e0f2dbeb7ac598ac291dba52..58a9d1cc202cd563345f72baa7408adf74007af0 100644
--- a/Charts/Core/vtkPlotGrid.h
+++ b/Charts/Core/vtkPlotGrid.h
@@ -39,7 +39,7 @@ class VTKCHARTSCORE_EXPORT vtkPlotGrid : public vtkContextItem
{
public:
vtkTypeMacro(vtkPlotGrid, vtkContextItem);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
/**
* Creates a 2D Chart object.
@@ -59,11 +59,11 @@ public:
/**
* Paint event for the axis, called whenever the axis needs to be drawn
*/
- bool Paint(vtkContext2D *painter) VTK_OVERRIDE;
+ bool Paint(vtkContext2D *painter) override;
protected:
vtkPlotGrid();
- ~vtkPlotGrid() VTK_OVERRIDE;
+ ~vtkPlotGrid() override;
//@{
/**
diff --git a/Charts/Core/vtkPlotHistogram2D.h b/Charts/Core/vtkPlotHistogram2D.h
index 6fa0c8912b397a8d6be38806bf1f6d98183d1ae4..aab26e7417a1e10d956ece1e2933674f73289329 100644
--- a/Charts/Core/vtkPlotHistogram2D.h
+++ b/Charts/Core/vtkPlotHistogram2D.h
@@ -36,7 +36,7 @@ class VTKCHARTSCORE_EXPORT vtkPlotHistogram2D : public vtkPlot
{
public:
vtkTypeMacro(vtkPlotHistogram2D, vtkPlot);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
/**
* Creates a new object.
@@ -48,12 +48,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 item, called whenever it needs to be drawn.
*/
- bool Paint(vtkContext2D *painter) VTK_OVERRIDE;
+ bool Paint(vtkContext2D *painter) override;
/**
* Set the input, we are expecting a vtkImageData with just one component,
@@ -61,8 +61,8 @@ public:
* functions as a double to generate a color.
*/
virtual void SetInputData(vtkImageData *data, vtkIdType z = 0);
- void SetInputData(vtkTable*)VTK_OVERRIDE { }
- void SetInputData(vtkTable*, const vtkStdString&, const vtkStdString&)VTK_OVERRIDE { }
+ void SetInputData(vtkTable*) override { }
+ void SetInputData(vtkTable*, const vtkStdString&, const vtkStdString&) override { }
/**
* Get the input table used by the plot.
@@ -80,7 +80,7 @@ public:
*/
vtkScalarsToColors * GetTransferFunction();
- void GetBounds(double bounds[4]) VTK_OVERRIDE;
+ void GetBounds(double bounds[4]) override;
virtual void SetPosition(const vtkRectf& pos);
virtual vtkRectf GetPosition();
@@ -105,7 +105,7 @@ public:
*/
vtkStdString GetTooltipLabel(const vtkVector2d &plotPos,
vtkIdType seriesIndex,
- vtkIdType segmentIndex) VTK_OVERRIDE;
+ vtkIdType segmentIndex) override;
/**
* Function to query a plot for the nearest point to the specified coordinate.
@@ -117,11 +117,11 @@ public:
*/
vtkIdType GetNearestPoint(const vtkVector2f& point,
const vtkVector2f& tolerance,
- vtkVector2f* location) VTK_OVERRIDE;
+ vtkVector2f* location) override;
protected:
vtkPlotHistogram2D();
- ~vtkPlotHistogram2D() VTK_OVERRIDE;
+ ~vtkPlotHistogram2D() override;
/**
* Where all the magic happens...
diff --git a/Charts/Core/vtkPlotLine.h b/Charts/Core/vtkPlotLine.h
index 660fbfce1a0f8b20e73bffd239c8ea619e3ac8c6..b2a4422655405084ecfd536e64615304c10ff22e 100644
--- a/Charts/Core/vtkPlotLine.h
+++ b/Charts/Core/vtkPlotLine.h
@@ -32,7 +32,7 @@ class VTKCHARTSCORE_EXPORT vtkPlotLine : public vtkPlotPoints
{
public:
vtkTypeMacro(vtkPlotLine, vtkPlotPoints);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
/**
* Creates a 2D Chart object.
@@ -42,7 +42,7 @@ public:
/**
* Paint event for the XY plot, called whenever the chart needs to be drawn.
*/
- bool Paint(vtkContext2D *painter) VTK_OVERRIDE;
+ bool Paint(vtkContext2D *painter) override;
/**
* Paint legend event for the XY plot, called whenever the legend needs the
@@ -51,7 +51,7 @@ public:
* and 3). The plot can choose how to fill the space supplied.
*/
bool PaintLegend(vtkContext2D *painter, const vtkRectf& rect,
- int legendIndex) VTK_OVERRIDE;
+ int legendIndex) override;
//@{
/**
@@ -68,7 +68,7 @@ public:
protected:
vtkPlotLine();
- ~vtkPlotLine() VTK_OVERRIDE;
+ ~vtkPlotLine() override;
/**
* Poly line (true) or line segments(false).
diff --git a/Charts/Core/vtkPlotLine3D.h b/Charts/Core/vtkPlotLine3D.h
index 792431e875efff14e752b9f8992df8da1880ea12..9376950a7dd2b9b068dedbae730217c39b4c4074 100644
--- a/Charts/Core/vtkPlotLine3D.h
+++ b/Charts/Core/vtkPlotLine3D.h
@@ -38,7 +38,7 @@ class VTKCHARTSCORE_EXPORT vtkPlotLine3D : public vtkPlotPoints3D
{
public:
vtkTypeMacro(vtkPlotLine3D, vtkPlotPoints3D);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
/**
* Creates a 3D Chart object.
@@ -48,11 +48,11 @@ public:
/**
* Paint event for the XYZ plot, called whenever the chart needs to be drawn.
*/
- bool Paint(vtkContext2D *painter) VTK_OVERRIDE;
+ bool Paint(vtkContext2D *painter) override;
protected:
vtkPlotLine3D();
- ~vtkPlotLine3D() VTK_OVERRIDE;
+ ~vtkPlotLine3D() override;
private:
vtkPlotLine3D(const vtkPlotLine3D &) VTK_DELETE_FUNCTION;
diff --git a/Charts/Core/vtkPlotParallelCoordinates.h b/Charts/Core/vtkPlotParallelCoordinates.h
index a869ddd69253fb0a6c6ab630739e530646e5a98f..7818baa326833b36c2880ea0e1aa8c3c19b3e3c1 100644
--- a/Charts/Core/vtkPlotParallelCoordinates.h
+++ b/Charts/Core/vtkPlotParallelCoordinates.h
@@ -40,7 +40,7 @@ class VTKCHARTSCORE_EXPORT vtkPlotParallelCoordinates : public vtkPlot
{
public:
vtkTypeMacro(vtkPlotParallelCoordinates, vtkPlot);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
/**
* Creates a parallel coordinates chart
@@ -52,12 +52,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 XY plot, called whenever the chart needs to be drawn
*/
- bool Paint(vtkContext2D *painter) VTK_OVERRIDE;
+ bool Paint(vtkContext2D *painter) override;
/**
* Paint legend event for the XY plot, called whenever the legend needs the
@@ -66,12 +66,12 @@ public:
* and 3). The plot can choose how to fill the space supplied.
*/
bool PaintLegend(vtkContext2D *painter, const vtkRectf& rect,
- int legendIndex) VTK_OVERRIDE;
+ int legendIndex) override;
/**
* Get the bounds for this mapper as (Xmin,Xmax,Ymin,Ymax,Zmin,Zmax).
*/
- void GetBounds(double bounds[4]) VTK_OVERRIDE;
+ void GetBounds(double bounds[4]) override;
/**
* Set the selection criteria on the given axis in normalized space (0.0 - 1.0).
@@ -87,9 +87,9 @@ public:
/**
* This is a convenience function to set the input table.
*/
- void SetInputData(vtkTable *table) VTK_OVERRIDE;
+ void SetInputData(vtkTable *table) override;
void SetInputData(vtkTable *table, const vtkStdString&,
- const vtkStdString&) VTK_OVERRIDE
+ const vtkStdString&) override
{
this->SetInputData(table);
}
@@ -135,7 +135,7 @@ public:
protected:
vtkPlotParallelCoordinates();
- ~vtkPlotParallelCoordinates() VTK_OVERRIDE;
+ ~vtkPlotParallelCoordinates() override;
/**
* Update the table cache.
diff --git a/Charts/Core/vtkPlotPie.h b/Charts/Core/vtkPlotPie.h
index 17d29a4955eccb93d16d0b1780fef788237c61df..8e654ba2cd5c94d830059b090cb4bdba5cbb6ca0 100644
--- a/Charts/Core/vtkPlotPie.h
+++ b/Charts/Core/vtkPlotPie.h
@@ -37,14 +37,14 @@ class VTKCHARTSCORE_EXPORT vtkPlotPie : public vtkPlot
{
public:
vtkTypeMacro(vtkPlotPie, vtkPlot);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
static vtkPlotPie *New();
/**
* Paint event for the item.
*/
- bool Paint(vtkContext2D *painter) VTK_OVERRIDE;
+ bool Paint(vtkContext2D *painter) override;
/**
* Paint legend event for the XY plot, called whenever the legend needs the
@@ -52,7 +52,7 @@ public:
* corner of the rect (elements 0 and 1) and with width x height (elements 2
* and 3). The plot can choose how to fill the space supplied.
*/
- bool PaintLegend(vtkContext2D *painter, const vtkRectf& rect, int legendIndex) VTK_OVERRIDE;
+ bool PaintLegend(vtkContext2D *painter, const vtkRectf& rect, int legendIndex) override;
/**
* Set the dimensions of the pie, arguments 1 and 2 are the x and y coordinate
@@ -91,11 +91,11 @@ public:
*/
vtkIdType GetNearestPoint(const vtkVector2f& point,
const vtkVector2f& tolerance,
- vtkVector2f* location) VTK_OVERRIDE;
+ vtkVector2f* location) override;
protected:
vtkPlotPie();
- ~vtkPlotPie() VTK_OVERRIDE;
+ ~vtkPlotPie() override;
/**
* Update the table cache.
diff --git a/Charts/Core/vtkPlotPoints.h b/Charts/Core/vtkPlotPoints.h
index 615e760493b4ecc0377140f716655b81a471c62a..147a20d1a388f1689e254ab0a5efa262723cc7b8 100644
--- a/Charts/Core/vtkPlotPoints.h
+++ b/Charts/Core/vtkPlotPoints.h
@@ -51,7 +51,7 @@ class VTKCHARTSCORE_EXPORT vtkPlotPoints : public vtkPlot
{
public:
vtkTypeMacro(vtkPlotPoints, vtkPlot);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
/**
* Creates a 2D Chart object.
@@ -63,12 +63,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 XY plot, called whenever the chart needs to be drawn
*/
- bool Paint(vtkContext2D *painter) VTK_OVERRIDE;
+ bool Paint(vtkContext2D *painter) override;
/**
* Paint legend event for the XY plot, called whenever the legend needs the
@@ -77,17 +77,17 @@ public:
* and 3). The plot can choose how to fill the space supplied.
*/
bool PaintLegend(vtkContext2D *painter, const vtkRectf& rect,
- int legendIndex) VTK_OVERRIDE;
+ int legendIndex) override;
/**
* Get the bounds for this plot as (Xmin, Xmax, Ymin, Ymax).
*/
- void GetBounds(double bounds[4]) VTK_OVERRIDE;
+ void GetBounds(double bounds[4]) override;
/**
* Get the non-log-scaled bounds on chart inputs for this plot as (Xmin, Xmax, Ymin, Ymax).
*/
- void GetUnscaledInputBounds(double bounds[4]) VTK_OVERRIDE;
+ void GetUnscaledInputBounds(double bounds[4]) override;
//@{
/**
@@ -134,17 +134,17 @@ public:
*/
vtkIdType GetNearestPoint(const vtkVector2f& point,
const vtkVector2f& tolerance,
- vtkVector2f* location) VTK_OVERRIDE;
+ vtkVector2f* location) override;
/**
* Select all points in the specified rectangle.
*/
- bool SelectPoints(const vtkVector2f& min, const vtkVector2f& max) VTK_OVERRIDE;
+ bool SelectPoints(const vtkVector2f& min, const vtkVector2f& max) override;
/**
* Select all points in the specified polygon.
*/
- bool SelectPointsInPolygon(const vtkContextPolygon &polygon) VTK_OVERRIDE;
+ bool SelectPointsInPolygon(const vtkContextPolygon &polygon) override;
/**
* Enum containing various marker styles that can be used in a plot.
@@ -186,7 +186,7 @@ public:
protected:
vtkPlotPoints();
- ~vtkPlotPoints() VTK_OVERRIDE;
+ ~vtkPlotPoints() override;
/**
* Populate the data arrays ready to operate on input data.
diff --git a/Charts/Core/vtkPlotPoints3D.h b/Charts/Core/vtkPlotPoints3D.h
index 615f0ee06636d346cbac9eafca9691b455253eef..48a8e3b85de74c4e10aa5b891972c91541ff78ed 100644
--- a/Charts/Core/vtkPlotPoints3D.h
+++ b/Charts/Core/vtkPlotPoints3D.h
@@ -38,17 +38,17 @@ class VTKCHARTSCORE_EXPORT vtkPlotPoints3D : public vtkPlot3D
{
public:
vtkTypeMacro(vtkPlotPoints3D, vtkPlot3D);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
static vtkPlotPoints3D * New();
/**
* Paint event for the XY plot, called whenever the chart needs to be drawn
*/
- bool Paint(vtkContext2D *painter) VTK_OVERRIDE;
+ bool Paint(vtkContext2D *painter) override;
protected:
vtkPlotPoints3D();
- ~vtkPlotPoints3D() VTK_OVERRIDE;
+ ~vtkPlotPoints3D() override;
/**
* The selected points.
diff --git a/Charts/Core/vtkPlotStacked.h b/Charts/Core/vtkPlotStacked.h
index 6bd656971557200598477a79b058b85b2ab0cd58..f55f15b4261b2a0817d8a91456699b43ee124a80 100644
--- a/Charts/Core/vtkPlotStacked.h
+++ b/Charts/Core/vtkPlotStacked.h
@@ -42,7 +42,7 @@ class VTKCHARTSCORE_EXPORT vtkPlotStacked : public vtkPlot
{
public:
vtkTypeMacro(vtkPlotStacked, vtkPlot);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
/**
* Creates a Stacked Plot Object
@@ -54,9 +54,9 @@ public:
* Set the plot color
*/
void SetColor(unsigned char r, unsigned char g, unsigned char b,
- unsigned char a) VTK_OVERRIDE;
- void SetColor(double r, double g, double b) VTK_OVERRIDE;
- void GetColor(double rgb[3]) VTK_OVERRIDE;
+ unsigned char a) override;
+ void SetColor(double r, double g, double b) override;
+ void GetColor(double rgb[3]) override;
//@}
/**
@@ -64,12 +64,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 Stacked plot, called whenever the chart needs to be drawn
*/
- bool Paint(vtkContext2D *painter) VTK_OVERRIDE;
+ bool Paint(vtkContext2D *painter) override;
/**
* Paint legend event for the Stacked plot, called whenever the legend needs the
@@ -78,23 +78,23 @@ public:
* and 3). The plot can choose how to fill the space supplied.
*/
bool PaintLegend(vtkContext2D *painter, const vtkRectf& rect,
- int legendIndex) VTK_OVERRIDE;
+ int legendIndex) override;
/**
* Get the bounds for this mapper as (Xmin,Xmax,Ymin,Ymax).
*/
- void GetBounds(double bounds[4]) VTK_OVERRIDE;
+ void GetBounds(double bounds[4]) override;
/**
* Get the unscaled input bounds for this mapper as (Xmin,Xmax,Ymin,Ymax).
* See vtkPlot for more information.
*/
- void GetUnscaledInputBounds(double bounds[4]) VTK_OVERRIDE;
+ void GetUnscaledInputBounds(double bounds[4]) override;
/**
* When used to set additional arrays, stacked bars are created.
*/
- void SetInputArray(int index, const vtkStdString &name) VTK_OVERRIDE;
+ void SetInputArray(int index, const vtkStdString &name) override;
/**
* Set the color series to use if this becomes a stacked bar plot.
@@ -109,7 +109,7 @@ public:
/**
* Get the plot labels.
*/
- vtkStringArray *GetLabels() VTK_OVERRIDE;
+ vtkStringArray *GetLabels() override;
/**
* Function to query a plot for the nearest point to the specified coordinate.
@@ -118,16 +118,16 @@ public:
*/
vtkIdType GetNearestPoint(const vtkVector2f& point,
const vtkVector2f& tolerance,
- vtkVector2f* location) VTK_OVERRIDE;
+ vtkVector2f* location) override;
/**
* Select all points in the specified rectangle.
*/
- bool SelectPoints(const vtkVector2f& min, const vtkVector2f& max) VTK_OVERRIDE;
+ bool SelectPoints(const vtkVector2f& min, const vtkVector2f& max) override;
protected:
vtkPlotStacked();
- ~vtkPlotStacked() VTK_OVERRIDE;
+ ~vtkPlotStacked() override;
/**
* Update the table cache.
diff --git a/Charts/Core/vtkPlotSurface.h b/Charts/Core/vtkPlotSurface.h
index 64efa308676d129d922a7a08e0f237e266223321..207677742c02112ee113b661016de7fde6c68299 100644
--- a/Charts/Core/vtkPlotSurface.h
+++ b/Charts/Core/vtkPlotSurface.h
@@ -37,18 +37,18 @@ class VTKCHARTSCORE_EXPORT vtkPlotSurface : public vtkPlot3D
{
public:
vtkTypeMacro(vtkPlotSurface, vtkPlot3D);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
static vtkPlotSurface * New();
/**
* Paint event for the XY plot, called whenever the chart needs to be drawn
*/
- bool Paint(vtkContext2D *painter) VTK_OVERRIDE;
+ bool Paint(vtkContext2D *painter) override;
/**
* Set the input to the surface plot.
*/
- void SetInputData(vtkTable *input) VTK_OVERRIDE;
+ void SetInputData(vtkTable *input) override;
//@{
/**
@@ -58,13 +58,13 @@ public:
*/
void SetInputData(vtkTable *input, const vtkStdString &xName,
const vtkStdString &yName,
- const vtkStdString &zName) VTK_OVERRIDE;
+ const vtkStdString &zName) override;
void SetInputData(vtkTable *input, const vtkStdString &xName,
const vtkStdString &yName,
const vtkStdString &zName,
- const vtkStdString &colorName) VTK_OVERRIDE;
+ const vtkStdString &colorName) override;
void SetInputData(vtkTable *input, vtkIdType xColumn,
- vtkIdType yColumn, vtkIdType zColumn) VTK_OVERRIDE;
+ vtkIdType yColumn, vtkIdType zColumn) override;
//@}
/**
@@ -85,7 +85,7 @@ public:
protected:
vtkPlotSurface();
- ~vtkPlotSurface() VTK_OVERRIDE;
+ ~vtkPlotSurface() override;
/**
* Generate a surface (for OpenGL) from our list of points.
diff --git a/Charts/Core/vtkScalarsToColorsItem.h b/Charts/Core/vtkScalarsToColorsItem.h
index d68e651b3357d04dcd79522c8b0e3b823e54d766..a847294147b27ac022a9637b741e16a10b73cdc3 100644
--- a/Charts/Core/vtkScalarsToColorsItem.h
+++ b/Charts/Core/vtkScalarsToColorsItem.h
@@ -41,13 +41,13 @@ class VTKCHARTSCORE_EXPORT vtkScalarsToColorsItem: public vtkPlot
{
public:
vtkTypeMacro(vtkScalarsToColorsItem, vtkPlot);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
/**
* Bounds of the item, use the UserBounds if valid otherwise compute
* the bounds of the item (based on the transfer function range).
*/
- void GetBounds(double bounds[4]) VTK_OVERRIDE;
+ void GetBounds(double bounds[4]) override;
//@{
/**
@@ -64,7 +64,7 @@ public:
* MaskAboveCurve is true and a shape has been provided by a subclass, it
* draws the texture into the shape
*/
- bool Paint(vtkContext2D *painter) VTK_OVERRIDE;
+ bool Paint(vtkContext2D *painter) override;
//@{
/**
@@ -89,7 +89,7 @@ public:
protected:
vtkScalarsToColorsItem();
- ~vtkScalarsToColorsItem() VTK_OVERRIDE;
+ ~vtkScalarsToColorsItem() override;
/**
* Bounds of the item, by default (0, 1, 0, 1) but it depends on the
diff --git a/Charts/Core/vtkScatterPlotMatrix.h b/Charts/Core/vtkScatterPlotMatrix.h
index 3dcb7babd30627e67a43923fe69328c39ae52af7..94b9d40abd2b4cd2b1b11f973223b4f7391a0a8b 100644
--- a/Charts/Core/vtkScatterPlotMatrix.h
+++ b/Charts/Core/vtkScatterPlotMatrix.h
@@ -53,7 +53,7 @@ public:
};
vtkTypeMacro(vtkScatterPlotMatrix, vtkChartMatrix);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
/**
* Creates a new object.
@@ -63,14 +63,14 @@ 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;
- void SetScene(vtkContextScene *scene) VTK_OVERRIDE;
+ void SetScene(vtkContextScene *scene) override;
/**
* Set the active plot, the one that will be displayed in the top-right.
@@ -82,7 +82,7 @@ public:
/**
* Reset ActivePlotSet flag and call superclass method
*/
- void SetSize(const vtkVector2i& size) VTK_OVERRIDE;
+ void SetSize(const vtkVector2i& size) override;
/**
* Get the position of the active plot.
@@ -163,22 +163,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;
//@{
/**
@@ -408,7 +408,7 @@ public:
protected:
vtkScatterPlotMatrix();
- ~vtkScatterPlotMatrix() VTK_OVERRIDE;
+ ~vtkScatterPlotMatrix() override;
/**
* Internal helper to do the layout of the charts in the scatter plot matrix.
diff --git a/Common/Color/vtkColorSeries.h b/Common/Color/vtkColorSeries.h
index 8ae2f97cd5f303e6b918cf2b1acc6efa8a910861..c6b6ae884214dc33b7ac65178e34d9e1de13bb49 100644
--- a/Common/Color/vtkColorSeries.h
+++ b/Common/Color/vtkColorSeries.h
@@ -52,7 +52,7 @@ class VTKCOMMONCOLOR_EXPORT vtkColorSeries : public vtkObject
{
public:
vtkTypeMacro(vtkColorSeries, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Create a new vtkColorSeries with the SPECTRUM color scheme.
@@ -313,7 +313,7 @@ enum LUTMode {
protected:
vtkColorSeries();
- ~vtkColorSeries() VTK_OVERRIDE;
+ ~vtkColorSeries() override;
/**
* If the current scheme is a predefined (read-only) scheme,
diff --git a/Common/Color/vtkNamedColors.h b/Common/Color/vtkNamedColors.h
index b7f2f8c7bb9a77a0d9dd741b0b5bf63d4de85151..776b8c6bbe2ea61f923a03baa4040ada7c4c8544 100644
--- a/Common/Color/vtkNamedColors.h
+++ b/Common/Color/vtkNamedColors.h
@@ -89,7 +89,7 @@ public:
* (use Print() instead) but used in the hierarchical print
* process to combine the output of several classes.
*/
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Create a new vtkNamedColors object.
@@ -391,7 +391,7 @@ public:
protected:
vtkNamedColors();
- ~vtkNamedColors() VTK_OVERRIDE;
+ ~vtkNamedColors() override;
private:
//@{
diff --git a/Common/ComputationalGeometry/vtkCardinalSpline.h b/Common/ComputationalGeometry/vtkCardinalSpline.h
index e5f048c3c1e486ec4ed29d63501c250fa3480139..910b4d20f22cee9907d49355eebbd6b6e88b500f 100644
--- a/Common/ComputationalGeometry/vtkCardinalSpline.h
+++ b/Common/ComputationalGeometry/vtkCardinalSpline.h
@@ -37,26 +37,26 @@ public:
static vtkCardinalSpline *New();
vtkTypeMacro(vtkCardinalSpline,vtkSpline);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Compute Cardinal Splines for each dependent variable
*/
- void Compute () VTK_OVERRIDE;
+ void Compute () override;
/**
* Evaluate a 1D cardinal spline.
*/
- double Evaluate (double t) VTK_OVERRIDE;
+ double Evaluate (double t) override;
/**
* Deep copy of cardinal spline data.
*/
- void DeepCopy(vtkSpline *s) VTK_OVERRIDE;
+ void DeepCopy(vtkSpline *s) override;
protected:
vtkCardinalSpline();
- ~vtkCardinalSpline() VTK_OVERRIDE {}
+ ~vtkCardinalSpline() override {}
void Fit1D (int n, double *x, double *y, double *w, double coefficients[][4],
int leftConstraint, double leftValue, int rightConstraint,
diff --git a/Common/ComputationalGeometry/vtkKochanekSpline.h b/Common/ComputationalGeometry/vtkKochanekSpline.h
index 542ebb283c600f305e841185488156ff739269cd..20299754a979f15287147abef2ddb50f5198a1ef 100644
--- a/Common/ComputationalGeometry/vtkKochanekSpline.h
+++ b/Common/ComputationalGeometry/vtkKochanekSpline.h
@@ -52,7 +52,7 @@ class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkKochanekSpline : public vtkSpline
{
public:
vtkTypeMacro(vtkKochanekSpline,vtkSpline);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct a KochanekSpline with the following defaults: DefaultBias = 0,
@@ -63,12 +63,12 @@ public:
/**
* Compute Kochanek Spline coefficients.
*/
- void Compute () VTK_OVERRIDE;
+ void Compute () override;
/**
* Evaluate a 1D Kochanek spline.
*/
- double Evaluate (double t) VTK_OVERRIDE;
+ double Evaluate (double t) override;
//@{
/**
@@ -97,11 +97,11 @@ public:
/**
* Deep copy of cardinal spline data.
*/
- void DeepCopy(vtkSpline *s) VTK_OVERRIDE;
+ void DeepCopy(vtkSpline *s) override;
protected:
vtkKochanekSpline();
- ~vtkKochanekSpline() VTK_OVERRIDE {}
+ ~vtkKochanekSpline() override {}
void Fit1D (int n, double *x, double *y, double tension, double bias,
double continuity, double coefficients[][4], int leftConstraint,
diff --git a/Common/ComputationalGeometry/vtkParametricBohemianDome.h b/Common/ComputationalGeometry/vtkParametricBohemianDome.h
index e1d382ba73ed43bed5bffcb404633b8ebb98e7a7..d4640811d39607fcc5d825b1d59c34d320057ade 100644
--- a/Common/ComputationalGeometry/vtkParametricBohemianDome.h
+++ b/Common/ComputationalGeometry/vtkParametricBohemianDome.h
@@ -37,7 +37,7 @@ class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkParametricBohemianDome :
public:
vtkTypeMacro(vtkParametricBohemianDome, vtkParametricFunction);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -64,7 +64,7 @@ class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkParametricBohemianDome :
/**
* Return the parametric dimension of the class.
*/
- int GetDimension() VTK_OVERRIDE {return 2;}
+ int GetDimension() override {return 2;}
/**
* BohemianDome surface.
@@ -74,18 +74,18 @@ class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkParametricBohemianDome :
* \f$Pt = (x, y, z), D_u\vec{f} = (dx/du, dy/du, dz/du), D_v\vec{f} = (dx/dv, dy/dv, dz/dv)\f$ .
* Then the normal is \f$N = D_u\vec{f} \times D_v\vec{f}\f$ .
*/
- void Evaluate(double uvw[3], double Pt[3], double Duvw[9]) VTK_OVERRIDE;
+ void Evaluate(double uvw[3], double Pt[3], double Duvw[9]) override;
/**
* Calculate a user defined scalar using one or all of uvw, Pt, Duvw.
* This method simply returns 0.
*/
double EvaluateScalar(double uvw[3], double Pt[3],
- double Duvw[9]) VTK_OVERRIDE;
+ double Duvw[9]) override;
protected:
vtkParametricBohemianDome();
- ~vtkParametricBohemianDome() VTK_OVERRIDE;
+ ~vtkParametricBohemianDome() override;
// Variables
double A;
diff --git a/Common/ComputationalGeometry/vtkParametricBour.h b/Common/ComputationalGeometry/vtkParametricBour.h
index 9be02d0f3fcc430ef7f8c6f4ec1d19fc28e2ad29..f700a2fd9c2eb401fd8d10d92a7753f3772a0f02 100644
--- a/Common/ComputationalGeometry/vtkParametricBour.h
+++ b/Common/ComputationalGeometry/vtkParametricBour.h
@@ -35,7 +35,7 @@ class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkParametricBour : public
public:
vtkTypeMacro(vtkParametricBour, vtkParametricFunction);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct Bour's minimal surface with the following parameters:
@@ -51,7 +51,7 @@ class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkParametricBour : public
/**
* Return the parametric dimension of the class.
*/
- int GetDimension() VTK_OVERRIDE {return 2;}
+ int GetDimension() override {return 2;}
/**
* Bour's minimal surface.
@@ -61,18 +61,18 @@ class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkParametricBour : public
* \f$Pt = (x, y, z), D_u\vec{f} = (dx/du, dy/du, dz/du), D_v\vec{f} = (dx/dv, dy/dv, dz/dv)\f$ .
* Then the normal is \f$N = D_u\vec{f} \times D_v\vec{f}\f$ .
*/
- void Evaluate(double uvw[3], double Pt[3], double Duvw[9]) VTK_OVERRIDE;
+ void Evaluate(double uvw[3], double Pt[3], double Duvw[9]) override;
/**
* Calculate a user defined scalar using one or all of uvw, Pt, Duvw.
* This method simply returns 0.
*/
double EvaluateScalar(double uvw[3], double Pt[3],
- double Duvw[9]) VTK_OVERRIDE;
+ double Duvw[9]) override;
protected:
vtkParametricBour();
- ~vtkParametricBour() VTK_OVERRIDE;
+ ~vtkParametricBour() override;
private:
vtkParametricBour(const vtkParametricBour&) VTK_DELETE_FUNCTION;
diff --git a/Common/ComputationalGeometry/vtkParametricBoy.h b/Common/ComputationalGeometry/vtkParametricBoy.h
index 9c2ba758aceaa4445ee2e7a3a826a17b262c974d..e3a200faee1a9edd1951f2490c5e8f5e4d87ac15 100644
--- a/Common/ComputationalGeometry/vtkParametricBoy.h
+++ b/Common/ComputationalGeometry/vtkParametricBoy.h
@@ -42,7 +42,7 @@ class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkParametricBoy : public
public:
vtkTypeMacro(vtkParametricBoy, vtkParametricFunction);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct Boy's surface with the following parameters:
@@ -59,7 +59,7 @@ class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkParametricBoy : public
/**
* Return the parametric dimension of the class.
*/
- int GetDimension() VTK_OVERRIDE {return 2;}
+ int GetDimension() override {return 2;}
//@{
/**
@@ -78,7 +78,7 @@ class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkParametricBoy : public
* \f$Pt = (x, y, z), Du = (dx/du, dy/du, dz/du), Dv = (dx/dv, dy/dv, dz/dv)\f$ .
* Then the normal is \f$N = Du X Dv\f$ .
*/
- void Evaluate(double uvw[3], double Pt[3], double Duvw[9]) VTK_OVERRIDE;
+ void Evaluate(double uvw[3], double Pt[3], double Duvw[9]) override;
/**
* Calculate a user defined scalar using one or all of uvw, Pt, Duvw.
@@ -94,11 +94,11 @@ class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkParametricBoy : public
* instantiated function should return zero.
*/
double EvaluateScalar(double uvw[3], double Pt[3],
- double Duvw[9]) VTK_OVERRIDE;
+ double Duvw[9]) override;
protected:
vtkParametricBoy();
- ~vtkParametricBoy() VTK_OVERRIDE;
+ ~vtkParametricBoy() override;
// Variables
double ZScale;
diff --git a/Common/ComputationalGeometry/vtkParametricCatalanMinimal.h b/Common/ComputationalGeometry/vtkParametricCatalanMinimal.h
index 6b4abf93a76457a9651e8bfc6eec04f4db19e5b5..179c625ba75dd956bb625720aa8da66a16989a1a 100644
--- a/Common/ComputationalGeometry/vtkParametricCatalanMinimal.h
+++ b/Common/ComputationalGeometry/vtkParametricCatalanMinimal.h
@@ -36,7 +36,7 @@ class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT
public:
vtkTypeMacro(vtkParametricCatalanMinimal, vtkParametricFunction);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct Catalan's minimal surface with the following parameters:
@@ -52,7 +52,7 @@ class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT
/**
* Return the parametric dimension of the class.
*/
- int GetDimension() VTK_OVERRIDE {return 2;}
+ int GetDimension() override {return 2;}
/**
* Catalan's minimal surface.
@@ -62,18 +62,18 @@ class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT
* \f$Pt = (x, y, z), D_u\vec{f} = (dx/du, dy/du, dz/du), D_v\vec{f} = (dx/dv, dy/dv, dz/dv)\f$ .
* Then the normal is \f$N = D_u\vec{f} \times D_v\vec{f}\f$ .
*/
- void Evaluate(double uvw[3], double Pt[3], double Duvw[9]) VTK_OVERRIDE;
+ void Evaluate(double uvw[3], double Pt[3], double Duvw[9]) override;
/**
* Calculate a user defined scalar using one or all of uvw, Pt, Duvw.
* This method simply returns 0.
*/
double EvaluateScalar(double uvw[3], double Pt[3],
- double Duvw[9]) VTK_OVERRIDE;
+ double Duvw[9]) override;
protected:
vtkParametricCatalanMinimal();
- ~vtkParametricCatalanMinimal() VTK_OVERRIDE;
+ ~vtkParametricCatalanMinimal() override;
private:
vtkParametricCatalanMinimal(const vtkParametricCatalanMinimal&) VTK_DELETE_FUNCTION;
diff --git a/Common/ComputationalGeometry/vtkParametricConicSpiral.h b/Common/ComputationalGeometry/vtkParametricConicSpiral.h
index 3663c94a4e9213d78656b5082381b1edda770f8e..15485bdc90b182cb7367ccb3b72729092d3560ed 100644
--- a/Common/ComputationalGeometry/vtkParametricConicSpiral.h
+++ b/Common/ComputationalGeometry/vtkParametricConicSpiral.h
@@ -40,7 +40,7 @@ class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkParametricConicSpiral :
{
public:
vtkTypeMacro(vtkParametricConicSpiral, vtkParametricFunction);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct a conic spiral surface with the following parameters:
@@ -57,7 +57,7 @@ class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkParametricConicSpiral :
/**
* Return the parametric dimension of the class.
*/
- int GetDimension() VTK_OVERRIDE {return 2;}
+ int GetDimension() override {return 2;}
//@{
/**
@@ -106,7 +106,7 @@ class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkParametricConicSpiral :
* \f$Pt = (x, y, z), Du = (dx/du, dy/du, dz/du), Dv = (dx/dv, dy/dv, dz/dv)\f$ .
* Then the normal is \f$N = Du X Dv\f$ .
*/
- void Evaluate(double uvw[3], double Pt[3], double Duvw[9]) VTK_OVERRIDE;
+ void Evaluate(double uvw[3], double Pt[3], double Duvw[9]) override;
/**
* Calculate a user defined scalar using one or all of uvw, Pt, Duvw.
@@ -122,11 +122,11 @@ class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkParametricConicSpiral :
* instantiated function should return zero.
*/
double EvaluateScalar(double uvw[3], double Pt[3],
- double Duvw[9]) VTK_OVERRIDE;
+ double Duvw[9]) override;
protected:
vtkParametricConicSpiral();
- ~vtkParametricConicSpiral() VTK_OVERRIDE;
+ ~vtkParametricConicSpiral() override;
// Variables
double A;
diff --git a/Common/ComputationalGeometry/vtkParametricCrossCap.h b/Common/ComputationalGeometry/vtkParametricCrossCap.h
index 87f5a8c6fcf9c6cad754d0a472d6ec284f33f83c..88065bf5ea06797c07a23ff4a9d39d1604b8b089 100644
--- a/Common/ComputationalGeometry/vtkParametricCrossCap.h
+++ b/Common/ComputationalGeometry/vtkParametricCrossCap.h
@@ -42,7 +42,7 @@ class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkParametricCrossCap :
public:
vtkTypeMacro(vtkParametricCrossCap, vtkParametricFunction);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct a cross-cap with the following parameters:
@@ -58,7 +58,7 @@ class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkParametricCrossCap :
/**
* Return the parametric dimension of the class.
*/
- int GetDimension() VTK_OVERRIDE {return 2;}
+ int GetDimension() override {return 2;}
/**
* A cross-cap.
@@ -68,7 +68,7 @@ class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkParametricCrossCap :
* \f$Pt = (x, y, z), Du = (dx/du, dy/du, dz/du), Dv = (dx/dv, dy/dv, dz/dv)\f$ .
* Then the normal is \f$N = Du X Dv\f$ .
*/
- void Evaluate(double uvw[3], double Pt[3], double Duvw[9]) VTK_OVERRIDE;
+ void Evaluate(double uvw[3], double Pt[3], double Duvw[9]) override;
/**
* Calculate a user defined scalar using one or all of uvw, Pt, Duvw.
@@ -84,11 +84,11 @@ class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkParametricCrossCap :
* instantiated function should return zero.
*/
double EvaluateScalar(double uvw[3], double Pt[3],
- double Duvw[9]) VTK_OVERRIDE;
+ double Duvw[9]) override;
protected:
vtkParametricCrossCap();
- ~vtkParametricCrossCap() VTK_OVERRIDE;
+ ~vtkParametricCrossCap() override;
private:
vtkParametricCrossCap(const vtkParametricCrossCap&) VTK_DELETE_FUNCTION;
diff --git a/Common/ComputationalGeometry/vtkParametricDini.h b/Common/ComputationalGeometry/vtkParametricDini.h
index 4ea036db85e111301b3ddb647c13ac7397bedf97..60292235223488e664b177ef7c5c13a164e1af54 100644
--- a/Common/ComputationalGeometry/vtkParametricDini.h
+++ b/Common/ComputationalGeometry/vtkParametricDini.h
@@ -42,7 +42,7 @@ class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkParametricDini : public
public:
vtkTypeMacro(vtkParametricDini, vtkParametricFunction);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct Dini's surface with the following parameters:
@@ -59,7 +59,7 @@ class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkParametricDini : public
/**
* Return the parametric dimension of the class.
*/
- int GetDimension() VTK_OVERRIDE {return 2;}
+ int GetDimension() override {return 2;}
//@{
/**
@@ -89,7 +89,7 @@ class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkParametricDini : public
* \f$Pt = (x, y, z), Du = (dx/du, dy/du, dz/du), Dv = (dx/dv, dy/dv, dz/dv)\f$ .
* Then the normal is \f$N = Du X Dv\f$ .
*/
- void Evaluate(double uvw[3], double Pt[3], double Duvw[9]) VTK_OVERRIDE;
+ void Evaluate(double uvw[3], double Pt[3], double Duvw[9]) override;
/**
* Calculate a user defined scalar using one or all of uvw, Pt, Duvw.
@@ -105,11 +105,11 @@ class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkParametricDini : public
* instantiated function should return zero.
*/
double EvaluateScalar(double uvw[3], double Pt[3],
- double Duvw[9]) VTK_OVERRIDE;
+ double Duvw[9]) override;
protected:
vtkParametricDini();
- ~vtkParametricDini() VTK_OVERRIDE;
+ ~vtkParametricDini() override;
// Variables
double A;
diff --git a/Common/ComputationalGeometry/vtkParametricEllipsoid.h b/Common/ComputationalGeometry/vtkParametricEllipsoid.h
index 98bcadd0f7d2a3136ae490053ec482eb758eafa9..ec3b196cae7045568339720be08557abd1e14eba 100644
--- a/Common/ComputationalGeometry/vtkParametricEllipsoid.h
+++ b/Common/ComputationalGeometry/vtkParametricEllipsoid.h
@@ -44,7 +44,7 @@ class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkParametricEllipsoid :
{
public:
vtkTypeMacro(vtkParametricEllipsoid, vtkParametricFunction);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct an ellipsoid with the following parameters:
@@ -62,7 +62,7 @@ class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkParametricEllipsoid :
/**
* Return the parametric dimension of the class.
*/
- int GetDimension() VTK_OVERRIDE {return 2;}
+ int GetDimension() override {return 2;}
//@{
/**
@@ -96,7 +96,7 @@ class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkParametricEllipsoid :
* \f$Pt = (x, y, z), Du = (dx/du, dy/du, dz/du), Dv = (dx/dv, dy/dv, dz/dv)\f$ .
* Then the normal is \f$N = Du X Dv\f$ .
*/
- void Evaluate(double uvw[3], double Pt[3], double Duvw[9]) VTK_OVERRIDE;
+ void Evaluate(double uvw[3], double Pt[3], double Duvw[9]) override;
/**
* Calculate a user defined scalar using one or all of uvw, Pt, Duvw.
@@ -112,11 +112,11 @@ class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkParametricEllipsoid :
* instantiated function should return zero.
*/
double EvaluateScalar(double uvw[3], double Pt[3],
- double Duvw[9]) VTK_OVERRIDE;
+ double Duvw[9]) override;
protected:
vtkParametricEllipsoid();
- ~vtkParametricEllipsoid() VTK_OVERRIDE;
+ ~vtkParametricEllipsoid() override;
// Variables
double XRadius;
diff --git a/Common/ComputationalGeometry/vtkParametricEnneper.h b/Common/ComputationalGeometry/vtkParametricEnneper.h
index 46cf91e4d6ed5b86081d2c8dcb6adb211dc099f7..dbed4bb002bee5a9817256cceb154c2cb67ae2e2 100644
--- a/Common/ComputationalGeometry/vtkParametricEnneper.h
+++ b/Common/ComputationalGeometry/vtkParametricEnneper.h
@@ -42,7 +42,7 @@ class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkParametricEnneper :
public:
vtkTypeMacro(vtkParametricEnneper, vtkParametricFunction);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct Enneper's surface with the following parameters:
@@ -58,7 +58,7 @@ class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkParametricEnneper :
/**
* Return the parametric dimension of the class.
*/
- int GetDimension() VTK_OVERRIDE {return 2;}
+ int GetDimension() override {return 2;}
/**
* Enneper's surface.
@@ -68,7 +68,7 @@ class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkParametricEnneper :
* \f$Pt = (x, y, z), Du = (dx/du, dy/du, dz/du), Dv = (dx/dv, dy/dv, dz/dv)\f$ .
* Then the normal is \f$N = Du X Dv\f$ .
*/
- void Evaluate(double uvw[3], double Pt[3], double Duvw[9]) VTK_OVERRIDE;
+ void Evaluate(double uvw[3], double Pt[3], double Duvw[9]) override;
/**
* Calculate a user defined scalar using one or all of uvw, Pt, Duvw.
@@ -84,11 +84,11 @@ class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkParametricEnneper :
* instantiated function should return zero.
*/
double EvaluateScalar(double uvw[3], double Pt[3],
- double Duvw[9]) VTK_OVERRIDE;
+ double Duvw[9]) override;
protected:
vtkParametricEnneper();
- ~vtkParametricEnneper() VTK_OVERRIDE;
+ ~vtkParametricEnneper() override;
private:
vtkParametricEnneper(const vtkParametricEnneper&) VTK_DELETE_FUNCTION;
diff --git a/Common/ComputationalGeometry/vtkParametricFigure8Klein.h b/Common/ComputationalGeometry/vtkParametricFigure8Klein.h
index 2b1823c7e0e642fbea46ebc9fbab473c365fa756..a180206a2f0491846d0e9f76982437e0397aecfa 100644
--- a/Common/ComputationalGeometry/vtkParametricFigure8Klein.h
+++ b/Common/ComputationalGeometry/vtkParametricFigure8Klein.h
@@ -48,7 +48,7 @@ class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkParametricFigure8Klein :
{
public:
vtkTypeMacro(vtkParametricFigure8Klein, vtkParametricFunction);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct a figure-8 Klein Bottle with the following parameters:
@@ -73,7 +73,7 @@ class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkParametricFigure8Klein :
/**
* Return the parametric dimension of the class.
*/
- int GetDimension() VTK_OVERRIDE {return 2;}
+ int GetDimension() override {return 2;}
/**
* A Figure-8 Klein bottle.
@@ -83,7 +83,7 @@ class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkParametricFigure8Klein :
* \f$Pt = (x, y, z), Du = (dx/du, dy/du, dz/du), Dv = (dx/dv, dy/dv, dz/dv)\f$ .
* Then the normal is \f$N = Du X Dv\f$ .
*/
- void Evaluate(double uvw[3], double Pt[3], double Duvw[9]) VTK_OVERRIDE;
+ void Evaluate(double uvw[3], double Pt[3], double Duvw[9]) override;
/**
* Calculate a user defined scalar using one or all of uvw, Pt, Duvw.
@@ -99,11 +99,11 @@ class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkParametricFigure8Klein :
* instantiated function should return zero.
*/
double EvaluateScalar(double uvw[3], double Pt[3],
- double Duvw[9]) VTK_OVERRIDE;
+ double Duvw[9]) override;
protected:
vtkParametricFigure8Klein();
- ~vtkParametricFigure8Klein() VTK_OVERRIDE;
+ ~vtkParametricFigure8Klein() override;
// Variables
double Radius;
diff --git a/Common/ComputationalGeometry/vtkParametricFunction.h b/Common/ComputationalGeometry/vtkParametricFunction.h
index 4fdc5d8bafef37496d423f32fdf63797ae0a422d..a1af73e5039d3c35b08d2b1661b273d1d68250c0 100644
--- a/Common/ComputationalGeometry/vtkParametricFunction.h
+++ b/Common/ComputationalGeometry/vtkParametricFunction.h
@@ -63,7 +63,7 @@ class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkParametricFunction : public vtkOb
{
public:
vtkTypeMacro(vtkParametricFunction, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Return the dimension of parametric space. Depending on the dimension,
@@ -239,7 +239,7 @@ public:
protected:
vtkParametricFunction();
- ~vtkParametricFunction() VTK_OVERRIDE;
+ ~vtkParametricFunction() override;
// Variables
double MinimumU;
diff --git a/Common/ComputationalGeometry/vtkParametricHenneberg.h b/Common/ComputationalGeometry/vtkParametricHenneberg.h
index e0197a140e9829fc0d14bbdd1aec853afc771e87..b1695fe105103914b54e3221a2ccb98f0b47a569 100644
--- a/Common/ComputationalGeometry/vtkParametricHenneberg.h
+++ b/Common/ComputationalGeometry/vtkParametricHenneberg.h
@@ -35,7 +35,7 @@ class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkParametricHenneberg :
public:
vtkTypeMacro(vtkParametricHenneberg, vtkParametricFunction);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct Henneberg's minimal surface with the following parameters:
@@ -51,7 +51,7 @@ class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkParametricHenneberg :
/**
* Return the parametric dimension of the class.
*/
- int GetDimension() VTK_OVERRIDE {return 2;}
+ int GetDimension() override {return 2;}
/**
* Henneberg's minimal surface.
@@ -61,18 +61,18 @@ class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkParametricHenneberg :
* \f$Pt = (x, y, z), D_u\vec{f} = (dx/du, dy/du, dz/du), D_v\vec{f} = (dx/dv, dy/dv, dz/dv)\f$ .
* Then the normal is \f$N = D_u\vec{f} \times D_v\vec{f}\f$ .
*/
- void Evaluate(double uvw[3], double Pt[3], double Duvw[9]) VTK_OVERRIDE;
+ void Evaluate(double uvw[3], double Pt[3], double Duvw[9]) override;
/**
* Calculate a user defined scalar using one or all of uvw, Pt, Duvw.
* This method simply returns 0.
*/
double EvaluateScalar(double uvw[3], double Pt[3],
- double Duvw[9]) VTK_OVERRIDE;
+ double Duvw[9]) override;
protected:
vtkParametricHenneberg();
- ~vtkParametricHenneberg() VTK_OVERRIDE;
+ ~vtkParametricHenneberg() override;
private:
vtkParametricHenneberg(const vtkParametricHenneberg&) VTK_DELETE_FUNCTION;
diff --git a/Common/ComputationalGeometry/vtkParametricKlein.h b/Common/ComputationalGeometry/vtkParametricKlein.h
index 96e6e529e0c916459119b84fc13ab864d28edd45..961cff9aa1d3864edc42803d6192d746577cebda 100644
--- a/Common/ComputationalGeometry/vtkParametricKlein.h
+++ b/Common/ComputationalGeometry/vtkParametricKlein.h
@@ -48,7 +48,7 @@ class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkParametricKlein : public
{
public:
vtkTypeMacro(vtkParametricKlein, vtkParametricFunction);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct a Klein Bottle with the following parameters:
@@ -65,7 +65,7 @@ class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkParametricKlein : public
/**
* Return the parametric dimension of the class.
*/
- int GetDimension() VTK_OVERRIDE {return 2;}
+ int GetDimension() override {return 2;}
/**
* A Klein bottle.
@@ -75,7 +75,7 @@ class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkParametricKlein : public
* \f$Pt = (x, y, z), Du = (dx/du, dy/du, dz/du), Dv = (dx/dv, dy/dv, dz/dv)\f$ .
* Then the normal is \f$N = Du X Dv\f$ .
*/
- void Evaluate(double uvw[3], double Pt[3], double Duvw[9]) VTK_OVERRIDE;
+ void Evaluate(double uvw[3], double Pt[3], double Duvw[9]) override;
/**
* Calculate a user defined scalar using one or all of uvw, Pt, Duvw.
@@ -91,11 +91,11 @@ class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkParametricKlein : public
* instantiated function should return zero.
*/
double EvaluateScalar(double uvw[3], double Pt[3],
- double Duvw[9]) VTK_OVERRIDE;
+ double Duvw[9]) override;
protected:
vtkParametricKlein();
- ~vtkParametricKlein() VTK_OVERRIDE;
+ ~vtkParametricKlein() override;
private:
vtkParametricKlein(const vtkParametricKlein&) VTK_DELETE_FUNCTION;
diff --git a/Common/ComputationalGeometry/vtkParametricKuen.h b/Common/ComputationalGeometry/vtkParametricKuen.h
index 62e71bb6ac1b31a1c41d35e1b0c65cb1b030c288..55f435a37c3d9724bd59bfe31f9576d70458e5cc 100644
--- a/Common/ComputationalGeometry/vtkParametricKuen.h
+++ b/Common/ComputationalGeometry/vtkParametricKuen.h
@@ -37,7 +37,7 @@ class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkParametricKuen : public
public:
vtkTypeMacro(vtkParametricKuen, vtkParametricFunction);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct Kuen's surface with the following parameters:
@@ -53,7 +53,7 @@ class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkParametricKuen : public
/**
* Return the parametric dimension of the class.
*/
- int GetDimension() VTK_OVERRIDE {return 2;}
+ int GetDimension() override {return 2;}
//@{
/**
@@ -75,18 +75,18 @@ class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkParametricKuen : public
* \f$Pt = (x, y, z), D_u\vec{f} = (dx/du, dy/du, dz/du), D_v\vec{f} = (dx/dv, dy/dv, dz/dv)\f$ .
* Then the normal is \f$N = D_u\vec{f} \times D_v\vec{f}\f$ .
*/
- void Evaluate(double uvw[3], double Pt[3], double Duvw[9]) VTK_OVERRIDE;
+ void Evaluate(double uvw[3], double Pt[3], double Duvw[9]) override;
/**
* Calculate a user defined scalar using one or all of uvw, Pt, Duvw.
* This method simply returns 0.
*/
double EvaluateScalar(double uvw[3], double Pt[3],
- double Duvw[9]) VTK_OVERRIDE;
+ double Duvw[9]) override;
protected:
vtkParametricKuen();
- ~vtkParametricKuen() VTK_OVERRIDE;
+ ~vtkParametricKuen() override;
private:
vtkParametricKuen(const vtkParametricKuen&) VTK_DELETE_FUNCTION;
diff --git a/Common/ComputationalGeometry/vtkParametricMobius.h b/Common/ComputationalGeometry/vtkParametricMobius.h
index 60aa97498769725f4019ecc23c55ec994ec2a874..6ceb28c914414ba1178d3efe331bc638fc519f98 100644
--- a/Common/ComputationalGeometry/vtkParametricMobius.h
+++ b/Common/ComputationalGeometry/vtkParametricMobius.h
@@ -39,7 +39,7 @@ class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkParametricMobius : public
{
public:
vtkTypeMacro(vtkParametricMobius, vtkParametricFunction);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct a Mobius strip with the following parameters:
@@ -64,7 +64,7 @@ class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkParametricMobius : public
/**
* Return the parametric dimension of the class.
*/
- int GetDimension() VTK_OVERRIDE {return 2;}
+ int GetDimension() override {return 2;}
/**
* The Mobius strip.
@@ -74,7 +74,7 @@ class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkParametricMobius : public
* \f$Pt = (x, y, z), Du = (dx/du, dy/du, dz/du), Dv = (dx/dv, dy/dv, dz/dv)\f$ .
* Then the normal is \f$N = Du X Dv\f$ .
*/
- void Evaluate(double uvw[3], double Pt[3], double Duvw[9]) VTK_OVERRIDE;
+ void Evaluate(double uvw[3], double Pt[3], double Duvw[9]) override;
/**
* Calculate a user defined scalar using one or all of uvw, Pt, Duvw.
@@ -90,11 +90,11 @@ class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkParametricMobius : public
* instantiated function should return zero.
*/
double EvaluateScalar(double uvw[3], double Pt[3],
- double Duvw[9]) VTK_OVERRIDE;
+ double Duvw[9]) override;
protected:
vtkParametricMobius();
- ~vtkParametricMobius() VTK_OVERRIDE;
+ ~vtkParametricMobius() override;
// Variables
double Radius;
diff --git a/Common/ComputationalGeometry/vtkParametricPluckerConoid.h b/Common/ComputationalGeometry/vtkParametricPluckerConoid.h
index 4c302fff19672c93b3b9a410cb9038997f7a371b..a4cd7a45b1ce7cde96337102a3ced663a877f506 100644
--- a/Common/ComputationalGeometry/vtkParametricPluckerConoid.h
+++ b/Common/ComputationalGeometry/vtkParametricPluckerConoid.h
@@ -41,7 +41,7 @@ class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkParametricPluckerConoid :
vtkTypeMacro(vtkParametricPluckerConoid, vtkParametricFunction);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -65,7 +65,7 @@ class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkParametricPluckerConoid :
/**
* Return the parametric dimension of the class.
*/
- int GetDimension() VTK_OVERRIDE {return 2;}
+ int GetDimension() override {return 2;}
/**
* Plucker's conoid surface.
@@ -75,18 +75,18 @@ class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkParametricPluckerConoid :
* \f$Pt = (x, y, z), D_u\vec{f} = (dx/du, dy/du, dz/du), D_v\vec{f} = (dx/dv, dy/dv, dz/dv)\f$ .
* Then the normal is \f$N = D_u\vec{f} \times D_v\vec{f}\f$ .
*/
- void Evaluate(double uvw[3], double Pt[3], double Duvw[9]) VTK_OVERRIDE;
+ void Evaluate(double uvw[3], double Pt[3], double Duvw[9]) override;
/**
* Calculate a user defined scalar using one or all of uvw, Pt, Duvw.
* This method simply returns 0.
*/
double EvaluateScalar(double uvw[3], double Pt[3],
- double Duvw[9]) VTK_OVERRIDE;
+ double Duvw[9]) override;
protected:
vtkParametricPluckerConoid();
- ~vtkParametricPluckerConoid() VTK_OVERRIDE;
+ ~vtkParametricPluckerConoid() override;
// Variables
int N;
diff --git a/Common/ComputationalGeometry/vtkParametricPseudosphere.h b/Common/ComputationalGeometry/vtkParametricPseudosphere.h
index a7bb9cef07b51d1fb3d4f9fa5b86396620987039..542e7eb810feb283de5fc5d7607d090e5c5c65b0 100644
--- a/Common/ComputationalGeometry/vtkParametricPseudosphere.h
+++ b/Common/ComputationalGeometry/vtkParametricPseudosphere.h
@@ -37,7 +37,7 @@ class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkParametricPseudosphere :
public:
vtkTypeMacro(vtkParametricPseudosphere, vtkParametricFunction);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct a pseudosphere surface with the following parameters:
@@ -53,7 +53,7 @@ class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkParametricPseudosphere :
/**
* Return the parametric dimension of the class.
*/
- int GetDimension() VTK_OVERRIDE {return 2;}
+ int GetDimension() override {return 2;}
/**
* Pseudosphere surface.
@@ -63,18 +63,18 @@ class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkParametricPseudosphere :
* \f$Pt = (x, y, z), D_u\vec{f} = (dx/du, dy/du, dz/du), D_v\vec{f} = (dx/dv, dy/dv, dz/dv)\f$ .
* Then the normal is \f$N = D_u\vec{f} \times D_v\vec{f}\f$ .
*/
- void Evaluate(double uvw[3], double Pt[3], double Duvw[9]) VTK_OVERRIDE;
+ void Evaluate(double uvw[3], double Pt[3], double Duvw[9]) override;
/**
* Calculate a user defined scalar using one or all of uvw, Pt, Duvw.
* This method simply returns 0.
*/
double EvaluateScalar(double uvw[3], double Pt[3],
- double Duvw[9]) VTK_OVERRIDE;
+ double Duvw[9]) override;
protected:
vtkParametricPseudosphere();
- ~vtkParametricPseudosphere() VTK_OVERRIDE;
+ ~vtkParametricPseudosphere() override;
private:
vtkParametricPseudosphere(const vtkParametricPseudosphere&) VTK_DELETE_FUNCTION;
diff --git a/Common/ComputationalGeometry/vtkParametricRandomHills.h b/Common/ComputationalGeometry/vtkParametricRandomHills.h
index 148688fb9b38a215ba285035a12e32bbb4ff76c8..cd327309447d1185abaec4042ab1f42ce2a50642 100644
--- a/Common/ComputationalGeometry/vtkParametricRandomHills.h
+++ b/Common/ComputationalGeometry/vtkParametricRandomHills.h
@@ -47,12 +47,12 @@ class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkParametricRandomHills :
public:
vtkTypeMacro(vtkParametricRandomHills, vtkParametricFunction);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Return the parametric dimension of the class.
*/
- int GetDimension() VTK_OVERRIDE {return 2;}
+ int GetDimension() override {return 2;}
/**
* Construct a surface of random hills with the following parameters:
@@ -173,7 +173,7 @@ class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkParametricRandomHills :
* \f$Pt = (x, y, z), Du = (dx/du, dy/du, dz/du), Dv = (dx/dv, dy/dv, dz/dv)\f$ .
* Then the normal is \f$N = Du X Dv\f$ .
*/
- void Evaluate(double uvw[3], double Pt[3], double Duvw[9]) VTK_OVERRIDE;
+ void Evaluate(double uvw[3], double Pt[3], double Duvw[9]) override;
/**
* Calculate a user defined scalar using one or all of uvw, Pt, Duvw.
@@ -189,11 +189,11 @@ class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkParametricRandomHills :
* instantiated function should return zero.
*/
double EvaluateScalar(double uvw[3], double Pt[3],
- double Duvw[9]) VTK_OVERRIDE;
+ double Duvw[9]) override;
protected:
vtkParametricRandomHills();
- ~vtkParametricRandomHills() VTK_OVERRIDE;
+ ~vtkParametricRandomHills() override;
// Variables
int NumberOfHills;
diff --git a/Common/ComputationalGeometry/vtkParametricRoman.h b/Common/ComputationalGeometry/vtkParametricRoman.h
index 891d6cb608c1be135b849476c458281aa09784e2..b276454d1e3440567705239a792311d52861107f 100644
--- a/Common/ComputationalGeometry/vtkParametricRoman.h
+++ b/Common/ComputationalGeometry/vtkParametricRoman.h
@@ -40,12 +40,12 @@ class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkParametricRoman : public
public:
vtkTypeMacro(vtkParametricRoman, vtkParametricFunction);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Return the parametric dimension of the class.
*/
- int GetDimension() VTK_OVERRIDE {return 2;}
+ int GetDimension() override {return 2;}
/**
* Construct Steiner's Roman Surface with the following parameters:
@@ -75,7 +75,7 @@ class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkParametricRoman : public
* \f$Pt = (x, y, z), Du = (dx/du, dy/du, dz/du), Dv = (dx/dv, dy/dv, dz/dv)\f$ .
* Then the normal is \f$N = Du X Dv\f$ .
*/
- void Evaluate(double uvw[3], double Pt[3], double Duvw[9]) VTK_OVERRIDE;
+ void Evaluate(double uvw[3], double Pt[3], double Duvw[9]) override;
/**
* Calculate a user defined scalar using one or all of uvw, Pt, Duvw.
@@ -91,12 +91,12 @@ class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkParametricRoman : public
* instantiated function should return zero.
*/
double EvaluateScalar(double uvw[3], double Pt[3],
- double Duvw[9]) VTK_OVERRIDE;
+ double Duvw[9]) override;
protected:
vtkParametricRoman();
- ~vtkParametricRoman() VTK_OVERRIDE;
+ ~vtkParametricRoman() override;
// Variables
double Radius;
diff --git a/Common/ComputationalGeometry/vtkParametricSpline.h b/Common/ComputationalGeometry/vtkParametricSpline.h
index fd2ef213221e0453ab04ecb458b81ffc8f049150..1a005da1044104e67b9d987f736c47016b630cfd 100644
--- a/Common/ComputationalGeometry/vtkParametricSpline.h
+++ b/Common/ComputationalGeometry/vtkParametricSpline.h
@@ -48,7 +48,7 @@ class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkParametricSpline : public vtkPara
{
public:
vtkTypeMacro(vtkParametricSpline,vtkParametricFunction);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct the spline with the following parameters:
@@ -61,19 +61,19 @@ public:
/**
* Return the parametric dimension of the class.
*/
- int GetDimension() VTK_OVERRIDE {return 1;}
+ int GetDimension() override {return 1;}
/**
* Evaluate the spline at parametric coordinate u[0] returning
* the point coordinate Pt[3].
*/
- void Evaluate(double u[3], double Pt[3], double Du[9]) VTK_OVERRIDE;
+ void Evaluate(double u[3], double Pt[3], double Du[9]) override;
/**
* Evaluate a scalar value at parametric coordinate u[0] and Pt[3].
* The scalar value is just the parameter u[0].
*/
- double EvaluateScalar(double u[3], double Pt[3], double Du[9]) VTK_OVERRIDE;
+ double EvaluateScalar(double u[3], double Pt[3], double Du[9]) override;
//@{
/**
@@ -166,7 +166,7 @@ public:
protected:
vtkParametricSpline();
- ~vtkParametricSpline() VTK_OVERRIDE;
+ ~vtkParametricSpline() override;
// Points definition
vtkPoints *Points;
diff --git a/Common/ComputationalGeometry/vtkParametricSuperEllipsoid.h b/Common/ComputationalGeometry/vtkParametricSuperEllipsoid.h
index e03ee2291a1c1fa10f762f576b0dc757e6b97aad..675d7c7c26c1c9032830ba9b7860c0f4d872bd58 100644
--- a/Common/ComputationalGeometry/vtkParametricSuperEllipsoid.h
+++ b/Common/ComputationalGeometry/vtkParametricSuperEllipsoid.h
@@ -48,7 +48,7 @@ class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT
{
public:
vtkTypeMacro(vtkParametricSuperEllipsoid, vtkParametricFunction);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct a superellipsoid with the following parameters:
@@ -66,7 +66,7 @@ class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT
/**
* Return the parametric dimension of the class.
*/
- int GetDimension() VTK_OVERRIDE {return 2;}
+ int GetDimension() override {return 2;}
//@{
/**
@@ -116,7 +116,7 @@ class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT
* \f$Pt = (x, y, z), Du = (dx/du, dy/du, dz/du), Dv = (dx/dv, dy/dv, dz/dv)\f$ .
* Then the normal is \f$N = Du X Dv\f$ .
*/
- void Evaluate(double uvw[3], double Pt[3], double Duvw[9]) VTK_OVERRIDE;
+ void Evaluate(double uvw[3], double Pt[3], double Duvw[9]) override;
/**
* Calculate a user defined scalar using one or all of uvw, Pt, Duvw.
@@ -132,11 +132,11 @@ class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT
* instantiated function should return zero.
*/
double EvaluateScalar(double uvw[3], double Pt[3],
- double Duvw[9]) VTK_OVERRIDE;
+ double Duvw[9]) override;
protected:
vtkParametricSuperEllipsoid();
- ~vtkParametricSuperEllipsoid() VTK_OVERRIDE;
+ ~vtkParametricSuperEllipsoid() override;
// Variables
double XRadius;
diff --git a/Common/ComputationalGeometry/vtkParametricSuperToroid.h b/Common/ComputationalGeometry/vtkParametricSuperToroid.h
index a1e5087d3d3d062c7e98e3dc317e03116250e367..1dc49752f817b1435d75727647a80c0a9d5a7aca 100644
--- a/Common/ComputationalGeometry/vtkParametricSuperToroid.h
+++ b/Common/ComputationalGeometry/vtkParametricSuperToroid.h
@@ -52,7 +52,7 @@ class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkParametricSuperToroid :
{
public:
vtkTypeMacro(vtkParametricSuperToroid, vtkParametricFunction);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct a supertoroid with the following parameters:
@@ -71,7 +71,7 @@ class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkParametricSuperToroid :
/**
* Return the parametric dimension of the class.
*/
- int GetDimension() VTK_OVERRIDE {return 2;}
+ int GetDimension() override {return 2;}
//@{
/**
@@ -139,7 +139,7 @@ class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkParametricSuperToroid :
* \f$Pt = (x, y, z), Du = (dx/du, dy/du, dz/du), Dv = (dx/dv, dy/dv, dz/dv)\f$ .
* Then the normal is \f$N = Du X Dv\f$ .
*/
- void Evaluate(double uvw[3], double Pt[3], double Duvw[9]) VTK_OVERRIDE;
+ void Evaluate(double uvw[3], double Pt[3], double Duvw[9]) override;
/**
* Calculate a user defined scalar using one or all of uvw, Pt, Duvw.
@@ -155,11 +155,11 @@ class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkParametricSuperToroid :
* instantiated function should return zero.
*/
double EvaluateScalar(double uvw[3], double Pt[3],
- double Duvw[9]) VTK_OVERRIDE;
+ double Duvw[9]) override;
protected:
vtkParametricSuperToroid();
- ~vtkParametricSuperToroid() VTK_OVERRIDE;
+ ~vtkParametricSuperToroid() override;
// Variables
double RingRadius;
diff --git a/Common/ComputationalGeometry/vtkParametricTorus.h b/Common/ComputationalGeometry/vtkParametricTorus.h
index cbd967e405690b366cfe77c9afe6b1611baba6b0..2a583788660f5d4f978322251e6572a72eb749c0 100644
--- a/Common/ComputationalGeometry/vtkParametricTorus.h
+++ b/Common/ComputationalGeometry/vtkParametricTorus.h
@@ -40,7 +40,7 @@ class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkParametricTorus : public
public:
vtkTypeMacro(vtkParametricTorus, vtkParametricFunction);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct a torus with the following parameters:
@@ -74,7 +74,7 @@ class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkParametricTorus : public
/**
* Return the parametric dimension of the class.
*/
- int GetDimension() VTK_OVERRIDE {return 2;}
+ int GetDimension() override {return 2;}
/**
* A torus.
@@ -84,7 +84,7 @@ class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkParametricTorus : public
* \f$Pt = (x, y, z), Du = (dx/du, dy/du, dz/du), Dv = (dx/dv, dy/dv, dz/dv)\f$.
* Then the normal is \f$N = Du X Dv\f$.
*/
- void Evaluate(double uvw[3], double Pt[3], double Duvw[9]) VTK_OVERRIDE;
+ void Evaluate(double uvw[3], double Pt[3], double Duvw[9]) override;
/**
* Calculate a user defined scalar using one or all of uvw, Pt, Duvw.
@@ -100,11 +100,11 @@ class VTKCOMMONCOMPUTATIONALGEOMETRY_EXPORT vtkParametricTorus : public
* instantiated function should return zero.
*/
double EvaluateScalar(double uvw[3], double Pt[3],
- double Duvw[9]) VTK_OVERRIDE;
+ double Duvw[9]) override;
protected:
vtkParametricTorus();
- ~vtkParametricTorus() VTK_OVERRIDE;
+ ~vtkParametricTorus() override;
// Variables
double RingRadius;
diff --git a/Common/Core/Testing/Cxx/TestDataArrayIterators.cxx b/Common/Core/Testing/Cxx/TestDataArrayIterators.cxx
index 2c44371245192397943f4c7fc8e1e185d80a728e..bb72c66ecab3e0ec50e4291aec9347883733e5b5 100644
--- a/Common/Core/Testing/Cxx/TestDataArrayIterators.cxx
+++ b/Common/Core/Testing/Cxx/TestDataArrayIterators.cxx
@@ -40,25 +40,25 @@ public:
this->NumberOfComponents = array->GetNumberOfComponents();
this->MaxId = array->GetMaxId();
}
- ValueType& GetValueReference(vtkIdType idx) VTK_OVERRIDE
+ ValueType& GetValueReference(vtkIdType idx) override
{
return *this->Data->GetPointer(idx);
}
// These pure virtuals are no-op -- all we care about is GetValueReference
// to test the iterator.
- void SetTypedTuple(vtkIdType, const ValueType *) VTK_OVERRIDE {}
- void InsertTypedTuple(vtkIdType, const ValueType *) VTK_OVERRIDE {}
- vtkIdType InsertNextTypedTuple(const ValueType *) VTK_OVERRIDE { return 0; }
- vtkIdType LookupTypedValue(ValueType) VTK_OVERRIDE { return 0; }
- void LookupTypedValue(ValueType, vtkIdList*) VTK_OVERRIDE {}
- ValueType GetValue(vtkIdType) const VTK_OVERRIDE { return 0; }
- void SetValue(vtkIdType, ValueType) VTK_OVERRIDE {}
- void GetTypedTuple(vtkIdType, ValueType*) const VTK_OVERRIDE {}
- vtkIdType InsertNextValue(ValueType) VTK_OVERRIDE { return 0; }
- void InsertValue(vtkIdType, ValueType) VTK_OVERRIDE {}
- int Allocate(vtkIdType, vtkIdType) VTK_OVERRIDE { return 0; }
- int Resize(vtkIdType) VTK_OVERRIDE { return 0; }
+ void SetTypedTuple(vtkIdType, const ValueType *) override {}
+ void InsertTypedTuple(vtkIdType, const ValueType *) override {}
+ vtkIdType InsertNextTypedTuple(const ValueType *) override { return 0; }
+ vtkIdType LookupTypedValue(ValueType) override { return 0; }
+ void LookupTypedValue(ValueType, vtkIdList*) override {}
+ ValueType GetValue(vtkIdType) const override { return 0; }
+ void SetValue(vtkIdType, ValueType) override {}
+ void GetTypedTuple(vtkIdType, ValueType*) const override {}
+ vtkIdType InsertNextValue(ValueType) override { return 0; }
+ void InsertValue(vtkIdType, ValueType) override {}
+ int Allocate(vtkIdType, vtkIdType) override { return 0; }
+ int Resize(vtkIdType) override { return 0; }
};
}
diff --git a/Common/Core/Testing/Cxx/TestGarbageCollector.cxx b/Common/Core/Testing/Cxx/TestGarbageCollector.cxx
index c50e73bbeff76c11f49e45937791011d789aeed2..8cc29b640dc4042c6e79ae0d8910ee48fe188c56 100644
--- a/Common/Core/Testing/Cxx/TestGarbageCollector.cxx
+++ b/Common/Core/Testing/Cxx/TestGarbageCollector.cxx
@@ -32,8 +32,8 @@ public:
}
vtkTypeMacro(vtkTestReferenceLoop, vtkObject);
- void Register(vtkObjectBase* o) VTK_OVERRIDE { this->RegisterInternal(o, 1); }
- void UnRegister(vtkObjectBase* o) VTK_OVERRIDE { this->UnRegisterInternal(o, 1); }
+ void Register(vtkObjectBase* o) override { this->RegisterInternal(o, 1); }
+ void UnRegister(vtkObjectBase* o) override { this->UnRegisterInternal(o, 1); }
protected:
vtkTestReferenceLoop()
@@ -46,7 +46,7 @@ protected:
this->Other = other;
this->Other->Register(this);
}
- ~vtkTestReferenceLoop() VTK_OVERRIDE
+ ~vtkTestReferenceLoop() override
{
if(this->Other)
{
@@ -55,7 +55,7 @@ protected:
}
}
- void ReportReferences(vtkGarbageCollector* collector) VTK_OVERRIDE
+ void ReportReferences(vtkGarbageCollector* collector) override
{
vtkGarbageCollectorReport(collector, this->Other, "Other");
}
diff --git a/Common/Core/Testing/Cxx/TestObjectFactory.cxx b/Common/Core/Testing/Cxx/TestObjectFactory.cxx
index 2fcd66f9a0b961d9b05e699b8fb41db49490abf5..1b90432df9a4778b6ba1f9230de0e919fdddf6f4 100644
--- a/Common/Core/Testing/Cxx/TestObjectFactory.cxx
+++ b/Common/Core/Testing/Cxx/TestObjectFactory.cxx
@@ -28,7 +28,7 @@ class vtkTestPoints : public vtkPoints
{
public:
// Methods from vtkObject
- ~vtkTestPoints() VTK_OVERRIDE
+ ~vtkTestPoints() override
{
}
@@ -44,7 +44,7 @@ private:
class vtkTestPoints2 : public vtkPoints
{
public:
- ~vtkTestPoints2() VTK_OVERRIDE
+ ~vtkTestPoints2() override
{
}
@@ -71,8 +71,8 @@ public:
f->InitializeObjectBase();
return f;
}
- const char* GetVTKSourceVersion() VTK_OVERRIDE { return VTK_SOURCE_VERSION; }
- const char* GetDescription() VTK_OVERRIDE { return "A fine Test Factory"; }
+ const char* GetVTKSourceVersion() override { return VTK_SOURCE_VERSION; }
+ const char* GetDescription() override { return "A fine Test Factory"; }
protected:
TestFactory(const TestFactory&);
diff --git a/Common/Core/Testing/Cxx/TestObserversPerformance.cxx b/Common/Core/Testing/Cxx/TestObserversPerformance.cxx
index cf86a513fff8d9b6a914a02708f4fcb99ac0c57e..f037b6b7884d6f4a1b9f71c42ecca7d8c9d34545 100644
--- a/Common/Core/Testing/Cxx/TestObserversPerformance.cxx
+++ b/Common/Core/Testing/Cxx/TestObserversPerformance.cxx
@@ -52,7 +52,7 @@ public:
static vtkSimpleCommand* New() { return new vtkSimpleCommand();}
vtkTypeMacro(vtkSimpleCommand, vtkCommand);
- void Execute(vtkObject*, unsigned long, void*) VTK_OVERRIDE
+ void Execute(vtkObject*, unsigned long, void*) override
{
this->MTime.Modified();
}
diff --git a/Common/Core/Testing/Cxx/vtkTestNewVar.h b/Common/Core/Testing/Cxx/vtkTestNewVar.h
index 062ad19b838270e0634c501fc30e5a8d5c17650c..ba5b916a7a575d68d7fdeb761bf9f7d4c5a5561e 100644
--- a/Common/Core/Testing/Cxx/vtkTestNewVar.h
+++ b/Common/Core/Testing/Cxx/vtkTestNewVar.h
@@ -32,7 +32,7 @@ public:
static vtkTestNewVar * New();
vtkTypeMacro(vtkTestNewVar, vtkObject)
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Get the reference count for the points object.
diff --git a/Common/Core/vtkAOSDataArrayTemplate.h b/Common/Core/vtkAOSDataArrayTemplate.h
index 27458b64c635f5957fe46e80746ee21fe4f48145..f96108e001a9f9e78ed9b52de10abc7c871547ef 100644
--- a/Common/Core/vtkAOSDataArrayTemplate.h
+++ b/Common/Core/vtkAOSDataArrayTemplate.h
@@ -129,15 +129,15 @@ public:
/**
* Set component @a comp of all tuples to @a value.
*/
- void FillTypedComponent(int compIdx, ValueType value) VTK_OVERRIDE;
+ void FillTypedComponent(int compIdx, ValueType value) override;
//@}
//@{
/**
* Set all the values in array to @a value.
*/
- void FillValue(ValueType value) VTK_OVERRIDE;
- void Fill(double value) VTK_OVERRIDE;
+ void FillValue(ValueType value) override;
+ void Fill(double value) override;
//@}
//@{
@@ -147,7 +147,7 @@ public:
* data values requested.
*/
ValueType* WritePointer(vtkIdType valueIdx, vtkIdType numValues);
- void* WriteVoidPointer(vtkIdType valueIdx, vtkIdType numValues) VTK_OVERRIDE;
+ void* WriteVoidPointer(vtkIdType valueIdx, vtkIdType numValues) override;
//@}
//@{
@@ -159,7 +159,7 @@ public:
* for a safer alternative for fast data access.
*/
ValueType* GetPointer(vtkIdType valueIdx);
- void* GetVoidPointer(vtkIdType valueIdx) VTK_OVERRIDE;
+ void* GetVoidPointer(vtkIdType valueIdx) override;
//@}
//@{
@@ -180,37 +180,37 @@ public:
void SetArray(VTK_ZEROCOPY ValueType* array, vtkIdType size, int save,
int deleteMethod);
void SetArray(VTK_ZEROCOPY ValueType* array, vtkIdType size, int save);
- void SetVoidArray(void* array, vtkIdType size, int save) VTK_OVERRIDE;
+ void SetVoidArray(void* array, vtkIdType size, int save) override;
void SetVoidArray(void* array, vtkIdType size, int save,
- int deleteMethod) VTK_OVERRIDE;
+ int deleteMethod) override;
//@}
// Overridden for optimized implementations:
- void SetTuple(vtkIdType tupleIdx, const float *tuple) VTK_OVERRIDE;
- void SetTuple(vtkIdType tupleIdx, const double *tuple) VTK_OVERRIDE;
+ void SetTuple(vtkIdType tupleIdx, const float *tuple) override;
+ void SetTuple(vtkIdType tupleIdx, const double *tuple) override;
// MSVC doesn't like 'using' here (error C2487). Just forward instead:
// using Superclass::SetTuple;
void SetTuple(vtkIdType dstTupleIdx, vtkIdType srcTupleIdx,
- vtkAbstractArray *source) VTK_OVERRIDE
+ vtkAbstractArray *source) override
{ this->Superclass::SetTuple(dstTupleIdx, srcTupleIdx, source); }
- void InsertTuple(vtkIdType tupleIdx, const float *source) VTK_OVERRIDE;
- void InsertTuple(vtkIdType tupleIdx, const double *source) VTK_OVERRIDE;
+ void InsertTuple(vtkIdType tupleIdx, const float *source) override;
+ void InsertTuple(vtkIdType tupleIdx, const double *source) override;
// MSVC doesn't like 'using' here (error C2487). Just forward instead:
// using Superclass::InsertTuple;
void InsertTuple(vtkIdType dstTupleIdx, vtkIdType srcTupleIdx,
- vtkAbstractArray *source) VTK_OVERRIDE
+ vtkAbstractArray *source) override
{ this->Superclass::InsertTuple(dstTupleIdx, srcTupleIdx, source); }
void InsertComponent(vtkIdType tupleIdx, int compIdx,
- double value) VTK_OVERRIDE;
- vtkIdType InsertNextTuple(const float *tuple) VTK_OVERRIDE;
- vtkIdType InsertNextTuple(const double *tuple) VTK_OVERRIDE;
+ double value) override;
+ vtkIdType InsertNextTuple(const float *tuple) override;
+ vtkIdType InsertNextTuple(const double *tuple) override;
// MSVC doesn't like 'using' here (error C2487). Just forward instead:
// using Superclass::InsertNextTuple;
vtkIdType InsertNextTuple(vtkIdType srcTupleIdx,
- vtkAbstractArray *source) VTK_OVERRIDE
+ vtkAbstractArray *source) override
{ return this->Superclass::InsertNextTuple(srcTupleIdx, source); }
- void GetTuple(vtkIdType tupleIdx, double * tuple) VTK_OVERRIDE;
- double *GetTuple(vtkIdType tupleIdx) VTK_OVERRIDE;
+ void GetTuple(vtkIdType tupleIdx, double * tuple) override;
+ double *GetTuple(vtkIdType tupleIdx) override;
/**
* Tell the array explicitly that a single data element has
@@ -260,23 +260,23 @@ public:
}
//@}
- int GetArrayType() VTK_OVERRIDE { return vtkAbstractArray::AoSDataArrayTemplate; }
- VTK_NEWINSTANCE vtkArrayIterator *NewIterator() VTK_OVERRIDE;
- bool HasStandardMemoryLayout() VTK_OVERRIDE { return true; }
- void ShallowCopy(vtkDataArray *other) VTK_OVERRIDE;
+ int GetArrayType() override { return vtkAbstractArray::AoSDataArrayTemplate; }
+ VTK_NEWINSTANCE vtkArrayIterator *NewIterator() override;
+ bool HasStandardMemoryLayout() override { return true; }
+ void ShallowCopy(vtkDataArray *other) override;
// Reimplemented for efficiency:
void InsertTuples(vtkIdType dstStart, vtkIdType n, vtkIdType srcStart,
- vtkAbstractArray* source) VTK_OVERRIDE;
+ vtkAbstractArray* source) override;
// MSVC doesn't like 'using' here (error C2487). Just forward instead:
// using Superclass::InsertTuples;
void InsertTuples(vtkIdList *dstIds, vtkIdList *srcIds,
- vtkAbstractArray *source) VTK_OVERRIDE
+ vtkAbstractArray *source) override
{ this->Superclass::InsertTuples(dstIds, srcIds, source); }
protected:
vtkAOSDataArrayTemplate();
- ~vtkAOSDataArrayTemplate() VTK_OVERRIDE;
+ ~vtkAOSDataArrayTemplate() override;
/**
* Allocate space for numTuples. Old data is not preserved. If numTuples == 0,
diff --git a/Common/Core/vtkAbstractArray.h b/Common/Core/vtkAbstractArray.h
index 0c6b297d83dcbe2a1f4e82639727e7b11089b76c..82cba917070df321672407903c561d26b242238d 100644
--- a/Common/Core/vtkAbstractArray.h
+++ b/Common/Core/vtkAbstractArray.h
@@ -76,7 +76,7 @@ class VTKCOMMONCORE_EXPORT vtkAbstractArray : public vtkObject
{
public:
vtkTypeMacro(vtkAbstractArray,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Allocate memory for this array. Delete old storage only if necessary.
@@ -592,7 +592,7 @@ public:
/**
* Removes out-of-date PER_COMPONENT() and PER_FINITE_COMPONENT() values.
*/
- void Modified() VTK_OVERRIDE;
+ void Modified() override;
/**
* A key used to hold discrete values taken on either by the tuples of the
@@ -647,7 +647,7 @@ public:
protected:
// Construct object with default tuple dimension (number of components) of 1.
vtkAbstractArray();
- ~vtkAbstractArray() VTK_OVERRIDE;
+ ~vtkAbstractArray() override;
/**
* Set an information object that can be used to annotate the array.
diff --git a/Common/Core/vtkAndroidOutputWindow.h b/Common/Core/vtkAndroidOutputWindow.h
index 0adae06db6c97b90027da24d75f0c1477f0bc566..850c7c6bcc5d5efbb6794e6ac6a94db57ebeefb0 100644
--- a/Common/Core/vtkAndroidOutputWindow.h
+++ b/Common/Core/vtkAndroidOutputWindow.h
@@ -37,7 +37,7 @@ class VTKCOMMONCORE_EXPORT vtkAndroidOutputWindow : public vtkOutputWindow
public:
// Methods from vtkObject
vtkTypeMacro(vtkAndroidOutputWindow,vtkOutputWindow);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Create a vtkAndroidOutputWindow.
diff --git a/Common/Core/vtkAngularPeriodicDataArray.h b/Common/Core/vtkAngularPeriodicDataArray.h
index 0fa963a211452e04eeda89a1fb6139742cae996f..95959061067c5c082c99e385f7d79720bdc622bd 100644
--- a/Common/Core/vtkAngularPeriodicDataArray.h
+++ b/Common/Core/vtkAngularPeriodicDataArray.h
@@ -45,7 +45,7 @@ public:
vtkPeriodicDataArray<Scalar>)
vtkAOSArrayNewInstanceMacro(vtkAngularPeriodicDataArray<Scalar>)
static vtkAngularPeriodicDataArray *New();
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Initialize the mapped array with the original input data array.
@@ -81,12 +81,12 @@ public:
protected:
vtkAngularPeriodicDataArray();
- ~vtkAngularPeriodicDataArray() VTK_OVERRIDE;
+ ~vtkAngularPeriodicDataArray() override;
/**
* Transform the provided tuple
*/
- void Transform(Scalar* tuple) const VTK_OVERRIDE;
+ void Transform(Scalar* tuple) const override;
/**
* Update rotation matrix from Axis, Angle and Center
diff --git a/Common/Core/vtkAnimationCue.h b/Common/Core/vtkAnimationCue.h
index 5e863572e9f812c00daf45b23160e4cf56fd2d77..2508595e1c36977e32d6da788e73bf56dc241f76 100644
--- a/Common/Core/vtkAnimationCue.h
+++ b/Common/Core/vtkAnimationCue.h
@@ -45,7 +45,7 @@ class VTKCOMMONCORE_EXPORT vtkAnimationCue: public vtkObject
{
public:
vtkTypeMacro(vtkAnimationCue,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkAnimationCue* New();
@@ -179,7 +179,7 @@ public:
protected:
vtkAnimationCue();
- ~vtkAnimationCue() VTK_OVERRIDE;
+ ~vtkAnimationCue() override;
enum {
UNINITIALIZED=0,
diff --git a/Common/Core/vtkArray.h b/Common/Core/vtkArray.h
index c32ca212fee7e4fb4e152273cb71c3dba34eb7ea..4415ce93cff2a807b7f94aa21bd9d538543d7220 100644
--- a/Common/Core/vtkArray.h
+++ b/Common/Core/vtkArray.h
@@ -65,7 +65,7 @@ class VTKCOMMONCORE_EXPORT vtkArray : public vtkObject
{
public:
vtkTypeMacro(vtkArray, vtkObject);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
typedef vtkArrayExtents::CoordinateT CoordinateT;
typedef vtkArrayExtents::DimensionT DimensionT;
@@ -240,7 +240,7 @@ public:
protected:
vtkArray();
- ~vtkArray() VTK_OVERRIDE;
+ ~vtkArray() override;
private:
vtkArray(const vtkArray&) VTK_DELETE_FUNCTION;
diff --git a/Common/Core/vtkArrayIterator.h b/Common/Core/vtkArrayIterator.h
index 7c7602a60314d1a89fa520f95427c6a088b09123..c6d8a9d5d61a6cf8646edf1705200b38efd8a4e7 100644
--- a/Common/Core/vtkArrayIterator.h
+++ b/Common/Core/vtkArrayIterator.h
@@ -50,7 +50,7 @@ class VTKCOMMONCORE_EXPORT vtkArrayIterator : public vtkObject
{
public:
vtkTypeMacro(vtkArrayIterator, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Set the array this iterator will iterate over.
@@ -69,7 +69,7 @@ public:
protected:
vtkArrayIterator();
- ~vtkArrayIterator() VTK_OVERRIDE;
+ ~vtkArrayIterator() override;
private:
vtkArrayIterator(const vtkArrayIterator&) VTK_DELETE_FUNCTION;
diff --git a/Common/Core/vtkArrayIteratorTemplate.h b/Common/Core/vtkArrayIteratorTemplate.h
index 9d5c01c7c483ad3acb377911a3e120eaae992eb7..1f6f04e0f72fc46aff8185505918db221b710bcd 100644
--- a/Common/Core/vtkArrayIteratorTemplate.h
+++ b/Common/Core/vtkArrayIteratorTemplate.h
@@ -39,7 +39,7 @@ class VTKCOMMONCORE_EXPORT vtkArrayIteratorTemplate : public vtkArrayIterator
public:
static vtkArrayIteratorTemplate<T>* New();
vtkTemplateTypeMacro(vtkArrayIteratorTemplate<T>, vtkArrayIterator)
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Set the array this iterator will iterate over.
@@ -48,7 +48,7 @@ public:
* (except using the iterator itself).
* If the array is modified, the iterator must be re-initialized.
*/
- void Initialize(vtkAbstractArray* array) VTK_OVERRIDE;
+ void Initialize(vtkAbstractArray* array) override;
/**
* Get the array.
@@ -95,7 +95,7 @@ public:
/**
* Get the data type from the underlying array.
*/
- int GetDataType() VTK_OVERRIDE;
+ int GetDataType() override;
/**
* Get the data type size from the underlying array.
@@ -109,7 +109,7 @@ public:
protected:
vtkArrayIteratorTemplate();
- ~vtkArrayIteratorTemplate() VTK_OVERRIDE;
+ ~vtkArrayIteratorTemplate() override;
T* Pointer;
private:
diff --git a/Common/Core/vtkBitArray.h b/Common/Core/vtkBitArray.h
index 7c0d607209069a76ef806be3a6e14773c592eed4..803abdecfa5cc82bf682851ac5ba3b4fe788b97e 100644
--- a/Common/Core/vtkBitArray.h
+++ b/Common/Core/vtkBitArray.h
@@ -35,27 +35,27 @@ class VTKCOMMONCORE_EXPORT vtkBitArray : public vtkDataArray
public:
static vtkBitArray *New();
vtkTypeMacro(vtkBitArray,vtkDataArray);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Allocate memory for this array. Delete old storage only if necessary.
* Note that ext is no longer used.
*/
- int Allocate(vtkIdType sz, vtkIdType ext=1000) VTK_OVERRIDE;
+ int Allocate(vtkIdType sz, vtkIdType ext=1000) override;
/**
* Release storage and reset array to initial state.
*/
- void Initialize() VTK_OVERRIDE;
+ void Initialize() override;
// satisfy vtkDataArray API
- int GetDataType() VTK_OVERRIDE {return VTK_BIT;}
- int GetDataTypeSize() VTK_OVERRIDE { return 0; }
+ int GetDataType() override {return VTK_BIT;}
+ int GetDataTypeSize() override { return 0; }
/**
* Set the number of n-tuples in the array.
*/
- void SetNumberOfTuples(vtkIdType number) VTK_OVERRIDE;
+ void SetNumberOfTuples(vtkIdType number) override;
/**
* Set the tuple at the ith location using the jth tuple in the source array.
@@ -64,14 +64,14 @@ public:
* performed; use in conjunction with SetNumberOfTuples() to allocate space.
*/
void SetTuple(vtkIdType i, vtkIdType j,
- vtkAbstractArray* source) VTK_OVERRIDE;
+ vtkAbstractArray* source) override;
/**
* Insert the jth tuple in the source array, at ith location in this array.
* Note that memory allocation is performed as necessary to hold the data.
*/
void InsertTuple(vtkIdType i, vtkIdType j,
- vtkAbstractArray* source) VTK_OVERRIDE;
+ vtkAbstractArray* source) override;
/**
* Copy the tuples indexed in srcIds from the source array to the tuple
@@ -79,7 +79,7 @@ public:
* Note that memory allocation is performed as necessary to hold the data.
*/
void InsertTuples(vtkIdList *dstIds, vtkIdList *srcIds,
- vtkAbstractArray *source) VTK_OVERRIDE;
+ vtkAbstractArray *source) override;
/**
* Copy n consecutive tuples starting at srcStart from the source array to
@@ -87,7 +87,7 @@ public:
* Note that memory allocation is performed as necessary to hold the data.
*/
void InsertTuples(vtkIdType dstStart, vtkIdType n, vtkIdType srcStart,
- vtkAbstractArray* source) VTK_OVERRIDE;
+ vtkAbstractArray* source) override;
/**
* Insert the jth tuple in the source array, at the end in this array.
@@ -95,25 +95,25 @@ public:
* Returns the location at which the data was inserted.
*/
vtkIdType InsertNextTuple(vtkIdType j,
- vtkAbstractArray* source) VTK_OVERRIDE;
+ vtkAbstractArray* source) override;
/**
* Get a pointer to a tuple at the ith location. This is a dangerous method
* (it is not thread safe since a pointer is returned).
*/
- double *GetTuple(vtkIdType i) VTK_OVERRIDE;
+ double *GetTuple(vtkIdType i) override;
/**
* Copy the tuple value into a user-provided array.
*/
- void GetTuple(vtkIdType i, double * tuple) VTK_OVERRIDE;
+ void GetTuple(vtkIdType i, double * tuple) override;
//@{
/**
* Set the tuple value at the ith location in the array.
*/
- void SetTuple(vtkIdType i, const float * tuple) VTK_OVERRIDE;
- void SetTuple(vtkIdType i, const double * tuple) VTK_OVERRIDE;
+ void SetTuple(vtkIdType i, const float * tuple) override;
+ void SetTuple(vtkIdType i, const double * tuple) override;
//@}
//@{
@@ -121,16 +121,16 @@ public:
* Insert (memory allocation performed) the tuple into the ith location
* in the array.
*/
- void InsertTuple(vtkIdType i, const float * tuple) VTK_OVERRIDE;
- void InsertTuple(vtkIdType i, const double * tuple) VTK_OVERRIDE;
+ void InsertTuple(vtkIdType i, const float * tuple) override;
+ void InsertTuple(vtkIdType i, const double * tuple) override;
//@}
//@{
/**
* Insert (memory allocation performed) the tuple onto the end of the array.
*/
- vtkIdType InsertNextTuple(const float * tuple) VTK_OVERRIDE;
- vtkIdType InsertNextTuple(const double * tuple) VTK_OVERRIDE;
+ vtkIdType InsertNextTuple(const float * tuple) override;
+ vtkIdType InsertNextTuple(const double * tuple) override;
//@}
//@{
@@ -139,9 +139,9 @@ public:
* resize array, so the data array is still valid after this operation. Note,
* this operation is fairly slow.
*/
- void RemoveTuple(vtkIdType id) VTK_OVERRIDE;
- void RemoveFirstTuple() VTK_OVERRIDE;
- void RemoveLastTuple() VTK_OVERRIDE;
+ void RemoveTuple(vtkIdType id) override;
+ void RemoveFirstTuple() override;
+ void RemoveLastTuple() override;
//@}
/**
@@ -150,17 +150,17 @@ public:
* NumberOfComponents. Make sure enough memory has been allocated (use
* SetNumberOfTuples() and SetNumberOfComponents()).
*/
- void SetComponent(vtkIdType i, int j, double c) VTK_OVERRIDE;
+ void SetComponent(vtkIdType i, int j, double c) override;
/**
* Free any unneeded memory.
*/
- void Squeeze() VTK_OVERRIDE;
+ void Squeeze() override;
/**
* Resize the array while conserving the data.
*/
- int Resize(vtkIdType numTuples) VTK_OVERRIDE;
+ int Resize(vtkIdType numTuples) override;
/**
* Get the data at a particular index.
@@ -174,7 +174,7 @@ public:
* allocation as well as setting the MaxId ivar. Used in conjunction with
* SetValue() method for fast insertion.
*/
- void SetNumberOfValues(vtkIdType number) VTK_OVERRIDE;
+ void SetNumberOfValues(vtkIdType number) override;
/**
* Set the data at a particular index. Does not do range checking. Make sure
@@ -190,12 +190,12 @@ public:
/**
* Set a value in the array from a variant.
*/
- void SetVariantValue(vtkIdType idx, vtkVariant value) VTK_OVERRIDE;
+ void SetVariantValue(vtkIdType idx, vtkVariant value) override;
/**
* Inserts values from a variant and checks to ensure there is enough memory
*/
- void InsertVariantValue(vtkIdType idx, vtkVariant value) VTK_OVERRIDE;
+ void InsertVariantValue(vtkIdType idx, vtkVariant value) override;
vtkIdType InsertNextValue(int i);
@@ -203,7 +203,7 @@ public:
* Insert the data component at ith tuple and jth component location.
* Note that memory allocation is performed as necessary to hold the data.
*/
- void InsertComponent(vtkIdType i, int j, double c) VTK_OVERRIDE;
+ void InsertComponent(vtkIdType i, int j, double c) override;
/**
* Direct manipulation of the underlying data.
@@ -218,12 +218,12 @@ public:
*/
unsigned char *WritePointer(vtkIdType id, vtkIdType number);
- void* WriteVoidPointer(vtkIdType id, vtkIdType number) VTK_OVERRIDE
+ void* WriteVoidPointer(vtkIdType id, vtkIdType number) override
{
return this->WritePointer(id, number);
}
- void *GetVoidPointer(vtkIdType id) VTK_OVERRIDE
+ void *GetVoidPointer(vtkIdType id) override
{
return static_cast<void *>(this->GetPointer(id));
}
@@ -231,8 +231,8 @@ public:
/**
* Deep copy of another bit array.
*/
- void DeepCopy(vtkDataArray *da) VTK_OVERRIDE;
- void DeepCopy(vtkAbstractArray* aa) VTK_OVERRIDE
+ void DeepCopy(vtkDataArray *da) override;
+ void DeepCopy(vtkAbstractArray* aa) override
{ this->Superclass::DeepCopy(aa); }
//@{
@@ -248,12 +248,12 @@ public:
#ifndef __VTK_WRAP__
void SetArray(unsigned char* array, vtkIdType size, int save);
#endif
- void SetVoidArray(void *array, vtkIdType size, int save) VTK_OVERRIDE
+ void SetVoidArray(void *array, vtkIdType size, int save) override
{
this->SetArray(static_cast<unsigned char *>(array), size, save);
}
void SetVoidArray(void *array, vtkIdType size, int save,
- int vtkNotUsed(deleteMethod)) VTK_OVERRIDE
+ int vtkNotUsed(deleteMethod)) override
{
this->SetArray(static_cast<unsigned char *>(array), size, save);
}
@@ -262,14 +262,14 @@ public:
/**
* Returns a new vtkBitArrayIterator instance.
*/
- VTK_NEWINSTANCE vtkArrayIterator* NewIterator() VTK_OVERRIDE;
+ VTK_NEWINSTANCE vtkArrayIterator* NewIterator() override;
//@{
/**
* Return the indices where a specific value appears.
*/
- vtkIdType LookupValue(vtkVariant value) VTK_OVERRIDE;
- void LookupValue(vtkVariant value, vtkIdList* ids) VTK_OVERRIDE;
+ vtkIdType LookupValue(vtkVariant value) override;
+ void LookupValue(vtkVariant value, vtkIdList* ids) override;
vtkIdType LookupValue(int value);
void LookupValue(int value, vtkIdList* ids);
//@}
@@ -282,18 +282,18 @@ public:
* the fast lookup will know to rebuild itself. Otherwise, the lookup
* functions will give incorrect results.
*/
- void DataChanged() VTK_OVERRIDE;
+ void DataChanged() override;
/**
* Delete the associated fast lookup data structure on this array,
* if it exists. The lookup will be rebuilt on the next call to a lookup
* function.
*/
- void ClearLookup() VTK_OVERRIDE;
+ void ClearLookup() override;
protected:
vtkBitArray();
- ~vtkBitArray() VTK_OVERRIDE;
+ ~vtkBitArray() override;
unsigned char *Array; // pointer to data
unsigned char *ResizeAndExtend(vtkIdType sz);
diff --git a/Common/Core/vtkBitArrayIterator.h b/Common/Core/vtkBitArrayIterator.h
index 19baa96d171d6bcaa4c82c36a1b8d71ffdcd5ea7..dd615e9f37870cc895aff66c912006c50e81278f 100644
--- a/Common/Core/vtkBitArrayIterator.h
+++ b/Common/Core/vtkBitArrayIterator.h
@@ -31,7 +31,7 @@ class VTKCOMMONCORE_EXPORT vtkBitArrayIterator : public vtkArrayIterator
public:
static vtkBitArrayIterator* New();
vtkTypeMacro(vtkBitArrayIterator, vtkArrayIterator);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Set the array this iterator will iterate over.
@@ -40,7 +40,7 @@ public:
* (except using the iterator itself).
* If the array is modified, the iterator must be re-initialized.
*/
- void Initialize(vtkAbstractArray* array) VTK_OVERRIDE;
+ void Initialize(vtkAbstractArray* array) override;
/**
* Get the array.
@@ -75,7 +75,7 @@ public:
/**
* Get the data type from the underlying array.
*/
- int GetDataType() VTK_OVERRIDE;
+ int GetDataType() override;
/**
* Get the data type size from the underlying array.
@@ -95,7 +95,7 @@ public:
protected:
vtkBitArrayIterator();
- ~vtkBitArrayIterator() VTK_OVERRIDE;
+ ~vtkBitArrayIterator() override;
int *Tuple;
int TupleSize;
diff --git a/Common/Core/vtkBoxMuellerRandomSequence.h b/Common/Core/vtkBoxMuellerRandomSequence.h
index 24f3f72b47784ac51582514c5ee7c9c8b55fe056..10df0348590fe1c21a17c8044991c33ff373f138 100644
--- a/Common/Core/vtkBoxMuellerRandomSequence.h
+++ b/Common/Core/vtkBoxMuellerRandomSequence.h
@@ -33,19 +33,19 @@ class VTKCOMMONCORE_EXPORT vtkBoxMuellerRandomSequence: public vtkGaussianRandom
{
public:
vtkTypeMacro(vtkBoxMuellerRandomSequence,vtkGaussianRandomSequence);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkBoxMuellerRandomSequence* New();
/**
* Current value.
*/
- double GetValue() VTK_OVERRIDE;
+ double GetValue() override;
/**
* Move to the next number in the random sequence.
*/
- void Next() VTK_OVERRIDE;
+ void Next() override;
/**
* Return the uniformly distributed sequence of random numbers.
@@ -60,7 +60,7 @@ public:
protected:
vtkBoxMuellerRandomSequence();
- ~vtkBoxMuellerRandomSequence() VTK_OVERRIDE;
+ ~vtkBoxMuellerRandomSequence() override;
vtkRandomSequence *UniformSequence;
double Value;
diff --git a/Common/Core/vtkBuffer.h b/Common/Core/vtkBuffer.h
index 8d4e0f6ad2ce4da8ada50a7623f689fafd9741bb..43d7679c4ce4a5b85fbd0a4fe4dcbeaef0cf763c 100644
--- a/Common/Core/vtkBuffer.h
+++ b/Common/Core/vtkBuffer.h
@@ -78,7 +78,7 @@ protected:
{
}
- ~vtkBuffer() VTK_OVERRIDE
+ ~vtkBuffer() override
{
this->SetBuffer(nullptr, 0);
}
diff --git a/Common/Core/vtkByteSwap.h b/Common/Core/vtkByteSwap.h
index cd428dd3232055d96492fbd8469445c0c892b56b..15d0e2e87c6013c1cbec81a0ae95f3ea2c3ed804 100644
--- a/Common/Core/vtkByteSwap.h
+++ b/Common/Core/vtkByteSwap.h
@@ -134,7 +134,7 @@ public:
protected:
vtkByteSwap();
- ~vtkByteSwap() VTK_OVERRIDE;
+ ~vtkByteSwap() override;
private:
vtkByteSwap(const vtkByteSwap&) VTK_DELETE_FUNCTION;
diff --git a/Common/Core/vtkCallbackCommand.h b/Common/Core/vtkCallbackCommand.h
index ef04bb8ebfc742aca03632efd1b1ae3632ca7466..bc52dd5c90355033586801fe4c3a676a48d0f74c 100644
--- a/Common/Core/vtkCallbackCommand.h
+++ b/Common/Core/vtkCallbackCommand.h
@@ -57,7 +57,7 @@ public:
*/
void Execute(vtkObject *caller,
unsigned long eid,
- void *callData) VTK_OVERRIDE;
+ void *callData) override;
/**
* Methods to set and get client and callback information, and the callback
@@ -96,7 +96,7 @@ protected:
void *ClientData;
vtkCallbackCommand();
- ~vtkCallbackCommand() VTK_OVERRIDE;
+ ~vtkCallbackCommand() override;
};
#endif
diff --git a/Common/Core/vtkCharArray.h b/Common/Core/vtkCharArray.h
index 642006c1814781015231dbc5963b9b72f840e707..913a4a82fc60d2f64b9b872b7f1f2322f3f51d94 100644
--- a/Common/Core/vtkCharArray.h
+++ b/Common/Core/vtkCharArray.h
@@ -40,7 +40,7 @@ public:
#undef vtkDataArray
#endif
static vtkCharArray* New();
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
// This macro expands to the set of method declarations that
// make up the interface of vtkAOSDataArrayTemplate, which is ignored
@@ -69,7 +69,7 @@ public:
protected:
vtkCharArray();
- ~vtkCharArray() VTK_OVERRIDE;
+ ~vtkCharArray() override;
private:
diff --git a/Common/Core/vtkCollection.h b/Common/Core/vtkCollection.h
index 7c96e65870a2fdb1b1b24e2eaf0c3a1c8af347f5..c59786e0ebd16c7e080320c118be141b1ed7cf6a 100644
--- a/Common/Core/vtkCollection.h
+++ b/Common/Core/vtkCollection.h
@@ -49,7 +49,7 @@ class VTKCOMMONCORE_EXPORT vtkCollection : public vtkObject
{
public:
vtkTypeMacro(vtkCollection,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct with empty list.
@@ -145,13 +145,13 @@ public:
/**
* Participate in garbage collection.
*/
- void Register(vtkObjectBase* o) VTK_OVERRIDE;
- void UnRegister(vtkObjectBase* o) VTK_OVERRIDE;
+ void Register(vtkObjectBase* o) override;
+ void UnRegister(vtkObjectBase* o) override;
//@}
protected:
vtkCollection();
- ~vtkCollection() VTK_OVERRIDE;
+ ~vtkCollection() override;
virtual void RemoveElement(vtkCollectionElement *element,
vtkCollectionElement *previous);
@@ -164,7 +164,7 @@ protected:
friend class vtkCollectionIterator;
// See vtkGarbageCollector.h:
- void ReportReferences(vtkGarbageCollector* collector) VTK_OVERRIDE;
+ void ReportReferences(vtkGarbageCollector* collector) override;
private:
vtkCollection(const vtkCollection&) VTK_DELETE_FUNCTION;
void operator=(const vtkCollection&) VTK_DELETE_FUNCTION;
diff --git a/Common/Core/vtkCollectionIterator.h b/Common/Core/vtkCollectionIterator.h
index f1a9aedd7feeab6d18be7432f6906955030292ce..5c933af5aa81dc1eb780ed93438ca1b14259b0e8 100644
--- a/Common/Core/vtkCollectionIterator.h
+++ b/Common/Core/vtkCollectionIterator.h
@@ -38,7 +38,7 @@ class VTKCOMMONCORE_EXPORT vtkCollectionIterator : public vtkObject
{
public:
vtkTypeMacro(vtkCollectionIterator,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkCollectionIterator* New();
//@{
@@ -78,7 +78,7 @@ public:
protected:
vtkCollectionIterator();
- ~vtkCollectionIterator() VTK_OVERRIDE;
+ ~vtkCollectionIterator() override;
// The collection over which we are iterating.
vtkCollection* Collection;
diff --git a/Common/Core/vtkCommand.h b/Common/Core/vtkCommand.h
index ae7f786731129fdf32e791bcec136f600ec6fed1..d8859fe41e96179abbf29e46993e9aee51089263 100644
--- a/Common/Core/vtkCommand.h
+++ b/Common/Core/vtkCommand.h
@@ -364,7 +364,7 @@ public:
* count by 1).
*/
void UnRegister();
- void UnRegister(vtkObjectBase *) VTK_OVERRIDE
+ void UnRegister(vtkObjectBase *) override
{ this->UnRegister(); }
/**
@@ -439,7 +439,7 @@ protected:
int PassiveObserver;
vtkCommand();
- ~vtkCommand() VTK_OVERRIDE {}
+ ~vtkCommand() override {}
friend class vtkSubjectHelper;
diff --git a/Common/Core/vtkConditionVariable.h b/Common/Core/vtkConditionVariable.h
index 7da85dd7ae1188c10e70dce4e5d0ee9b2c3bfd77..5e56145aebeeeff1782c86199ed1ed63cc873f05 100644
--- a/Common/Core/vtkConditionVariable.h
+++ b/Common/Core/vtkConditionVariable.h
@@ -150,7 +150,7 @@ class VTKCOMMONCORE_EXPORT vtkConditionVariable : public vtkObject
public:
static vtkConditionVariable* New();
vtkTypeMacro(vtkConditionVariable,vtkObject);
- void PrintSelf( ostream& os, vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf( ostream& os, vtkIndent indent ) override;
/**
* Wake one thread waiting for the condition to change.
diff --git a/Common/Core/vtkCriticalSection.h b/Common/Core/vtkCriticalSection.h
index 6eb67b548cbc73e3818a5b2e2d014e45ffea33f6..ad916ed4bfb6e9bb936002d17c62ae21bbb6d54b 100644
--- a/Common/Core/vtkCriticalSection.h
+++ b/Common/Core/vtkCriticalSection.h
@@ -46,7 +46,7 @@ public:
static vtkCriticalSection *New();
vtkTypeMacro(vtkCriticalSection,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Lock the vtkCriticalSection
@@ -61,7 +61,7 @@ public:
protected:
vtkSimpleCriticalSection SimpleCriticalSection;
vtkCriticalSection() {}
- ~vtkCriticalSection() VTK_OVERRIDE {}
+ ~vtkCriticalSection() override {}
private:
vtkCriticalSection(const vtkCriticalSection&) VTK_DELETE_FUNCTION;
diff --git a/Common/Core/vtkDataArray.h b/Common/Core/vtkDataArray.h
index 9c5b9c752bd1176f21e692ee41f0ad769d8f8ff9..42df81c7cea8d92cd6143f4b30c39ce55568b2d3 100644
--- a/Common/Core/vtkDataArray.h
+++ b/Common/Core/vtkDataArray.h
@@ -49,7 +49,7 @@ class VTKCOMMONCORE_EXPORT vtkDataArray : public vtkAbstractArray
{
public:
vtkTypeMacro(vtkDataArray,vtkAbstractArray);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Perform a fast, safe cast from a vtkAbstractArray to a vtkDataArray.
@@ -65,7 +65,7 @@ public:
* All vtkDataArray subclasses contain numeric data, hence this method
* always returns 1(true).
*/
- int IsNumeric() VTK_OVERRIDE
+ int IsNumeric() override
{ return 1; }
/**
@@ -73,25 +73,25 @@ public:
* array. For vtkDataArray and subclasses this is the size of the
* data type.
*/
- int GetElementComponentSize() VTK_OVERRIDE
+ int GetElementComponentSize() override
{ return this->GetDataTypeSize(); }
// Reimplemented virtuals (doc strings are inherited from superclass):
void InsertTuple(vtkIdType dstTupleIdx, vtkIdType srcTupleIdx,
- vtkAbstractArray* source) VTK_OVERRIDE;
+ vtkAbstractArray* source) override;
vtkIdType InsertNextTuple(vtkIdType srcTupleIdx,
- vtkAbstractArray* source) VTK_OVERRIDE;
+ vtkAbstractArray* source) override;
void InsertTuples(vtkIdList *dstIds, vtkIdList *srcIds,
- vtkAbstractArray *source) VTK_OVERRIDE;
+ vtkAbstractArray *source) override;
void InsertTuples(vtkIdType dstStart, vtkIdType n, vtkIdType srcStart,
- vtkAbstractArray* source) VTK_OVERRIDE;
- void GetTuples(vtkIdList *tupleIds, vtkAbstractArray *output) VTK_OVERRIDE;
- void GetTuples(vtkIdType p1, vtkIdType p2, vtkAbstractArray *output) VTK_OVERRIDE;
+ vtkAbstractArray* source) override;
+ void GetTuples(vtkIdList *tupleIds, vtkAbstractArray *output) override;
+ void GetTuples(vtkIdType p1, vtkIdType p2, vtkAbstractArray *output) override;
void InterpolateTuple(vtkIdType dstTupleIdx, vtkIdList *ptIndices,
- vtkAbstractArray* source, double* weights) VTK_OVERRIDE;
+ vtkAbstractArray* source, double* weights) override;
void InterpolateTuple(vtkIdType dstTupleIdx,
vtkIdType srcTupleIdx1, vtkAbstractArray* source1,
- vtkIdType srcTupleIdx2, vtkAbstractArray* source2, double t) VTK_OVERRIDE;
+ vtkIdType srcTupleIdx2, vtkAbstractArray* source2, double t) override;
/**
* Get the data tuple at tupleIdx. Return it as a pointer to an array.
@@ -130,7 +130,7 @@ public:
//@}
void SetTuple(vtkIdType dstTupleIdx, vtkIdType srcTupleIdx,
- vtkAbstractArray* source) VTK_OVERRIDE;
+ vtkAbstractArray* source) override;
//@{
/**
@@ -286,7 +286,7 @@ public:
* Deep copy of data. Copies data from different data arrays even if
* they are different types (using doubleing-point exchange).
*/
- void DeepCopy(vtkAbstractArray *aa) VTK_OVERRIDE;
+ void DeepCopy(vtkAbstractArray *aa) override;
virtual void DeepCopy(vtkDataArray *da);
//@}
@@ -341,7 +341,7 @@ public:
* information returned is valid only after the pipeline has
* been updated.
*/
- unsigned long GetActualMemorySize() VTK_OVERRIDE;
+ unsigned long GetActualMemorySize() override;
/**
* Create default lookup table. Generally used to create one when none
@@ -528,7 +528,7 @@ public:
/**
* Removes out-of-date L2_NORM_RANGE() and L2_NORM_FINITE_RANGE() values.
*/
- void Modified() VTK_OVERRIDE;
+ void Modified() override;
/**
* A human-readable string indicating the units for the array data.
@@ -542,12 +542,12 @@ public:
* others must be. NOTE: Up to the implmenter to make sure that
* keys not inteneded to be coppied are excluded here.
*/
- int CopyInformation(vtkInformation *infoFrom, int deep=1) VTK_OVERRIDE;
+ int CopyInformation(vtkInformation *infoFrom, int deep=1) override;
/**
* Method for type-checking in FastDownCast implementations.
*/
- int GetArrayType() VTK_OVERRIDE { return DataArray; }
+ int GetArrayType() override { return DataArray; }
protected:
@@ -597,7 +597,7 @@ protected:
// Construct object with default tuple dimension (number of components) of 1.
vtkDataArray();
- ~vtkDataArray() VTK_OVERRIDE;
+ ~vtkDataArray() override;
vtkLookupTable *LookupTable;
double Range[2];
diff --git a/Common/Core/vtkDataArrayCollection.h b/Common/Core/vtkDataArrayCollection.h
index a35931a43a9f1b88e85448a51671df3ae17f38d9..e96d74686990ff17b591babb68092b2daff75ab5 100644
--- a/Common/Core/vtkDataArrayCollection.h
+++ b/Common/Core/vtkDataArrayCollection.h
@@ -63,7 +63,7 @@ public:
protected:
vtkDataArrayCollection() {}
- ~vtkDataArrayCollection() VTK_OVERRIDE {}
+ ~vtkDataArrayCollection() override {}
private:
diff --git a/Common/Core/vtkDataArrayCollectionIterator.h b/Common/Core/vtkDataArrayCollectionIterator.h
index c35ef83e12579f0c0f631b05da3fc64450283a0e..11051101933bf9c792a4647f80ed72f142d6f9ad 100644
--- a/Common/Core/vtkDataArrayCollectionIterator.h
+++ b/Common/Core/vtkDataArrayCollectionIterator.h
@@ -34,14 +34,14 @@ class VTKCOMMONCORE_EXPORT vtkDataArrayCollectionIterator : public vtkCollection
{
public:
vtkTypeMacro(vtkDataArrayCollectionIterator,vtkCollectionIterator);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkDataArrayCollectionIterator* New();
//@{
/**
* Set the collection over which to iterate.
*/
- void SetCollection(vtkCollection*) VTK_OVERRIDE;
+ void SetCollection(vtkCollection*) override;
void SetCollection(vtkDataArrayCollection*);
//@}
@@ -53,7 +53,7 @@ public:
protected:
vtkDataArrayCollectionIterator();
- ~vtkDataArrayCollectionIterator() VTK_OVERRIDE;
+ ~vtkDataArrayCollectionIterator() override;
private:
vtkDataArrayCollectionIterator(const vtkDataArrayCollectionIterator&) VTK_DELETE_FUNCTION;
diff --git a/Common/Core/vtkDataArraySelection.h b/Common/Core/vtkDataArraySelection.h
index a77049c8c5c8c009a55971b7015728f68634272a..e995e27adf4eebc83157388164190873f709654a 100644
--- a/Common/Core/vtkDataArraySelection.h
+++ b/Common/Core/vtkDataArraySelection.h
@@ -35,7 +35,7 @@ class VTKCOMMONCORE_EXPORT vtkDataArraySelection : public vtkObject
{
public:
vtkTypeMacro(vtkDataArraySelection,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkDataArraySelection* New();
/**
@@ -155,7 +155,7 @@ public:
protected:
vtkDataArraySelection();
- ~vtkDataArraySelection() VTK_OVERRIDE;
+ ~vtkDataArraySelection() override;
// Internal implementation details.
vtkDataArraySelectionInternals* Internal;
diff --git a/Common/Core/vtkDebugLeaks.h b/Common/Core/vtkDebugLeaks.h
index 1c7b5a983101f59d02caaad04e9fb897c7a4e6bb..8f755281479df35f86a0665ced4db8093ecfd4e5 100644
--- a/Common/Core/vtkDebugLeaks.h
+++ b/Common/Core/vtkDebugLeaks.h
@@ -95,7 +95,7 @@ public:
protected:
vtkDebugLeaks(){}
- ~vtkDebugLeaks() VTK_OVERRIDE{}
+ ~vtkDebugLeaks() override{}
static int DisplayMessageBox(const char*);
diff --git a/Common/Core/vtkDenseArray.h b/Common/Core/vtkDenseArray.h
index c068ba46f289e71dad2b6c4ba21c652fadf1443d..1401383734bff07b6d81c3bfbcd32b85600dec6a 100644
--- a/Common/Core/vtkDenseArray.h
+++ b/Common/Core/vtkDenseArray.h
@@ -56,30 +56,30 @@ class vtkDenseArray : public vtkTypedArray<T>
public:
static vtkDenseArray<T>* New();
vtkTemplateTypeMacro(vtkDenseArray<T>, vtkTypedArray<T>)
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
typedef typename vtkArray::CoordinateT CoordinateT;
typedef typename vtkArray::DimensionT DimensionT;
typedef typename vtkArray::SizeT SizeT;
// vtkArray API
- bool IsDense() VTK_OVERRIDE;
- const vtkArrayExtents& GetExtents() VTK_OVERRIDE;
- SizeT GetNonNullSize() VTK_OVERRIDE;
- void GetCoordinatesN(const SizeT n, vtkArrayCoordinates& coordinates) VTK_OVERRIDE;
- vtkArray* DeepCopy() VTK_OVERRIDE;
+ bool IsDense() override;
+ const vtkArrayExtents& GetExtents() override;
+ SizeT GetNonNullSize() override;
+ void GetCoordinatesN(const SizeT n, vtkArrayCoordinates& coordinates) override;
+ vtkArray* DeepCopy() override;
// vtkTypedArray API
- const T& GetValue(CoordinateT i) VTK_OVERRIDE;
- const T& GetValue(CoordinateT i, CoordinateT j) VTK_OVERRIDE;
- const T& GetValue(CoordinateT i, CoordinateT j, CoordinateT k) VTK_OVERRIDE;
- const T& GetValue(const vtkArrayCoordinates& coordinates) VTK_OVERRIDE;
- const T& GetValueN(const SizeT n) VTK_OVERRIDE;
- void SetValue(CoordinateT i, const T& value) VTK_OVERRIDE;
- void SetValue(CoordinateT i, CoordinateT j, const T& value) VTK_OVERRIDE;
- void SetValue(CoordinateT i, CoordinateT j, CoordinateT k, const T& value) VTK_OVERRIDE;
- void SetValue(const vtkArrayCoordinates& coordinates, const T& value) VTK_OVERRIDE;
- void SetValueN(const SizeT n, const T& value) VTK_OVERRIDE;
+ const T& GetValue(CoordinateT i) override;
+ const T& GetValue(CoordinateT i, CoordinateT j) override;
+ const T& GetValue(CoordinateT i, CoordinateT j, CoordinateT k) override;
+ const T& GetValue(const vtkArrayCoordinates& coordinates) override;
+ const T& GetValueN(const SizeT n) override;
+ void SetValue(CoordinateT i, const T& value) override;
+ void SetValue(CoordinateT i, CoordinateT j, const T& value) override;
+ void SetValue(CoordinateT i, CoordinateT j, CoordinateT k, const T& value) override;
+ void SetValue(const vtkArrayCoordinates& coordinates, const T& value) override;
+ void SetValueN(const SizeT n, const T& value) override;
// vtkDenseArray API
@@ -111,8 +111,8 @@ public:
{
public:
HeapMemoryBlock(const vtkArrayExtents& extents);
- ~HeapMemoryBlock() VTK_OVERRIDE;
- T* GetAddress() VTK_OVERRIDE;
+ ~HeapMemoryBlock() override;
+ T* GetAddress() override;
//@}
private:
@@ -177,15 +177,15 @@ public:
protected:
vtkDenseArray();
- ~vtkDenseArray() VTK_OVERRIDE;
+ ~vtkDenseArray() override;
private:
vtkDenseArray(const vtkDenseArray&) VTK_DELETE_FUNCTION;
void operator=(const vtkDenseArray&) VTK_DELETE_FUNCTION;
- void InternalResize(const vtkArrayExtents& extents) VTK_OVERRIDE;
- void InternalSetDimensionLabel(DimensionT i, const vtkStdString& label) VTK_OVERRIDE;
- vtkStdString InternalGetDimensionLabel(DimensionT i) VTK_OVERRIDE;
+ void InternalResize(const vtkArrayExtents& extents) override;
+ void InternalSetDimensionLabel(DimensionT i, const vtkStdString& label) override;
+ vtkStdString InternalGetDimensionLabel(DimensionT i) override;
inline vtkIdType MapCoordinates(CoordinateT i);
inline vtkIdType MapCoordinates(CoordinateT i, CoordinateT j);
inline vtkIdType MapCoordinates(CoordinateT i, CoordinateT j, CoordinateT k);
diff --git a/Common/Core/vtkDoubleArray.h b/Common/Core/vtkDoubleArray.h
index dec3c6bf23b65f10c2cdb61242d05fd2e3d98062..589a6ed708afe1caa3f8ec9dc7c3c915a623c80d 100644
--- a/Common/Core/vtkDoubleArray.h
+++ b/Common/Core/vtkDoubleArray.h
@@ -40,7 +40,7 @@ public:
#undef vtkDataArray
#endif
static vtkDoubleArray* New();
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
// This macro expands to the set of method declarations that
// make up the interface of vtkAOSDataArrayTemplate, which is ignored
@@ -69,7 +69,7 @@ public:
protected:
vtkDoubleArray();
- ~vtkDoubleArray() VTK_OVERRIDE;
+ ~vtkDoubleArray() override;
private:
diff --git a/Common/Core/vtkDynamicLoader.h b/Common/Core/vtkDynamicLoader.h
index 076118be1b60c67ccd3e4d864223f6e66bce2ebb..66c64cb54c5e08b1b10d962cf62755ca7f2a2c01 100644
--- a/Common/Core/vtkDynamicLoader.h
+++ b/Common/Core/vtkDynamicLoader.h
@@ -75,7 +75,7 @@ public:
protected:
vtkDynamicLoader() {}
- ~vtkDynamicLoader() VTK_OVERRIDE {}
+ ~vtkDynamicLoader() override {}
private:
vtkDynamicLoader(const vtkDynamicLoader&) VTK_DELETE_FUNCTION;
diff --git a/Common/Core/vtkEventData.h b/Common/Core/vtkEventData.h
index 9ab1f1800c6f4fc5b45d476a992b6897255370a7..ccfccbc76bab73e99aacb60c251ca6f18c59018f 100644
--- a/Common/Core/vtkEventData.h
+++ b/Common/Core/vtkEventData.h
@@ -76,7 +76,7 @@ public:
protected:
vtkEventData() {};
- ~vtkEventData() VTK_OVERRIDE {}
+ ~vtkEventData() override {}
// subclasses override this to define their
// definition of equivalent
@@ -103,14 +103,14 @@ public:
void SetInput(vtkEventDataDeviceInput v) { this->Input = v; }
void SetAction(vtkEventDataAction v) { this->Action = v; }
- vtkEventDataForDevice *GetAsEventDataForDevice() VTK_OVERRIDE { return this; }
+ vtkEventDataForDevice *GetAsEventDataForDevice() override { return this; }
protected:
vtkEventDataDevice Device;
vtkEventDataDeviceInput Input;
vtkEventDataAction Action;
- bool Equivalent(const vtkEventData *e) const VTK_OVERRIDE {
+ bool Equivalent(const vtkEventData *e) const override {
const vtkEventDataForDevice *edd = static_cast<const vtkEventDataForDevice *>(e);
return this->Device == edd->Device && this->Input == edd->Input && this->Action == edd->Action;
};
@@ -119,7 +119,7 @@ protected:
this->Device = vtkEventDataDevice::Unknown;
this->Input = vtkEventDataDeviceInput::Unknown;
this->Action = vtkEventDataAction::Unknown; }
- ~vtkEventDataForDevice() VTK_OVERRIDE {}
+ ~vtkEventDataForDevice() override {}
private:
vtkEventDataForDevice(const vtkEventData& c) VTK_DELETE_FUNCTION;
@@ -133,7 +133,7 @@ class vtkEventDataDevice3D : public vtkEventDataForDevice
public:
vtkTypeMacro(vtkEventDataDevice3D,vtkEventDataForDevice);
- vtkEventDataDevice3D *GetAsEventDataDevice3D() VTK_OVERRIDE { return this; }
+ vtkEventDataDevice3D *GetAsEventDataDevice3D() override { return this; }
void GetWorldPosition(double v[3]) const {
std::copy(this->WorldPosition, this->WorldPosition + 3, v);
@@ -181,7 +181,7 @@ protected:
double WorldDirection[3];
vtkEventDataDevice3D() {}
- ~vtkEventDataDevice3D() VTK_OVERRIDE {}
+ ~vtkEventDataDevice3D() override {}
private:
vtkEventDataDevice3D(const vtkEventDataDevice3D& c) VTK_DELETE_FUNCTION;
@@ -201,7 +201,7 @@ public:
protected:
vtkEventDataButton3D() { this->Type = vtkCommand::Button3DEvent; }
- ~vtkEventDataButton3D() VTK_OVERRIDE {}
+ ~vtkEventDataButton3D() override {}
private:
vtkEventDataButton3D(const vtkEventDataButton3D& c) VTK_DELETE_FUNCTION;
@@ -221,7 +221,7 @@ public:
protected:
vtkEventDataMove3D() { this->Type = vtkCommand::Move3DEvent; }
- ~vtkEventDataMove3D() VTK_OVERRIDE {}
+ ~vtkEventDataMove3D() override {}
private:
vtkEventDataMove3D(const vtkEventDataMove3D& c) VTK_DELETE_FUNCTION;
diff --git a/Common/Core/vtkEventForwarderCommand.h b/Common/Core/vtkEventForwarderCommand.h
index 72bec30ae0d19007400727970f929bcd7f6d2606..2c7cb6ac4d2e6615c8c477ee582ce32cfa75617f 100644
--- a/Common/Core/vtkEventForwarderCommand.h
+++ b/Common/Core/vtkEventForwarderCommand.h
@@ -47,7 +47,7 @@ public:
*/
void Execute(vtkObject *caller,
unsigned long eid,
- void *callData) VTK_OVERRIDE;
+ void *callData) override;
/**
* Methods to set and get client and callback information, and the callback
@@ -63,7 +63,7 @@ protected:
vtkObject *Target;
vtkEventForwarderCommand();
- ~vtkEventForwarderCommand() VTK_OVERRIDE {}
+ ~vtkEventForwarderCommand() override {}
};
#endif /* vtkEventForwarderCommand_h */
diff --git a/Common/Core/vtkFileOutputWindow.h b/Common/Core/vtkFileOutputWindow.h
index 13deee3d85f6a7371b259f67e67d93d8c3dfd534..df70ef41f20ce7680fe36e91232a006bd396ca54 100644
--- a/Common/Core/vtkFileOutputWindow.h
+++ b/Common/Core/vtkFileOutputWindow.h
@@ -35,13 +35,13 @@ public:
static vtkFileOutputWindow* New();
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Put the text into the log file.
* New lines are converted to carriage return new lines.
*/
- void DisplayText(const char*) VTK_OVERRIDE;
+ void DisplayText(const char*) override;
//@{
/**
@@ -75,7 +75,7 @@ public:
protected:
vtkFileOutputWindow();
- ~vtkFileOutputWindow() VTK_OVERRIDE;
+ ~vtkFileOutputWindow() override;
void Initialize();
char* FileName;
diff --git a/Common/Core/vtkFloatArray.h b/Common/Core/vtkFloatArray.h
index 0421896554e59d6a468a83738c78052d6f11c6ec..b6ed2d7a931a219f6cbb2b22c8d7975e1ccf2266 100644
--- a/Common/Core/vtkFloatArray.h
+++ b/Common/Core/vtkFloatArray.h
@@ -41,7 +41,7 @@ public:
#endif
static vtkFloatArray* New();
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
// This macro expands to the set of method declarations that
// make up the interface of vtkAOSDataArrayTemplate, which is ignored
@@ -71,7 +71,7 @@ public:
protected:
vtkFloatArray();
- ~vtkFloatArray() VTK_OVERRIDE;
+ ~vtkFloatArray() override;
private:
diff --git a/Common/Core/vtkGarbageCollector.cxx b/Common/Core/vtkGarbageCollector.cxx
index 9387d68056820cf4647b09978110dcf7d1d90e95..8dad45f3e4ea811f0d1faa6e67f3ce054bf41ebc 100644
--- a/Common/Core/vtkGarbageCollector.cxx
+++ b/Common/Core/vtkGarbageCollector.cxx
@@ -197,15 +197,15 @@ public:
vtkTypeMacro(vtkGarbageCollectorImpl, vtkGarbageCollector);
vtkGarbageCollectorImpl();
- ~vtkGarbageCollectorImpl() VTK_OVERRIDE;
+ ~vtkGarbageCollectorImpl() override;
// Description:
// Prevent normal vtkObject reference counting behavior.
- void Register(vtkObjectBase*) VTK_OVERRIDE;
+ void Register(vtkObjectBase*) override;
// Description:
// Prevent normal vtkObject reference counting behavior.
- void UnRegister(vtkObjectBase*) VTK_OVERRIDE;
+ void UnRegister(vtkObjectBase*) override;
// Perform a collection check.
void CollectInternal(vtkObjectBase* root);
@@ -359,7 +359,7 @@ public:
// Callback from objects to report references.
void Report(vtkObjectBase* obj, void* ptr);
- void Report(vtkObjectBase* obj, void* ptr, const char* desc) VTK_OVERRIDE;
+ void Report(vtkObjectBase* obj, void* ptr, const char* desc) override;
// Collect the objects of the given leaked component.
void CollectComponent(ComponentType* c);
diff --git a/Common/Core/vtkGarbageCollector.h b/Common/Core/vtkGarbageCollector.h
index 4e955cb5b846bb211f6db66820b61d4f666de052..9e08fc25146f2e62814b81d7c6ac846bcfbda590 100644
--- a/Common/Core/vtkGarbageCollector.h
+++ b/Common/Core/vtkGarbageCollector.h
@@ -31,18 +31,18 @@
* \code
*
* public:
- * void Register(vtkObjectBase* o) VTK_OVERRIDE
+ * void Register(vtkObjectBase* o) override
* {
* this->RegisterInternal(o, true);
* }
- * void UnRegister(vtkObjectBase* o) VTK_OVERRIDE
+ * void UnRegister(vtkObjectBase* o) override
* {
* this->UnRegisterInternal(o, true);
* }
*
* protected:
*
- * void ReportReferences(vtkGarbageCollector* collector) VTK_OVERRIDE
+ * void ReportReferences(vtkGarbageCollector* collector) override
* {
* // Report references held by this object that may be in a loop.
* this->Superclass::ReportReferences(collector);
@@ -97,7 +97,7 @@ class VTKCOMMONCORE_EXPORT vtkGarbageCollector : public vtkObject
{
public:
vtkTypeMacro(vtkGarbageCollector,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkGarbageCollector* New();
/**
@@ -149,7 +149,7 @@ public:
protected:
vtkGarbageCollector();
- ~vtkGarbageCollector() VTK_OVERRIDE;
+ ~vtkGarbageCollector() override;
private:
diff --git a/Common/Core/vtkGaussianRandomSequence.h b/Common/Core/vtkGaussianRandomSequence.h
index d12dbc40af915d282a4a219bf3b378ce61a4039c..800864e774d2fabbff1ad13e51410cc6d720f2f4 100644
--- a/Common/Core/vtkGaussianRandomSequence.h
+++ b/Common/Core/vtkGaussianRandomSequence.h
@@ -32,7 +32,7 @@ class VTKCOMMONCORE_EXPORT vtkGaussianRandomSequence : public vtkRandomSequence
{
public:
vtkTypeMacro(vtkGaussianRandomSequence,vtkRandomSequence);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Convenient method to return a value given the mean and standard deviation
@@ -45,7 +45,7 @@ public:
protected:
vtkGaussianRandomSequence();
- ~vtkGaussianRandomSequence() VTK_OVERRIDE;
+ ~vtkGaussianRandomSequence() override;
private:
vtkGaussianRandomSequence(const vtkGaussianRandomSequence&) VTK_DELETE_FUNCTION;
void operator=(const vtkGaussianRandomSequence&) VTK_DELETE_FUNCTION;
diff --git a/Common/Core/vtkGenericDataArray.h b/Common/Core/vtkGenericDataArray.h
index 14de917d38cc9e25bd4d15478039d4463672bcc8..dd8c75c35b92322d3c0f7469ca2421931406e103 100644
--- a/Common/Core/vtkGenericDataArray.h
+++ b/Common/Core/vtkGenericDataArray.h
@@ -174,11 +174,11 @@ public:
* Default implementation raises a runtime error. If subclasses keep on
* supporting this API, they should override this method.
*/
- void *GetVoidPointer(vtkIdType valueIdx) VTK_OVERRIDE;
+ void *GetVoidPointer(vtkIdType valueIdx) override;
ValueType* GetPointer(vtkIdType valueIdx);
- void SetVoidArray(void*, vtkIdType, int) VTK_OVERRIDE;
- void SetVoidArray(void*, vtkIdType, int, int) VTK_OVERRIDE;
- void* WriteVoidPointer(vtkIdType valueIdx, vtkIdType numValues) VTK_OVERRIDE;
+ void SetVoidArray(void*, vtkIdType, int) override;
+ void SetVoidArray(void*, vtkIdType, int, int) override;
+ void* WriteVoidPointer(vtkIdType valueIdx, vtkIdType numValues) override;
ValueType* WritePointer(vtkIdType valueIdx, vtkIdType numValues);
//@}
@@ -188,7 +188,7 @@ public:
* encouraged to reimplemented this method to support faster implementations,
* if needed.
*/
- void RemoveTuple(vtkIdType tupleIdx) VTK_OVERRIDE;
+ void RemoveTuple(vtkIdType tupleIdx) override;
/**
* Insert data at the end of the array. Return its location in the array.
@@ -248,71 +248,71 @@ public:
*/
virtual void FillValue(ValueType value);
- int GetDataType() VTK_OVERRIDE;
- int GetDataTypeSize() VTK_OVERRIDE;
- bool HasStandardMemoryLayout() VTK_OVERRIDE;
- int Allocate(vtkIdType size, vtkIdType ext = 1000) VTK_OVERRIDE;
- int Resize(vtkIdType numTuples) VTK_OVERRIDE;
- void SetNumberOfComponents(int num) VTK_OVERRIDE;
- void SetNumberOfTuples(vtkIdType number) VTK_OVERRIDE;
- void Initialize() VTK_OVERRIDE;
- void Squeeze() VTK_OVERRIDE;
+ int GetDataType() override;
+ int GetDataTypeSize() override;
+ bool HasStandardMemoryLayout() override;
+ int Allocate(vtkIdType size, vtkIdType ext = 1000) override;
+ int Resize(vtkIdType numTuples) override;
+ void SetNumberOfComponents(int num) override;
+ void SetNumberOfTuples(vtkIdType number) override;
+ void Initialize() override;
+ void Squeeze() override;
void SetTuple(vtkIdType dstTupleIdx, vtkIdType srcTupleIdx,
- vtkAbstractArray* source) VTK_OVERRIDE;
+ vtkAbstractArray* source) override;
// MSVC doesn't like 'using' here (error C2487). Just forward instead:
// using Superclass::SetTuple;
- void SetTuple(vtkIdType tupleIdx, const float *tuple) VTK_OVERRIDE
+ void SetTuple(vtkIdType tupleIdx, const float *tuple) override
{ this->Superclass::SetTuple(tupleIdx, tuple); }
- void SetTuple(vtkIdType tupleIdx, const double *tuple) VTK_OVERRIDE
+ void SetTuple(vtkIdType tupleIdx, const double *tuple) override
{ this->Superclass::SetTuple(tupleIdx, tuple); }
void InsertTuples(vtkIdList *dstIds, vtkIdList *srcIds,
- vtkAbstractArray *source) VTK_OVERRIDE;
+ vtkAbstractArray *source) override;
// MSVC doesn't like 'using' here (error C2487). Just forward instead:
// using Superclass::InsertTuples;
void InsertTuples(vtkIdType dstStart, vtkIdType n, vtkIdType srcStart,
- vtkAbstractArray* source) VTK_OVERRIDE
+ vtkAbstractArray* source) override
{ this->Superclass::InsertTuples(dstStart, n, srcStart, source); }
void InsertTuple(vtkIdType dstTupleIdx, vtkIdType srcTupleIdx,
- vtkAbstractArray *source) VTK_OVERRIDE;
- void InsertTuple(vtkIdType tupleIdx, const float *source) VTK_OVERRIDE;
- void InsertTuple(vtkIdType tupleIdx, const double *source) VTK_OVERRIDE;
+ vtkAbstractArray *source) override;
+ void InsertTuple(vtkIdType tupleIdx, const float *source) override;
+ void InsertTuple(vtkIdType tupleIdx, const double *source) override;
void InsertComponent(vtkIdType tupleIdx, int compIdx,
- double value) VTK_OVERRIDE;
+ double value) override;
vtkIdType InsertNextTuple(vtkIdType srcTupleIdx,
- vtkAbstractArray *source) VTK_OVERRIDE;
- vtkIdType InsertNextTuple(const float *tuple) VTK_OVERRIDE;
- vtkIdType InsertNextTuple(const double *tuple) VTK_OVERRIDE;
+ vtkAbstractArray *source) override;
+ vtkIdType InsertNextTuple(const float *tuple) override;
+ vtkIdType InsertNextTuple(const double *tuple) override;
void GetTuples(vtkIdList *tupleIds,
- vtkAbstractArray *output) VTK_OVERRIDE;
+ vtkAbstractArray *output) override;
void GetTuples(vtkIdType p1, vtkIdType p2,
- vtkAbstractArray *output) VTK_OVERRIDE;
- double *GetTuple(vtkIdType tupleIdx) VTK_OVERRIDE;
- void GetTuple(vtkIdType tupleIdx, double * tuple) VTK_OVERRIDE;
+ vtkAbstractArray *output) override;
+ double *GetTuple(vtkIdType tupleIdx) override;
+ void GetTuple(vtkIdType tupleIdx, double * tuple) override;
void InterpolateTuple(vtkIdType dstTupleIdx, vtkIdList *ptIndices,
vtkAbstractArray* source,
- double* weights) VTK_OVERRIDE;
+ double* weights) override;
void InterpolateTuple(vtkIdType dstTupleIdx,
vtkIdType srcTupleIdx1, vtkAbstractArray* source1,
- vtkIdType srcTupleIdx2, vtkAbstractArray* source2, double t) VTK_OVERRIDE;
- void SetComponent(vtkIdType tupleIdx, int compIdx, double value) VTK_OVERRIDE;
- double GetComponent(vtkIdType tupleIdx, int compIdx) VTK_OVERRIDE;
- void SetVariantValue(vtkIdType valueIdx, vtkVariant value) VTK_OVERRIDE;
- vtkVariant GetVariantValue(vtkIdType valueIdx) VTK_OVERRIDE;
- void InsertVariantValue(vtkIdType valueIdx, vtkVariant value) VTK_OVERRIDE;
- vtkIdType LookupValue(vtkVariant value) VTK_OVERRIDE;
+ vtkIdType srcTupleIdx2, vtkAbstractArray* source2, double t) override;
+ void SetComponent(vtkIdType tupleIdx, int compIdx, double value) override;
+ double GetComponent(vtkIdType tupleIdx, int compIdx) override;
+ void SetVariantValue(vtkIdType valueIdx, vtkVariant value) override;
+ vtkVariant GetVariantValue(vtkIdType valueIdx) override;
+ void InsertVariantValue(vtkIdType valueIdx, vtkVariant value) override;
+ vtkIdType LookupValue(vtkVariant value) override;
virtual vtkIdType LookupTypedValue(ValueType value);
- void LookupValue(vtkVariant value, vtkIdList* valueIds) VTK_OVERRIDE;
+ void LookupValue(vtkVariant value, vtkIdList* valueIds) override;
virtual void LookupTypedValue(ValueType value, vtkIdList* valueIds);
- void ClearLookup() VTK_OVERRIDE;
- void DataChanged() VTK_OVERRIDE;
- void FillComponent(int compIdx, double value) VTK_OVERRIDE;
- VTK_NEWINSTANCE vtkArrayIterator* NewIterator() VTK_OVERRIDE;
+ void ClearLookup() override;
+ void DataChanged() override;
+ void FillComponent(int compIdx, double value) override;
+ VTK_NEWINSTANCE vtkArrayIterator* NewIterator() override;
protected:
vtkGenericDataArray();
- ~vtkGenericDataArray() VTK_OVERRIDE;
+ ~vtkGenericDataArray() override;
/**
* Allocate space for numTuples. Old data is not preserved. If numTuples == 0,
@@ -359,7 +359,7 @@ private:
// implementation.
#define vtkAOSArrayNewInstanceMacro(thisClass) \
protected: \
- vtkObjectBase *NewInstanceInternal() const VTK_OVERRIDE \
+ vtkObjectBase *NewInstanceInternal() const override \
{ \
if (vtkDataArray *da = \
vtkDataArray::CreateDataArray(thisClass::VTK_DATA_TYPE)) \
diff --git a/Common/Core/vtkIdList.h b/Common/Core/vtkIdList.h
index 255916e158dddd75464ce9b03e319fe1c59e0904..f2122e4cbf5b64d948791ad2bac326bf151be46b 100644
--- a/Common/Core/vtkIdList.h
+++ b/Common/Core/vtkIdList.h
@@ -42,7 +42,7 @@ public:
int Allocate(const vtkIdType sz, const int strategy=0);
vtkTypeMacro(vtkIdList,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Return the number of id's in the list.
@@ -152,7 +152,7 @@ public:
protected:
vtkIdList();
- ~vtkIdList() VTK_OVERRIDE;
+ ~vtkIdList() override;
vtkIdType NumberOfIds;
vtkIdType Size;
diff --git a/Common/Core/vtkIdListCollection.h b/Common/Core/vtkIdListCollection.h
index 32beabd1c7751a6b6a47221adba6a2da722ee5ea..c6e4431639dbe07f20cf3d30de190bf6a658a042 100644
--- a/Common/Core/vtkIdListCollection.h
+++ b/Common/Core/vtkIdListCollection.h
@@ -63,7 +63,7 @@ public:
protected:
vtkIdListCollection() {}
- ~vtkIdListCollection() VTK_OVERRIDE {}
+ ~vtkIdListCollection() override {}
private:
diff --git a/Common/Core/vtkIdTypeArray.h b/Common/Core/vtkIdTypeArray.h
index c4cca2f17939acf723c0a1c3250835322a65d2da..156eba55c3fe26da689ee61900e890b8fa9160d8 100644
--- a/Common/Core/vtkIdTypeArray.h
+++ b/Common/Core/vtkIdTypeArray.h
@@ -40,7 +40,7 @@ public:
#undef vtkDataArray
#endif
static vtkIdTypeArray* New();
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
// This macro expands to the set of method declarations that
// make up the interface of vtkAOSDataArrayTemplate, which is ignored
@@ -52,7 +52,7 @@ public:
/**
* Get the data type.
*/
- int GetDataType() VTK_OVERRIDE
+ int GetDataType() override
{
// This needs to overwritten from superclass because
// the templated superclass is not able to differentiate
@@ -83,7 +83,7 @@ public:
protected:
vtkIdTypeArray();
- ~vtkIdTypeArray() VTK_OVERRIDE;
+ ~vtkIdTypeArray() override;
private:
diff --git a/Common/Core/vtkInformation.h b/Common/Core/vtkInformation.h
index 633f78679a9eeac6242cb27ba4f8ff2d29a392ea..5864e4a4cb4cf02b9101c6c1e03398c635d77f8d 100644
--- a/Common/Core/vtkInformation.h
+++ b/Common/Core/vtkInformation.h
@@ -82,14 +82,14 @@ class VTK_INFORMATION_EXPORT vtkInformation : public vtkObject
public:
VTKCOMMONCORE_EXPORT static vtkInformation *New();
vtkTypeMacro(vtkInformation,vtkObject);
- VTKCOMMONCORE_EXPORT void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ VTKCOMMONCORE_EXPORT void PrintSelf(ostream& os, vtkIndent indent) override;
VTKCOMMONCORE_EXPORT void PrintKeys(ostream& os, vtkIndent indent);
/**
* Modified signature with no arguments that calls Modified
* on vtkObject superclass.
*/
- VTKCOMMONCORE_EXPORT void Modified() VTK_OVERRIDE;
+ VTKCOMMONCORE_EXPORT void Modified() override;
/**
* Modified signature that takes an information key as an argument.
@@ -469,8 +469,8 @@ public:
/**
* Initiate garbage collection when a reference is removed.
*/
- VTKCOMMONCORE_EXPORT void Register(vtkObjectBase* o) VTK_OVERRIDE;
- VTKCOMMONCORE_EXPORT void UnRegister(vtkObjectBase* o) VTK_OVERRIDE;
+ VTKCOMMONCORE_EXPORT void Register(vtkObjectBase* o) override;
+ VTKCOMMONCORE_EXPORT void UnRegister(vtkObjectBase* o) override;
//@}
//@{
@@ -483,7 +483,7 @@ public:
protected:
VTKCOMMONCORE_EXPORT vtkInformation();
- VTKCOMMONCORE_EXPORT ~vtkInformation() VTK_OVERRIDE;
+ VTKCOMMONCORE_EXPORT ~vtkInformation() override;
// Get/Set a map entry directly through the vtkObjectBase instance
// representing the value. Used internally to manage the map.
@@ -497,7 +497,7 @@ protected:
vtkInformationInternals* Internal;
// Garbage collection support.
- VTKCOMMONCORE_EXPORT void ReportReferences(vtkGarbageCollector*) VTK_OVERRIDE;
+ VTKCOMMONCORE_EXPORT void ReportReferences(vtkGarbageCollector*) override;
// Report the object associated with the given key to the collector.
VTKCOMMONCORE_EXPORT void ReportAsObjectBase(vtkInformationKey* key,
diff --git a/Common/Core/vtkInformationDataObjectKey.h b/Common/Core/vtkInformationDataObjectKey.h
index 2f621ea93acdabe2be7b65933db57c956a8257d3..7af779afb82c90b7cd9a4956b412ccde7b79b32f 100644
--- a/Common/Core/vtkInformationDataObjectKey.h
+++ b/Common/Core/vtkInformationDataObjectKey.h
@@ -34,10 +34,10 @@ class VTKCOMMONCORE_EXPORT vtkInformationDataObjectKey : public vtkInformationKe
{
public:
vtkTypeMacro(vtkInformationDataObjectKey,vtkInformationKey);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
vtkInformationDataObjectKey(const char* name, const char* location);
- ~vtkInformationDataObjectKey() VTK_OVERRIDE;
+ ~vtkInformationDataObjectKey() override;
/**
* This method simply returns a new vtkInformationDataObjectKey, given a
@@ -63,12 +63,12 @@ public:
* object to another. If there is no entry in the first information
* object for this key, the value is removed from the second.
*/
- void ShallowCopy(vtkInformation* from, vtkInformation* to) VTK_OVERRIDE;
+ void ShallowCopy(vtkInformation* from, vtkInformation* to) override;
/**
* Report a reference this key has in the given information object.
*/
- void Report(vtkInformation* info, vtkGarbageCollector* collector) VTK_OVERRIDE;
+ void Report(vtkInformation* info, vtkGarbageCollector* collector) override;
private:
vtkInformationDataObjectKey(const vtkInformationDataObjectKey&) VTK_DELETE_FUNCTION;
diff --git a/Common/Core/vtkInformationDoubleKey.h b/Common/Core/vtkInformationDoubleKey.h
index f8a9040e49983be2a42b5d6be1acf1cca07ca8bf..7e7693fa10b817b5df3e3251ef9b44b91ef5b6d6 100644
--- a/Common/Core/vtkInformationDoubleKey.h
+++ b/Common/Core/vtkInformationDoubleKey.h
@@ -32,10 +32,10 @@ class VTKCOMMONCORE_EXPORT vtkInformationDoubleKey : public vtkInformationKey
{
public:
vtkTypeMacro(vtkInformationDoubleKey,vtkInformationKey);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
vtkInformationDoubleKey(const char* name, const char* location);
- ~vtkInformationDoubleKey() VTK_OVERRIDE;
+ ~vtkInformationDoubleKey() override;
/**
* This method simply returns a new vtkInformationDoubleKey, given a
@@ -61,12 +61,12 @@ public:
* object to another. If there is no entry in the first information
* object for this key, the value is removed from the second.
*/
- void ShallowCopy(vtkInformation* from, vtkInformation* to) VTK_OVERRIDE;
+ void ShallowCopy(vtkInformation* from, vtkInformation* to) override;
/**
* Print the key's value in an information object to a stream.
*/
- void Print(ostream& os, vtkInformation* info) VTK_OVERRIDE;
+ void Print(ostream& os, vtkInformation* info) override;
protected:
/**
diff --git a/Common/Core/vtkInformationDoubleVectorKey.h b/Common/Core/vtkInformationDoubleVectorKey.h
index 51c1e6dae1cca6f6c2fd76228561ffe5a81613dc..107fd83b619ede4ea43027747a50f5dd7c250d9b 100644
--- a/Common/Core/vtkInformationDoubleVectorKey.h
+++ b/Common/Core/vtkInformationDoubleVectorKey.h
@@ -32,11 +32,11 @@ class VTKCOMMONCORE_EXPORT vtkInformationDoubleVectorKey : public vtkInformation
{
public:
vtkTypeMacro(vtkInformationDoubleVectorKey,vtkInformationKey);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
vtkInformationDoubleVectorKey(const char* name, const char* location,
int length=-1);
- ~vtkInformationDoubleVectorKey() VTK_OVERRIDE;
+ ~vtkInformationDoubleVectorKey() override;
/**
* This method simply returns a new vtkInformationDoubleVectorKey, given a
@@ -67,12 +67,12 @@ public:
* object to another. If there is no entry in the first information
* object for this key, the value is removed from the second.
*/
- void ShallowCopy(vtkInformation* from, vtkInformation* to) VTK_OVERRIDE;
+ void ShallowCopy(vtkInformation* from, vtkInformation* to) override;
/**
* Print the key's value in an information object to a stream.
*/
- void Print(ostream& os, vtkInformation* info) VTK_OVERRIDE;
+ void Print(ostream& os, vtkInformation* info) override;
protected:
// The required length of the vector value (-1 is no restriction).
diff --git a/Common/Core/vtkInformationIdTypeKey.h b/Common/Core/vtkInformationIdTypeKey.h
index e1cfc717c270e3b617dd855ba62731e9c48ed98a..3089dd54faab7d63996fb837cb9569ece5e179bd 100644
--- a/Common/Core/vtkInformationIdTypeKey.h
+++ b/Common/Core/vtkInformationIdTypeKey.h
@@ -32,10 +32,10 @@ class VTKCOMMONCORE_EXPORT vtkInformationIdTypeKey : public vtkInformationKey
{
public:
vtkTypeMacro(vtkInformationIdTypeKey,vtkInformationKey);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
vtkInformationIdTypeKey(const char* name, const char* location);
- ~vtkInformationIdTypeKey() VTK_OVERRIDE;
+ ~vtkInformationIdTypeKey() override;
/**
* This method simply returns a new vtkInformationIdTypeKey, given a
@@ -61,12 +61,12 @@ public:
* object to another. If there is no entry in the first information
* object for this key, the value is removed from the second.
*/
- void ShallowCopy(vtkInformation* from, vtkInformation* to) VTK_OVERRIDE;
+ void ShallowCopy(vtkInformation* from, vtkInformation* to) override;
/**
* Print the key's value in an information object to a stream.
*/
- void Print(ostream& os, vtkInformation* info) VTK_OVERRIDE;
+ void Print(ostream& os, vtkInformation* info) override;
protected:
/**
diff --git a/Common/Core/vtkInformationInformationKey.h b/Common/Core/vtkInformationInformationKey.h
index de751a346ac930cf47e091748274ce62617a1a0f..513d2839a1dc6a4be9b64e54f040a89f4c271e3e 100644
--- a/Common/Core/vtkInformationInformationKey.h
+++ b/Common/Core/vtkInformationInformationKey.h
@@ -32,10 +32,10 @@ class VTKCOMMONCORE_EXPORT vtkInformationInformationKey : public vtkInformationK
{
public:
vtkTypeMacro(vtkInformationInformationKey,vtkInformationKey);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
vtkInformationInformationKey(const char* name, const char* location);
- ~vtkInformationInformationKey() VTK_OVERRIDE;
+ ~vtkInformationInformationKey() override;
/**
* This method simply returns a new vtkInformationInformationKey, given a
@@ -61,14 +61,14 @@ public:
* object to another. If there is no entry in the first information
* object for this key, the value is removed from the second.
*/
- void ShallowCopy(vtkInformation* from, vtkInformation* to) VTK_OVERRIDE;
+ void ShallowCopy(vtkInformation* from, vtkInformation* to) override;
/**
* Duplicate (new instance created) the entry associated with this key from
* one information object to another (new instances of any contained
* vtkInformation and vtkInformationVector objects are created).
*/
- void DeepCopy(vtkInformation* from, vtkInformation* to) VTK_OVERRIDE;
+ void DeepCopy(vtkInformation* from, vtkInformation* to) override;
private:
vtkInformationInformationKey(const vtkInformationInformationKey&) VTK_DELETE_FUNCTION;
diff --git a/Common/Core/vtkInformationInformationVectorKey.h b/Common/Core/vtkInformationInformationVectorKey.h
index 71471092e04b2872599f1c4d6bdb06b27bdf794f..0a0125c5e7c6af47551d04fe5c678606876a16ef 100644
--- a/Common/Core/vtkInformationInformationVectorKey.h
+++ b/Common/Core/vtkInformationInformationVectorKey.h
@@ -34,10 +34,10 @@ class VTKCOMMONCORE_EXPORT vtkInformationInformationVectorKey : public vtkInform
{
public:
vtkTypeMacro(vtkInformationInformationVectorKey,vtkInformationKey);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
vtkInformationInformationVectorKey(const char* name, const char* location);
- ~vtkInformationInformationVectorKey() VTK_OVERRIDE;
+ ~vtkInformationInformationVectorKey() override;
//@{
/**
@@ -53,19 +53,19 @@ public:
* object to another. If there is no entry in the first information
* object for this key, the value is removed from the second.
*/
- void ShallowCopy(vtkInformation* from, vtkInformation* to) VTK_OVERRIDE;
+ void ShallowCopy(vtkInformation* from, vtkInformation* to) override;
/**
* Duplicate (new instance created) the entry associated with this key from
* one information object to another (new instances of any contained
* vtkInformation and vtkInformationVector objects are created).
*/
- void DeepCopy(vtkInformation* from, vtkInformation* to) VTK_OVERRIDE;
+ void DeepCopy(vtkInformation* from, vtkInformation* to) override;
/**
* Report a reference this key has in the given information object.
*/
- void Report(vtkInformation* info, vtkGarbageCollector* collector) VTK_OVERRIDE;
+ void Report(vtkInformation* info, vtkGarbageCollector* collector) override;
private:
vtkInformationInformationVectorKey(const vtkInformationInformationVectorKey&) VTK_DELETE_FUNCTION;
diff --git a/Common/Core/vtkInformationIntegerKey.h b/Common/Core/vtkInformationIntegerKey.h
index b0579ed07f175786cceabaac2880a1f028315b33..59f16e316d7e2ed8b566b3b88600bace46121395 100644
--- a/Common/Core/vtkInformationIntegerKey.h
+++ b/Common/Core/vtkInformationIntegerKey.h
@@ -32,10 +32,10 @@ class VTKCOMMONCORE_EXPORT vtkInformationIntegerKey : public vtkInformationKey
{
public:
vtkTypeMacro(vtkInformationIntegerKey,vtkInformationKey);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
vtkInformationIntegerKey(const char* name, const char* location);
- ~vtkInformationIntegerKey() VTK_OVERRIDE;
+ ~vtkInformationIntegerKey() override;
/**
* This method simply returns a new vtkInformationIntegerKey, given a
@@ -61,12 +61,12 @@ public:
* object to another. If there is no entry in the first information
* object for this key, the value is removed from the second.
*/
- void ShallowCopy(vtkInformation* from, vtkInformation* to) VTK_OVERRIDE;
+ void ShallowCopy(vtkInformation* from, vtkInformation* to) override;
/**
* Print the key's value in an information object to a stream.
*/
- void Print(ostream& os, vtkInformation* info) VTK_OVERRIDE;
+ void Print(ostream& os, vtkInformation* info) override;
protected:
/**
diff --git a/Common/Core/vtkInformationIntegerPointerKey.h b/Common/Core/vtkInformationIntegerPointerKey.h
index 20a992d1c83f4dad58d41a9392c25da5ac28e61d..080da058a5f08e4c77edde37c7167bba7a8cbad2 100644
--- a/Common/Core/vtkInformationIntegerPointerKey.h
+++ b/Common/Core/vtkInformationIntegerPointerKey.h
@@ -32,11 +32,11 @@ class VTKCOMMONCORE_EXPORT vtkInformationIntegerPointerKey : public vtkInformati
{
public:
vtkTypeMacro(vtkInformationIntegerPointerKey,vtkInformationKey);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
vtkInformationIntegerPointerKey(const char* name, const char* location,
int length=-1);
- ~vtkInformationIntegerPointerKey() VTK_OVERRIDE;
+ ~vtkInformationIntegerPointerKey() override;
//@{
/**
@@ -54,12 +54,12 @@ public:
* object to another. If there is no entry in the first information
* object for this key, the value is removed from the second.
*/
- void ShallowCopy(vtkInformation* from, vtkInformation* to) VTK_OVERRIDE;
+ void ShallowCopy(vtkInformation* from, vtkInformation* to) override;
/**
* Print the key's value in an information object to a stream.
*/
- void Print(ostream& os, vtkInformation* info) VTK_OVERRIDE;
+ void Print(ostream& os, vtkInformation* info) override;
protected:
// The required length of the vector value (-1 is no restriction).
diff --git a/Common/Core/vtkInformationIntegerVectorKey.h b/Common/Core/vtkInformationIntegerVectorKey.h
index 8e2f36d2193d957475c0feabfb8c5033c0a4933c..a795052103aebeb0b73a5f9668441161d5769146 100644
--- a/Common/Core/vtkInformationIntegerVectorKey.h
+++ b/Common/Core/vtkInformationIntegerVectorKey.h
@@ -32,11 +32,11 @@ class VTKCOMMONCORE_EXPORT vtkInformationIntegerVectorKey : public vtkInformatio
{
public:
vtkTypeMacro(vtkInformationIntegerVectorKey,vtkInformationKey);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
vtkInformationIntegerVectorKey(const char* name, const char* location,
int length=-1);
- ~vtkInformationIntegerVectorKey() VTK_OVERRIDE;
+ ~vtkInformationIntegerVectorKey() override;
/**
* This method simply returns a new vtkInformationIntegerVectorKey, given a
@@ -68,12 +68,12 @@ public:
* object to another. If there is no entry in the first information
* object for this key, the value is removed from the second.
*/
- void ShallowCopy(vtkInformation* from, vtkInformation* to) VTK_OVERRIDE;
+ void ShallowCopy(vtkInformation* from, vtkInformation* to) override;
/**
* Print the key's value in an information object to a stream.
*/
- void Print(ostream& os, vtkInformation* info) VTK_OVERRIDE;
+ void Print(ostream& os, vtkInformation* info) override;
protected:
// The required length of the vector value (-1 is no restriction).
diff --git a/Common/Core/vtkInformationIterator.h b/Common/Core/vtkInformationIterator.h
index 1ffb968eaa9f35a8266cc1416493c5eb3e9cf361..e848ed3cb8b777686d5b8849ac303c95c3d16b6d 100644
--- a/Common/Core/vtkInformationIterator.h
+++ b/Common/Core/vtkInformationIterator.h
@@ -39,7 +39,7 @@ class VTKCOMMONCORE_EXPORT vtkInformationIterator : public vtkObject
public:
static vtkInformationIterator *New();
vtkTypeMacro(vtkInformationIterator,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -86,7 +86,7 @@ public:
protected:
vtkInformationIterator();
- ~vtkInformationIterator() VTK_OVERRIDE;
+ ~vtkInformationIterator() override;
vtkInformation* Information;
vtkInformationIteratorInternals* Internal;
diff --git a/Common/Core/vtkInformationKey.h b/Common/Core/vtkInformationKey.h
index b79ab6d49727f07fc53eb326742c2b2d0fbc0a15..96c10897082489b6ea07fb45554aac2df72a7c96 100644
--- a/Common/Core/vtkInformationKey.h
+++ b/Common/Core/vtkInformationKey.h
@@ -39,17 +39,17 @@ class VTKCOMMONCORE_EXPORT vtkInformationKey : public vtkObjectBase
{
public:
vtkBaseTypeMacro(vtkInformationKey,vtkObjectBase);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Prevent normal vtkObject reference counting behavior.
*/
- void Register(vtkObjectBase*) VTK_OVERRIDE;
+ void Register(vtkObjectBase*) override;
/**
* Prevent normal vtkObject reference counting behavior.
*/
- void UnRegister(vtkObjectBase*) VTK_OVERRIDE;
+ void UnRegister(vtkObjectBase*) override;
/**
* Get the name of the key. This is not the type of the key, but
@@ -72,7 +72,7 @@ public:
* literals because the strings are not copied.
*/
vtkInformationKey(const char* name, const char* location);
- ~vtkInformationKey() VTK_OVERRIDE;
+ ~vtkInformationKey() override;
//@}
/**
diff --git a/Common/Core/vtkInformationKeyLookup.h b/Common/Core/vtkInformationKeyLookup.h
index 347913d919c915340525bc0df5d8a9ee94dec1a0..256103839316a31aa1668765d932f2fcb51dc465 100644
--- a/Common/Core/vtkInformationKeyLookup.h
+++ b/Common/Core/vtkInformationKeyLookup.h
@@ -40,7 +40,7 @@ public:
/**
* Lists all known keys.
*/
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Find an information key from name and location strings. For example,
@@ -53,7 +53,7 @@ public:
protected:
vtkInformationKeyLookup();
- ~vtkInformationKeyLookup() VTK_OVERRIDE;
+ ~vtkInformationKeyLookup() override;
friend class vtkInformationKey;
diff --git a/Common/Core/vtkInformationKeyVectorKey.h b/Common/Core/vtkInformationKeyVectorKey.h
index 7c04cb11031475383c52c044f14148bb94f567f9..6dee27c68302f46aa60cb6080e12fc5bae506c70 100644
--- a/Common/Core/vtkInformationKeyVectorKey.h
+++ b/Common/Core/vtkInformationKeyVectorKey.h
@@ -32,10 +32,10 @@ class VTKCOMMONCORE_EXPORT vtkInformationKeyVectorKey : public vtkInformationKey
{
public:
vtkTypeMacro(vtkInformationKeyVectorKey,vtkInformationKey);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
vtkInformationKeyVectorKey(const char* name, const char* location);
- ~vtkInformationKeyVectorKey() VTK_OVERRIDE;
+ ~vtkInformationKeyVectorKey() override;
/**
* This method simply returns a new vtkInformationKeyVectorKey, given a
@@ -67,12 +67,12 @@ public:
* object to another. If there is no entry in the first information
* object for this key, the value is removed from the second.
*/
- void ShallowCopy(vtkInformation* from, vtkInformation* to) VTK_OVERRIDE;
+ void ShallowCopy(vtkInformation* from, vtkInformation* to) override;
/**
* Print the key's value in an information object to a stream.
*/
- void Print(ostream& os, vtkInformation* info) VTK_OVERRIDE;
+ void Print(ostream& os, vtkInformation* info) override;
private:
vtkInformationKeyVectorKey(const vtkInformationKeyVectorKey&) VTK_DELETE_FUNCTION;
diff --git a/Common/Core/vtkInformationObjectBaseKey.h b/Common/Core/vtkInformationObjectBaseKey.h
index 5716ffef8e78ccb0a75540dd2d635ac9b64f3ee6..c73061782d390504e4e3db393222870462b53cc5 100644
--- a/Common/Core/vtkInformationObjectBaseKey.h
+++ b/Common/Core/vtkInformationObjectBaseKey.h
@@ -34,11 +34,11 @@ class VTKCOMMONCORE_EXPORT vtkInformationObjectBaseKey : public vtkInformationKe
{
public:
vtkTypeMacro(vtkInformationObjectBaseKey,vtkInformationKey);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
vtkInformationObjectBaseKey(const char* name, const char* location,
const char* requiredClass=nullptr);
- ~vtkInformationObjectBaseKey() VTK_OVERRIDE;
+ ~vtkInformationObjectBaseKey() override;
/**
* This method simply returns a new vtkInformationObjectBaseKey, given a
@@ -66,12 +66,12 @@ public:
* object to another. If there is no entry in the first information
* object for this key, the value is removed from the second.
*/
- void ShallowCopy(vtkInformation* from, vtkInformation* to) VTK_OVERRIDE;
+ void ShallowCopy(vtkInformation* from, vtkInformation* to) override;
/**
* Report a reference this key has in the given information object.
*/
- void Report(vtkInformation* info, vtkGarbageCollector* collector) VTK_OVERRIDE;
+ void Report(vtkInformation* info, vtkGarbageCollector* collector) override;
protected:
// The type required of all objects stored with this key.
diff --git a/Common/Core/vtkInformationObjectBaseVectorKey.h b/Common/Core/vtkInformationObjectBaseVectorKey.h
index 1ef759bce502e70eee016eedae613efe7a27c10e..12d1f983d9f31e7d52c5da2d81c6ce5b5762a332 100644
--- a/Common/Core/vtkInformationObjectBaseVectorKey.h
+++ b/Common/Core/vtkInformationObjectBaseVectorKey.h
@@ -35,7 +35,7 @@ class VTKCOMMONCORE_EXPORT vtkInformationObjectBaseVectorKey : public vtkInforma
{
public:
vtkTypeMacro(vtkInformationObjectBaseVectorKey,vtkInformationKey);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
* The name of the static instance and the class in which
@@ -49,7 +49,7 @@ public:
const char* location,
const char* requiredClass=nullptr);
//
- ~vtkInformationObjectBaseVectorKey() VTK_OVERRIDE;
+ ~vtkInformationObjectBaseVectorKey() override;
//@}
/**
@@ -140,12 +140,12 @@ public:
* object to another. If there is no entry in the first information
* object for this key, the value is removed from the second.
*/
- void ShallowCopy(vtkInformation* from, vtkInformation* to) VTK_OVERRIDE;
+ void ShallowCopy(vtkInformation* from, vtkInformation* to) override;
/**
* Print the key's value in an information object to a stream.
*/
- void Print(ostream& os, vtkInformation* info) VTK_OVERRIDE;
+ void Print(ostream& os, vtkInformation* info) override;
protected:
// The type required of all objects stored with this key.
diff --git a/Common/Core/vtkInformationRequestKey.h b/Common/Core/vtkInformationRequestKey.h
index fcd1edf4483de3a2364362ae56296a693aa36316..74a3fc5dba2ab44cad6edbcd2328cb2675fa4cf8 100644
--- a/Common/Core/vtkInformationRequestKey.h
+++ b/Common/Core/vtkInformationRequestKey.h
@@ -32,10 +32,10 @@ class VTKCOMMONCORE_EXPORT vtkInformationRequestKey : public vtkInformationKey
{
public:
vtkTypeMacro(vtkInformationRequestKey,vtkInformationKey);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
vtkInformationRequestKey(const char* name, const char* location);
- ~vtkInformationRequestKey() VTK_OVERRIDE;
+ ~vtkInformationRequestKey() override;
/**
* This method simply returns a new vtkInformationRequestKey, given a
@@ -53,8 +53,8 @@ public:
* information object.
*/
void Set(vtkInformation* info);
- void Remove(vtkInformation* info) VTK_OVERRIDE;
- int Has(vtkInformation* info) VTK_OVERRIDE;
+ void Remove(vtkInformation* info) override;
+ int Has(vtkInformation* info) override;
//@}
/**
@@ -62,12 +62,12 @@ public:
* object to another. If there is no entry in the first information
* object for this key, the value is removed from the second.
*/
- void ShallowCopy(vtkInformation* from, vtkInformation* to) VTK_OVERRIDE;
+ void ShallowCopy(vtkInformation* from, vtkInformation* to) override;
/**
* Print the key's value in an information object to a stream.
*/
- void Print(ostream& os, vtkInformation* info) VTK_OVERRIDE;
+ void Print(ostream& os, vtkInformation* info) override;
private:
vtkInformationRequestKey(const vtkInformationRequestKey&) VTK_DELETE_FUNCTION;
diff --git a/Common/Core/vtkInformationStringKey.h b/Common/Core/vtkInformationStringKey.h
index 37ee80ad867eb2216e2f39a0a253e19982745b31..3042d412b5cd807b618058b452a38ac61fbdb751 100644
--- a/Common/Core/vtkInformationStringKey.h
+++ b/Common/Core/vtkInformationStringKey.h
@@ -34,10 +34,10 @@ class VTKCOMMONCORE_EXPORT vtkInformationStringKey : public vtkInformationKey
{
public:
vtkTypeMacro(vtkInformationStringKey,vtkInformationKey);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
vtkInformationStringKey(const char* name, const char* location);
- ~vtkInformationStringKey() VTK_OVERRIDE;
+ ~vtkInformationStringKey() override;
/**
* This method simply returns a new vtkInformationStringKey, given a
@@ -64,12 +64,12 @@ public:
* object to another. If there is no entry in the first information
* object for this key, the value is removed from the second.
*/
- void ShallowCopy(vtkInformation* from, vtkInformation* to) VTK_OVERRIDE;
+ void ShallowCopy(vtkInformation* from, vtkInformation* to) override;
/**
* Print the key's value in an information object to a stream.
*/
- void Print(ostream& os, vtkInformation* info) VTK_OVERRIDE;
+ void Print(ostream& os, vtkInformation* info) override;
private:
vtkInformationStringKey(const vtkInformationStringKey&) VTK_DELETE_FUNCTION;
diff --git a/Common/Core/vtkInformationStringVectorKey.h b/Common/Core/vtkInformationStringVectorKey.h
index 775be47df2410d722902ed3b1111eacab758cf56..475e8ff7a0df1c1dcd8dc70083182a759c9da0b3 100644
--- a/Common/Core/vtkInformationStringVectorKey.h
+++ b/Common/Core/vtkInformationStringVectorKey.h
@@ -34,11 +34,11 @@ class VTKCOMMONCORE_EXPORT vtkInformationStringVectorKey : public vtkInformation
{
public:
vtkTypeMacro(vtkInformationStringVectorKey,vtkInformationKey);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
vtkInformationStringVectorKey(const char* name, const char* location,
int length=-1);
- ~vtkInformationStringVectorKey() VTK_OVERRIDE;
+ ~vtkInformationStringVectorKey() override;
/**
* This method simply returns a new vtkInformationStringVectorKey, given a
@@ -69,12 +69,12 @@ public:
* object to another. If there is no entry in the first information
* object for this key, the value is removed from the second.
*/
- void ShallowCopy(vtkInformation* from, vtkInformation* to) VTK_OVERRIDE;
+ void ShallowCopy(vtkInformation* from, vtkInformation* to) override;
/**
* Print the key's value in an information object to a stream.
*/
- void Print(ostream& os, vtkInformation* info) VTK_OVERRIDE;
+ void Print(ostream& os, vtkInformation* info) override;
protected:
// The required length of the vector value (-1 is no restriction).
diff --git a/Common/Core/vtkInformationUnsignedLongKey.h b/Common/Core/vtkInformationUnsignedLongKey.h
index fe3c801dcd3e85b1e83888024d21ca2e744d6636..f7dd9460b739cc1960d6180d8fbe3ede49a20282 100644
--- a/Common/Core/vtkInformationUnsignedLongKey.h
+++ b/Common/Core/vtkInformationUnsignedLongKey.h
@@ -32,10 +32,10 @@ class VTKCOMMONCORE_EXPORT vtkInformationUnsignedLongKey : public vtkInformation
{
public:
vtkTypeMacro(vtkInformationUnsignedLongKey,vtkInformationKey);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
vtkInformationUnsignedLongKey(const char* name, const char* location);
- ~vtkInformationUnsignedLongKey() VTK_OVERRIDE;
+ ~vtkInformationUnsignedLongKey() override;
/**
* This method simply returns a new vtkInformationUnsignedLongKey, given a
@@ -61,12 +61,12 @@ public:
* object to another. If there is no entry in the first information
* object for this key, the value is removed from the second.
*/
- void ShallowCopy(vtkInformation* from, vtkInformation* to) VTK_OVERRIDE;
+ void ShallowCopy(vtkInformation* from, vtkInformation* to) override;
/**
* Print the key's value in an information object to a stream.
*/
- void Print(ostream& os, vtkInformation* info) VTK_OVERRIDE;
+ void Print(ostream& os, vtkInformation* info) override;
protected:
/**
diff --git a/Common/Core/vtkInformationVariantKey.h b/Common/Core/vtkInformationVariantKey.h
index 78b453acfc079260dc39fc11f23e666e5302f829..21fd5ae906d26b49202613d3910a67f81af0be28 100644
--- a/Common/Core/vtkInformationVariantKey.h
+++ b/Common/Core/vtkInformationVariantKey.h
@@ -34,10 +34,10 @@ class VTKCOMMONCORE_EXPORT vtkInformationVariantKey : public vtkInformationKey
{
public:
vtkTypeMacro(vtkInformationVariantKey,vtkInformationKey);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
vtkInformationVariantKey(const char* name, const char* location);
- ~vtkInformationVariantKey() VTK_OVERRIDE;
+ ~vtkInformationVariantKey() override;
/**
* This method simply returns a new vtkInformationVariantKey, given a
@@ -63,12 +63,12 @@ public:
* object to another. If there is no entry in the first information
* object for this key, the value is removed from the second.
*/
- void ShallowCopy(vtkInformation* from, vtkInformation* to) VTK_OVERRIDE;
+ void ShallowCopy(vtkInformation* from, vtkInformation* to) override;
/**
* Print the key's value in an information object to a stream.
*/
- void Print(ostream& os, vtkInformation* info) VTK_OVERRIDE;
+ void Print(ostream& os, vtkInformation* info) override;
protected:
/**
diff --git a/Common/Core/vtkInformationVariantVectorKey.h b/Common/Core/vtkInformationVariantVectorKey.h
index 48c3415842825350667137c494a08b0c8027d8a5..6f6e5363a85fa022e8e13a06786cc077ef46a0ab 100644
--- a/Common/Core/vtkInformationVariantVectorKey.h
+++ b/Common/Core/vtkInformationVariantVectorKey.h
@@ -34,11 +34,11 @@ class VTKCOMMONCORE_EXPORT vtkInformationVariantVectorKey : public vtkInformatio
{
public:
vtkTypeMacro(vtkInformationVariantVectorKey,vtkInformationKey);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
vtkInformationVariantVectorKey(const char* name, const char* location,
int length=-1);
- ~vtkInformationVariantVectorKey() VTK_OVERRIDE;
+ ~vtkInformationVariantVectorKey() override;
/**
* This method simply returns a new vtkInformationVariantVectorKey, given a
@@ -69,12 +69,12 @@ public:
* object to another. If there is no entry in the first information
* object for this key, the value is removed from the second.
*/
- void ShallowCopy(vtkInformation* from, vtkInformation* to) VTK_OVERRIDE;
+ void ShallowCopy(vtkInformation* from, vtkInformation* to) override;
/**
* Print the key's value in an information object to a stream.
*/
- void Print(ostream& os, vtkInformation* info) VTK_OVERRIDE;
+ void Print(ostream& os, vtkInformation* info) override;
protected:
// The required length of the vector value (-1 is no restriction).
diff --git a/Common/Core/vtkInformationVector.h b/Common/Core/vtkInformationVector.h
index 571dcbc829a928a14cd28c5587fe9f442f58a4fa..a1283b472496e1c943232133c6acd9ed35d4522a 100644
--- a/Common/Core/vtkInformationVector.h
+++ b/Common/Core/vtkInformationVector.h
@@ -37,7 +37,7 @@ class VTKCOMMONCORE_EXPORT vtkInformationVector : public vtkObject
public:
static vtkInformationVector *New();
vtkTypeMacro(vtkInformationVector,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -74,8 +74,8 @@ public:
/**
* Initiate garbage collection when a reference is removed.
*/
- void Register(vtkObjectBase* o) VTK_OVERRIDE;
- void UnRegister(vtkObjectBase* o) VTK_OVERRIDE;
+ void Register(vtkObjectBase* o) override;
+ void UnRegister(vtkObjectBase* o) override;
//@}
/**
@@ -89,7 +89,7 @@ public:
protected:
vtkInformationVector();
- ~vtkInformationVector() VTK_OVERRIDE;
+ ~vtkInformationVector() override;
// Internal implementation details.
vtkInformationVectorInternals* Internal;
@@ -97,7 +97,7 @@ protected:
int NumberOfInformationObjects;
// Garbage collection support.
- void ReportReferences(vtkGarbageCollector*) VTK_OVERRIDE;
+ void ReportReferences(vtkGarbageCollector*) override;
private:
vtkInformationVector(const vtkInformationVector&) VTK_DELETE_FUNCTION;
void operator=(const vtkInformationVector&) VTK_DELETE_FUNCTION;
diff --git a/Common/Core/vtkInstantiator.h b/Common/Core/vtkInstantiator.h
index b94aefa05415b55ea55de9c193ae21b87b5784f8..29effd6a0becd01304b63a3a873299462096b078 100644
--- a/Common/Core/vtkInstantiator.h
+++ b/Common/Core/vtkInstantiator.h
@@ -73,7 +73,7 @@ class VTKCOMMONCORE_EXPORT vtkInstantiator : public vtkObject
public:
static vtkInstantiator* New();
vtkTypeMacro(vtkInstantiator,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Create an instance of the class whose name is given. If creation
@@ -103,7 +103,7 @@ public:
protected:
vtkInstantiator();
- ~vtkInstantiator() VTK_OVERRIDE;
+ ~vtkInstantiator() override;
// Internal storage for registered creation functions.
static vtkInstantiatorHashTable* CreatorTable;
diff --git a/Common/Core/vtkIntArray.h b/Common/Core/vtkIntArray.h
index 9ad37e2ce084d31e55e3b2ce67aed7b2e9e32195..1254180c0764d1edef00d6379cc4b185b73e4eea 100644
--- a/Common/Core/vtkIntArray.h
+++ b/Common/Core/vtkIntArray.h
@@ -44,7 +44,7 @@ public:
#undef vtkDataArray
#endif
static vtkIntArray* New();
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
// This macro expands to the set of method declarations that
// make up the interface of vtkAOSDataArrayTemplate, which is ignored
@@ -73,7 +73,7 @@ public:
protected:
vtkIntArray();
- ~vtkIntArray() VTK_OVERRIDE;
+ ~vtkIntArray() override;
private:
diff --git a/Common/Core/vtkLongArray.h b/Common/Core/vtkLongArray.h
index 5f70d9ff3aef8ef5ea5b959da7b3df27d1916638..cfd0b1d9c136e744efbda0a903034d8bd9f8d6d7 100644
--- a/Common/Core/vtkLongArray.h
+++ b/Common/Core/vtkLongArray.h
@@ -45,7 +45,7 @@ public:
#undef vtkDataArray
#endif
static vtkLongArray* New();
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
// This macro expands to the set of method declarations that
// make up the interface of vtkAOSDataArrayTemplate, which is ignored
@@ -74,7 +74,7 @@ public:
protected:
vtkLongArray();
- ~vtkLongArray() VTK_OVERRIDE;
+ ~vtkLongArray() override;
private:
diff --git a/Common/Core/vtkLongLongArray.h b/Common/Core/vtkLongLongArray.h
index 59b310e323a467edf9ba977556289dade2035478..295ff2de82c8b502380a4c8fc0a639942df54477 100644
--- a/Common/Core/vtkLongLongArray.h
+++ b/Common/Core/vtkLongLongArray.h
@@ -44,7 +44,7 @@ public:
#undef vtkDataArray
#endif
static vtkLongLongArray* New();
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
// This macro expands to the set of method declarations that
// make up the interface of vtkAOSDataArrayTemplate, which is ignored
@@ -73,7 +73,7 @@ public:
protected:
vtkLongLongArray();
- ~vtkLongLongArray() VTK_OVERRIDE;
+ ~vtkLongLongArray() override;
private:
diff --git a/Common/Core/vtkLookupTable.h b/Common/Core/vtkLookupTable.h
index 916cbefec89bc14cc313cc9ddc00a99355116595..83cefa08c01ded397bdc90b464be8af6fc626469 100644
--- a/Common/Core/vtkLookupTable.h
+++ b/Common/Core/vtkLookupTable.h
@@ -86,13 +86,13 @@ public:
static vtkLookupTable *New();
vtkTypeMacro(vtkLookupTable,vtkScalarsToColors);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Return true if all of the values defining the mapping have an opacity
* equal to 1.
*/
- int IsOpaque() VTK_OVERRIDE;
+ int IsOpaque() override;
/**
* Allocate a color table of specified size.
@@ -103,7 +103,7 @@ public:
* Generate lookup table from hue, saturation, value, alpha min/max values.
* Table is built from linear ramp of each value.
*/
- void Build() VTK_OVERRIDE;
+ void Build() override;
/**
* Force the lookup table to regenerate from hue, saturation, value,
@@ -259,19 +259,19 @@ public:
/**
* Map one value through the lookup table.
*/
- unsigned char* MapValue(double v) VTK_OVERRIDE;
+ unsigned char* MapValue(double v) override;
/**
* Map one value through the lookup table and return the color as
* an RGB array of doubles between 0 and 1.
*/
- void GetColor(double x, double rgb[3]) VTK_OVERRIDE;
+ void GetColor(double x, double rgb[3]) override;
/**
* Map one value through the lookup table and return the alpha value
* (the opacity) as a double between 0 and 1.
*/
- double GetOpacity(double v) VTK_OVERRIDE;
+ double GetOpacity(double v) override;
/**
* Return the table index associated with a particular value.
@@ -343,9 +343,9 @@ public:
* Sets/Gets the range of scalars which will be mapped. This is a duplicate
* of Get/SetTableRange.
*/
- double *GetRange() VTK_OVERRIDE
+ double *GetRange() override
{ return this->GetTableRange(); };
- void SetRange(double min, double max) VTK_OVERRIDE
+ void SetRange(double min, double max) override
{ this->SetTableRange(min, max); };
void SetRange(double rng[2]) { this->SetRange(rng[0], rng[1]); };
//@}
@@ -395,18 +395,18 @@ public:
int inputDataType,
int numberOfValues,
int inputIncrement,
- int outputIncrement) VTK_OVERRIDE;
+ int outputIncrement) override;
/**
* Copy the contents from another LookupTable
*/
- void DeepCopy(vtkScalarsToColors *lut) VTK_OVERRIDE;
+ void DeepCopy(vtkScalarsToColors *lut) override;
/**
* This should return 1 is the subclass is using log scale for mapping scalars
* to colors. Returns 1 is scale == VTK_SCALE_LOG10.
*/
- int UsingLogScale() VTK_OVERRIDE
+ int UsingLogScale() override
{
return (this->GetScale() == VTK_SCALE_LOG10)? 1 : 0;
}
@@ -414,7 +414,7 @@ public:
/**
* Get the number of available colors for mapping to.
*/
- vtkIdType GetNumberOfAvailableColors() VTK_OVERRIDE;
+ vtkIdType GetNumberOfAvailableColors() override;
/**
* Return a color given an integer index.
@@ -423,11 +423,11 @@ public:
* list of annotations).
* If the table is empty or \a idx < 0, then NanColor is returned.
*/
- void GetIndexedColor(vtkIdType idx, double rgba[4]) VTK_OVERRIDE;
+ void GetIndexedColor(vtkIdType idx, double rgba[4]) override;
protected:
vtkLookupTable(int sze=256, int ext=256);
- ~vtkLookupTable() VTK_OVERRIDE;
+ ~vtkLookupTable() override;
vtkIdType NumberOfColors;
vtkUnsignedCharArray *Table;
diff --git a/Common/Core/vtkMappedDataArray.h b/Common/Core/vtkMappedDataArray.h
index cc0f47d8099044099987b108d64f08117ced8f2e..5344e85c8f4b55445cac75bb4a1abf8035806dff 100644
--- a/Common/Core/vtkMappedDataArray.h
+++ b/Common/Core/vtkMappedDataArray.h
@@ -54,36 +54,36 @@ public:
*/
static vtkMappedDataArray<Scalar>* FastDownCast(vtkAbstractArray *source);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
// vtkAbstractArray virtual method that must be reimplemented.
- void DeepCopy(vtkAbstractArray *aa) VTK_OVERRIDE = 0;
- vtkVariant GetVariantValue(vtkIdType idx) VTK_OVERRIDE = 0;
- void SetVariantValue(vtkIdType idx, vtkVariant value) VTK_OVERRIDE = 0;
- void GetTuples(vtkIdList *ptIds, vtkAbstractArray *output) VTK_OVERRIDE = 0;
- void GetTuples(vtkIdType p1, vtkIdType p2, vtkAbstractArray *output) VTK_OVERRIDE = 0;
+ void DeepCopy(vtkAbstractArray *aa) override = 0;
+ vtkVariant GetVariantValue(vtkIdType idx) override = 0;
+ void SetVariantValue(vtkIdType idx, vtkVariant value) override = 0;
+ void GetTuples(vtkIdList *ptIds, vtkAbstractArray *output) override = 0;
+ void GetTuples(vtkIdType p1, vtkIdType p2, vtkAbstractArray *output) override = 0;
void InterpolateTuple(vtkIdType i, vtkIdList *ptIndices,
- vtkAbstractArray *source, double *weights) VTK_OVERRIDE = 0;
+ vtkAbstractArray *source, double *weights) override = 0;
void InterpolateTuple(vtkIdType i, vtkIdType id1,
vtkAbstractArray* source1, vtkIdType id2,
- vtkAbstractArray* source2, double t) VTK_OVERRIDE = 0;
+ vtkAbstractArray* source2, double t) override = 0;
// vtkDataArray virtual method that must be reimplemented.
- void DeepCopy(vtkDataArray *da) VTK_OVERRIDE = 0;
+ void DeepCopy(vtkDataArray *da) override = 0;
/**
* Print an error and create an internal, long-lived temporary array. This
* method should not be used on vtkMappedDataArray subclasses. See
* vtkArrayDispatch for a better way.
*/
- void * GetVoidPointer(vtkIdType id) VTK_OVERRIDE;
+ void * GetVoidPointer(vtkIdType id) override;
/**
* Copy the internal data to the void pointer. The pointer is cast to this
* array's Scalar type and vtkTypedDataArrayIterator is used to populate
* the input array.
*/
- void ExportToVoidPointer(void *ptr) VTK_OVERRIDE;
+ void ExportToVoidPointer(void *ptr) override;
/**
* Read the data from the internal temporary array (created by GetVoidPointer)
@@ -92,22 +92,22 @@ public:
* default implementation uses vtkTypedDataArrayIterator to extract the mapped
* data.
*/
- void DataChanged() VTK_OVERRIDE;
+ void DataChanged() override;
//@{
/**
* These methods don't make sense for mapped data array. Prints an error and
* returns.
*/
- void SetVoidArray(void *, vtkIdType, int) VTK_OVERRIDE;
- void SetVoidArray(void *, vtkIdType, int, int) VTK_OVERRIDE;
+ void SetVoidArray(void *, vtkIdType, int) override;
+ void SetVoidArray(void *, vtkIdType, int, int) override;
//@}
//@{
/**
* Not implemented. Print error and return nullptr.
*/
- void * WriteVoidPointer(vtkIdType /*id*/, vtkIdType /*number*/) VTK_OVERRIDE
+ void * WriteVoidPointer(vtkIdType /*id*/, vtkIdType /*number*/) override
{
vtkErrorMacro(<<"WriteVoidPointer: Method not implemented.");
return nullptr;
@@ -117,16 +117,16 @@ public:
/**
* Invalidate the internal temporary array and call superclass method.
*/
- void Modified() VTK_OVERRIDE;
+ void Modified() override;
// vtkAbstractArray override:
- bool HasStandardMemoryLayout() VTK_OVERRIDE { return false; }
+ bool HasStandardMemoryLayout() override { return false; }
protected:
vtkMappedDataArray();
- ~vtkMappedDataArray() VTK_OVERRIDE;
+ ~vtkMappedDataArray() override;
- int GetArrayType() VTK_OVERRIDE
+ int GetArrayType() override
{
return vtkAbstractArray::MappedDataArray;
}
@@ -155,7 +155,7 @@ vtkArrayDownCast_TemplateFastCastMacro(vtkMappedDataArray)
// Otherwise, use vtkMappedDataArrayTypeMacro.
#define vtkMappedDataArrayNewInstanceMacro(thisClass) \
protected: \
- vtkObjectBase *NewInstanceInternal() const VTK_OVERRIDE \
+ vtkObjectBase *NewInstanceInternal() const override \
{ \
if (vtkDataArray *da = \
vtkDataArray::CreateDataArray(thisClass::VTK_DATA_TYPE)) \
diff --git a/Common/Core/vtkMath.cxx b/Common/Core/vtkMath.cxx
index e2478ac52dd09742ae864430f5efdf2c1fd140ff..81c34b2b2bae464726d1677a476ee43d5ea10d2a 100644
--- a/Common/Core/vtkMath.cxx
+++ b/Common/Core/vtkMath.cxx
@@ -56,7 +56,7 @@ public:
std::vector<vtkTypeInt64> MemoizeFactorial;
private:
vtkMathInternal();
- ~vtkMathInternal() VTK_OVERRIDE;
+ ~vtkMathInternal() override;
};
vtkMathInternal::vtkMathInternal()
diff --git a/Common/Core/vtkMath.h b/Common/Core/vtkMath.h
index ee3657d1d1a09f271d890f9ae41bc6b14dee0510..54e6df00204be06d88886309bb328154d56d978e 100644
--- a/Common/Core/vtkMath.h
+++ b/Common/Core/vtkMath.h
@@ -86,7 +86,7 @@ class VTKCOMMONCORE_EXPORT vtkMath : public vtkObject
public:
static vtkMath *New();
vtkTypeMacro(vtkMath,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* A mathematical constant. This version is atan(1.0) * 4.0
@@ -1224,7 +1224,7 @@ public:
static bool IsFinite(double x);
protected:
vtkMath() {}
- ~vtkMath() VTK_OVERRIDE {}
+ ~vtkMath() override {}
static vtkSmartPointer<vtkMathInternal> Internal;
private:
diff --git a/Common/Core/vtkMersenneTwister.h b/Common/Core/vtkMersenneTwister.h
index 6e95550d18ab159eea7f95fbb541a4655a49606e..97e9539dc041127e85c6590c6a6a6c5d7e02f5a2 100644
--- a/Common/Core/vtkMersenneTwister.h
+++ b/Common/Core/vtkMersenneTwister.h
@@ -74,7 +74,7 @@ public:
typedef vtkTypeUInt32 SequenceId;
vtkTypeMacro(vtkMersenneTwister,vtkRandomSequence);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkMersenneTwister* New();
@@ -105,7 +105,7 @@ public:
* Current value
* \post unit_range: result>=0.0 && result<=1.0
*/
- double GetValue() VTK_OVERRIDE { return this->GetValue(0); }
+ double GetValue() override { return this->GetValue(0); }
/**
* Move to the next number in random sequence <id>. If no sequence is
@@ -119,11 +119,11 @@ public:
* associated with this id, a warning is given and a sequence is generated
* with default values.
*/
- void Next() VTK_OVERRIDE { return this->Next(0); }
+ void Next() override { return this->Next(0); }
protected:
vtkMersenneTwister();
- ~vtkMersenneTwister() VTK_OVERRIDE;
+ ~vtkMersenneTwister() override;
vtkMersenneTwisterInternals* Internal;
diff --git a/Common/Core/vtkMinimalStandardRandomSequence.h b/Common/Core/vtkMinimalStandardRandomSequence.h
index 08b17f37b751a8b9f7c393e504dd8fc4ca7bb7ce..2b80c1be89fdfc987d451beb991a24882dd71a99 100644
--- a/Common/Core/vtkMinimalStandardRandomSequence.h
+++ b/Common/Core/vtkMinimalStandardRandomSequence.h
@@ -43,7 +43,7 @@ class VTKCOMMONCORE_EXPORT vtkMinimalStandardRandomSequence
{
public:
vtkTypeMacro(vtkMinimalStandardRandomSequence,vtkRandomSequence);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkMinimalStandardRandomSequence* New();
@@ -86,12 +86,12 @@ public:
* Current value
* \post unit_range: result>=0.0 && result<=1.0
*/
- double GetValue() VTK_OVERRIDE;
+ double GetValue() override;
/**
* Move to the next number in the random sequence.
*/
- void Next() VTK_OVERRIDE;
+ void Next() override;
/**
* Convenient method to return a value in a specific range from the
@@ -110,7 +110,7 @@ public:
protected:
vtkMinimalStandardRandomSequence();
- ~vtkMinimalStandardRandomSequence() VTK_OVERRIDE;
+ ~vtkMinimalStandardRandomSequence() override;
int Seed;
private:
vtkMinimalStandardRandomSequence(const vtkMinimalStandardRandomSequence&) VTK_DELETE_FUNCTION;
diff --git a/Common/Core/vtkMultiThreader.h b/Common/Core/vtkMultiThreader.h
index dd84d9e48b766cf1cdba54a6bd424887e00a734f..d3f07516617a86171351f6aa145a7ae405dc4506 100644
--- a/Common/Core/vtkMultiThreader.h
+++ b/Common/Core/vtkMultiThreader.h
@@ -93,7 +93,7 @@ public:
static vtkMultiThreader *New();
vtkTypeMacro(vtkMultiThreader,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* This is the structure that is passed to the thread that is
@@ -211,7 +211,7 @@ public:
protected:
vtkMultiThreader();
- ~vtkMultiThreader() VTK_OVERRIDE;
+ ~vtkMultiThreader() override;
// The number of threads to use
int NumberOfThreads;
diff --git a/Common/Core/vtkMutexLock.h b/Common/Core/vtkMutexLock.h
index e9e275641bbbc2c73fd8da3de894072e27367af4..fae8247e01b4c606bc25dd961384b68b0d29cc20 100644
--- a/Common/Core/vtkMutexLock.h
+++ b/Common/Core/vtkMutexLock.h
@@ -87,7 +87,7 @@ public:
static vtkMutexLock *New();
vtkTypeMacro(vtkMutexLock,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Lock the vtkMutexLock
diff --git a/Common/Core/vtkOStrStreamWrapper.h b/Common/Core/vtkOStrStreamWrapper.h
index 61251fba9f29d4afc40dbfaae639935b7ca64817..4f645b352a5f2640e3af133307d3f6ecd331fe0b 100644
--- a/Common/Core/vtkOStrStreamWrapper.h
+++ b/Common/Core/vtkOStrStreamWrapper.h
@@ -42,7 +42,7 @@ public:
/**
* Destructor frees all used memory.
*/
- ~vtkOStrStreamWrapper() VTK_OVERRIDE;
+ ~vtkOStrStreamWrapper() override;
/**
* Get the string that has been written. This call transfers
diff --git a/Common/Core/vtkObject.cxx b/Common/Core/vtkObject.cxx
index 7d7705a9bdfec3378cbca27093213915f1f3d103..e4e914d1b9abd85c13db7baa134ad0080c54c695 100644
--- a/Common/Core/vtkObject.cxx
+++ b/Common/Core/vtkObject.cxx
@@ -912,7 +912,7 @@ public:
vtkTypeMacro(vtkObjectCommandInternal, vtkCommand);
void Execute(
- vtkObject *caller, unsigned long eventId, void *callData) VTK_OVERRIDE
+ vtkObject *caller, unsigned long eventId, void *callData) override
{
if (this->Callable)
{
@@ -936,7 +936,7 @@ protected:
{
this->Callable = nullptr;
}
- ~vtkObjectCommandInternal() VTK_OVERRIDE
+ ~vtkObjectCommandInternal() override
{
delete this->Callable;
}
diff --git a/Common/Core/vtkObject.h b/Common/Core/vtkObject.h
index bec61f1e0700f599f41650efce73d2dbf8313cbf..d321c8ce02ae7441792d5ceea8ac5ac1189c66eb 100644
--- a/Common/Core/vtkObject.h
+++ b/Common/Core/vtkObject.h
@@ -112,7 +112,7 @@ public:
* Print() instead) but used in the hierarchical print process to
* combine the output of several classes.
*/
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -240,11 +240,11 @@ public:
protected:
vtkObject();
- ~vtkObject() VTK_OVERRIDE;
+ ~vtkObject() override;
// See vtkObjectBase.h.
- void RegisterInternal(vtkObjectBase*, vtkTypeBool check) VTK_OVERRIDE;
- void UnRegisterInternal(vtkObjectBase*, vtkTypeBool check) VTK_OVERRIDE;
+ void RegisterInternal(vtkObjectBase*, vtkTypeBool check) override;
+ void UnRegisterInternal(vtkObjectBase*, vtkTypeBool check) override;
bool Debug; // Enable debug messages
vtkTimeStamp MTime; // Keep track of modification time
@@ -367,11 +367,11 @@ private:
this->Method2 = nullptr;
this->Method3 = method;
}
- ~vtkClassMemberCallback() VTK_OVERRIDE { }
+ ~vtkClassMemberCallback() override { }
// Called when the event is invoked
bool operator()(
- vtkObject* caller, unsigned long event, void* calldata) VTK_OVERRIDE
+ vtkObject* caller, unsigned long event, void* calldata) override
{
T *handler = this->Handler.GetPointer();
if (handler)
diff --git a/Common/Core/vtkObjectFactory.h b/Common/Core/vtkObjectFactory.h
index 5c843fd53c9b4c5fa6fec446f2a6c008ee48c869..b15c64b75fa871b04f122457be8d1b41c5075137 100644
--- a/Common/Core/vtkObjectFactory.h
+++ b/Common/Core/vtkObjectFactory.h
@@ -130,7 +130,7 @@ public:
/**
* Print ObjectFactory to stream.
*/
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* All sub-classes of vtkObjectFactory should must return the version of
@@ -229,7 +229,7 @@ protected:
virtual vtkObject* CreateObject(const char* vtkclassname );
vtkObjectFactory();
- ~vtkObjectFactory() VTK_OVERRIDE;
+ ~vtkObjectFactory() override;
struct OverrideInformation
{
diff --git a/Common/Core/vtkObjectFactoryCollection.h b/Common/Core/vtkObjectFactoryCollection.h
index 2b2b9025d5f731be19ef6e059854d459821acafd..7dd7a4b3b088179113b87f7a71ee29fa26d2cd46 100644
--- a/Common/Core/vtkObjectFactoryCollection.h
+++ b/Common/Core/vtkObjectFactoryCollection.h
@@ -62,7 +62,7 @@ public:
protected:
vtkObjectFactoryCollection() {}
- ~vtkObjectFactoryCollection() VTK_OVERRIDE {}
+ ~vtkObjectFactoryCollection() override {}
private:
diff --git a/Common/Core/vtkOldStyleCallbackCommand.h b/Common/Core/vtkOldStyleCallbackCommand.h
index b9339903d6eba4347a3b4cd5c24ef41c0651b7e3..c4239b8f6501b27d23eb1666addead38f65ea22f 100644
--- a/Common/Core/vtkOldStyleCallbackCommand.h
+++ b/Common/Core/vtkOldStyleCallbackCommand.h
@@ -51,7 +51,7 @@ public:
*/
void Execute(vtkObject *invoker,
unsigned long eid,
- void *calldata) VTK_OVERRIDE;
+ void *calldata) override;
//@{
/**
@@ -71,7 +71,7 @@ public:
protected:
vtkOldStyleCallbackCommand();
- ~vtkOldStyleCallbackCommand() VTK_OVERRIDE;
+ ~vtkOldStyleCallbackCommand() override;
};
diff --git a/Common/Core/vtkOutputWindow.h b/Common/Core/vtkOutputWindow.h
index 5c590138262895b356a08bf305eb9c5f547eee22..7a7abb028eb2095aaa0c9f91994944e649183af5 100644
--- a/Common/Core/vtkOutputWindow.h
+++ b/Common/Core/vtkOutputWindow.h
@@ -48,7 +48,7 @@ public:
/**
* Print ObjectFactor to stream.
*/
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* This is a singleton pattern New. There will only be ONE
@@ -92,7 +92,7 @@ public:
protected:
vtkOutputWindow();
- ~vtkOutputWindow() VTK_OVERRIDE;
+ ~vtkOutputWindow() override;
int PromptUser;
private:
static vtkOutputWindow* Instance;
diff --git a/Common/Core/vtkOverrideInformation.h b/Common/Core/vtkOverrideInformation.h
index 4be95a4e113af8f88e6872cbad155dfd392fcb05..4daf988cc80f0a39020f25232775719880ffa5ce 100644
--- a/Common/Core/vtkOverrideInformation.h
+++ b/Common/Core/vtkOverrideInformation.h
@@ -37,7 +37,7 @@ public:
/**
* Print ObjectFactor to stream.
*/
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Returns the name of the class being overridden. For example,
@@ -98,7 +98,7 @@ protected:
private:
vtkOverrideInformation();
- ~vtkOverrideInformation() VTK_OVERRIDE;
+ ~vtkOverrideInformation() override;
// allow the object factory to set the values in this
// class, but only the object factory
diff --git a/Common/Core/vtkOverrideInformationCollection.h b/Common/Core/vtkOverrideInformationCollection.h
index 5a6856ed0b535d378b993522990cef4c1d8a80c6..252f893a966ae149fb6cde8cec9d3fa1ba0bb990 100644
--- a/Common/Core/vtkOverrideInformationCollection.h
+++ b/Common/Core/vtkOverrideInformationCollection.h
@@ -57,7 +57,7 @@ public:
protected:
vtkOverrideInformationCollection() {}
- ~vtkOverrideInformationCollection() VTK_OVERRIDE {}
+ ~vtkOverrideInformationCollection() override {}
private:
diff --git a/Common/Core/vtkPeriodicDataArray.h b/Common/Core/vtkPeriodicDataArray.h
index aaa9947c1949d1dc2dac82032d2b669d44895998..f2c6cfdb1527085921705205ac4e2b1121fd78ea 100644
--- a/Common/Core/vtkPeriodicDataArray.h
+++ b/Common/Core/vtkPeriodicDataArray.h
@@ -41,7 +41,7 @@ public:
vtkTemplateTypeMacro(vtkPeriodicDataArray<Scalar>, GenericBase)
typedef typename Superclass::ValueType ValueType;
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Initialize the mapped array with the original input data array.
@@ -51,68 +51,68 @@ public:
/**
* Initialize array with zero values
*/
- void Initialize() VTK_OVERRIDE;
+ void Initialize() override;
/**
* Copy tuples values, selected by ptIds into provided array
*/
- void GetTuples(vtkIdList *ptIds, vtkAbstractArray *output) VTK_OVERRIDE;
+ void GetTuples(vtkIdList *ptIds, vtkAbstractArray *output) override;
/**
* Copy tuples from id p1 to id p2 included into provided array
*/
- void GetTuples(vtkIdType p1, vtkIdType p2, vtkAbstractArray *output) VTK_OVERRIDE;
+ void GetTuples(vtkIdType p1, vtkIdType p2, vtkAbstractArray *output) override;
/**
* No effect
*/
- void Squeeze() VTK_OVERRIDE;
+ void Squeeze() override;
/**
* Not implemented
*/
- VTK_NEWINSTANCE vtkArrayIterator *NewIterator() VTK_OVERRIDE;
+ VTK_NEWINSTANCE vtkArrayIterator *NewIterator() override;
/**
* Not implemented
*/
- vtkIdType LookupValue(vtkVariant value) VTK_OVERRIDE;
+ vtkIdType LookupValue(vtkVariant value) override;
/**
* Not implemented
*/
- void LookupValue(vtkVariant value, vtkIdList *ids) VTK_OVERRIDE;
+ void LookupValue(vtkVariant value, vtkIdList *ids) override;
/**
* Not implemented
*/
- vtkVariant GetVariantValue(vtkIdType idx) VTK_OVERRIDE;
+ vtkVariant GetVariantValue(vtkIdType idx) override;
/**
* Not implemented
*/
- void ClearLookup() VTK_OVERRIDE;
+ void ClearLookup() override;
/**
* Return tuple at location i.
* Pointer valid until next call to this object
*/
- double* GetTuple(vtkIdType i) VTK_OVERRIDE;
+ double* GetTuple(vtkIdType i) override;
/**
* Copy tuple at location i into user provided array
*/
- void GetTuple(vtkIdType i, double *tuple) VTK_OVERRIDE;
+ void GetTuple(vtkIdType i, double *tuple) override;
/**
* Not implemented
*/
- vtkIdType LookupTypedValue(Scalar value) VTK_OVERRIDE;
+ vtkIdType LookupTypedValue(Scalar value) override;
/**
* Not implemented
*/
- void LookupTypedValue(Scalar value, vtkIdList *ids) VTK_OVERRIDE;
+ void LookupTypedValue(Scalar value, vtkIdList *ids) override;
/**
* Get value at index idx.
@@ -143,126 +143,126 @@ public:
/**
* Return the memory in kilobytes consumed by this data array.
*/
- unsigned long GetActualMemorySize() VTK_OVERRIDE;
+ unsigned long GetActualMemorySize() override;
/**
* Read only container, not supported.
*/
- int Allocate(vtkIdType sz, vtkIdType ext) VTK_OVERRIDE;
+ int Allocate(vtkIdType sz, vtkIdType ext) override;
/**
* Read only container, not supported.
*/
- int Resize(vtkIdType numTuples) VTK_OVERRIDE;
+ int Resize(vtkIdType numTuples) override;
/**
* Read only container, not supported.
*/
- void SetNumberOfTuples(vtkIdType number) VTK_OVERRIDE;
+ void SetNumberOfTuples(vtkIdType number) override;
/**
* Read only container, not supported.
*/
- void SetTuple(vtkIdType i, vtkIdType j, vtkAbstractArray *source) VTK_OVERRIDE;
+ void SetTuple(vtkIdType i, vtkIdType j, vtkAbstractArray *source) override;
/**
* Read only container, not supported.
*/
- void SetTuple(vtkIdType i, const float *source) VTK_OVERRIDE;
+ void SetTuple(vtkIdType i, const float *source) override;
/**
* Read only container, not supported.
*/
- void SetTuple(vtkIdType i, const double *source) VTK_OVERRIDE;
+ void SetTuple(vtkIdType i, const double *source) override;
/**
* Read only container, not supported.
*/
- void InsertTuple(vtkIdType i, vtkIdType j, vtkAbstractArray *source) VTK_OVERRIDE;
+ void InsertTuple(vtkIdType i, vtkIdType j, vtkAbstractArray *source) override;
/**
* Read only container, not supported.
*/
- void InsertTuple(vtkIdType i, const float *source) VTK_OVERRIDE;
+ void InsertTuple(vtkIdType i, const float *source) override;
/**
* Read only container, not supported.
*/
- void InsertTuple(vtkIdType i, const double *source) VTK_OVERRIDE;
+ void InsertTuple(vtkIdType i, const double *source) override;
/**
* Read only container, not supported.
*/
void InsertTuples(vtkIdList *dstIds, vtkIdList *srcIds,
- vtkAbstractArray *source) VTK_OVERRIDE;
+ vtkAbstractArray *source) override;
/**
* Read only container, not supported.
*/
void InsertTuples(vtkIdType dstStart, vtkIdType n, vtkIdType srcStart,
- vtkAbstractArray* source) VTK_OVERRIDE;
+ vtkAbstractArray* source) override;
/**
* Read only container, error.
*/
- vtkIdType InsertNextTuple(vtkIdType j, vtkAbstractArray *source) VTK_OVERRIDE;
+ vtkIdType InsertNextTuple(vtkIdType j, vtkAbstractArray *source) override;
/**
* Read only container, not supported.
*/
- vtkIdType InsertNextTuple(const float *source) VTK_OVERRIDE;
+ vtkIdType InsertNextTuple(const float *source) override;
/**
* Read only container, not supported.
*/
- vtkIdType InsertNextTuple(const double *source) VTK_OVERRIDE;
+ vtkIdType InsertNextTuple(const double *source) override;
/**
* Read only container, not supported.
*/
- void DeepCopy(vtkAbstractArray *aa) VTK_OVERRIDE;
+ void DeepCopy(vtkAbstractArray *aa) override;
/**
* Read only container, not supported.
*/
- void DeepCopy(vtkDataArray *da) VTK_OVERRIDE;
+ void DeepCopy(vtkDataArray *da) override;
/**
* Read only container, not supported.
*/
void InterpolateTuple(vtkIdType i, vtkIdList *ptIndices,
- vtkAbstractArray* source, double* weights) VTK_OVERRIDE;
+ vtkAbstractArray* source, double* weights) override;
/**
* Read only container, not supported.
*/
void InterpolateTuple(vtkIdType i, vtkIdType id1, vtkAbstractArray *source1,
- vtkIdType id2, vtkAbstractArray *source2, double t) VTK_OVERRIDE;
+ vtkIdType id2, vtkAbstractArray *source2, double t) override;
/**
* Read only container, not supported.
*/
- void SetVariantValue(vtkIdType idx, vtkVariant value) VTK_OVERRIDE;
+ void SetVariantValue(vtkIdType idx, vtkVariant value) override;
/**
* Read only container, not supported.
*/
- void InsertVariantValue(vtkIdType idx, vtkVariant value) VTK_OVERRIDE;
+ void InsertVariantValue(vtkIdType idx, vtkVariant value) override;
/**
* Read only container, not supported.
*/
- void RemoveTuple(vtkIdType id) VTK_OVERRIDE;
+ void RemoveTuple(vtkIdType id) override;
/**
* Read only container, not supported.
*/
- void RemoveFirstTuple() VTK_OVERRIDE;
+ void RemoveFirstTuple() override;
/**
* Read only container, not supported.
*/
- void RemoveLastTuple() VTK_OVERRIDE;
+ void RemoveLastTuple() override;
/**
* Read only container, not supported.
@@ -309,7 +309,7 @@ public:
protected:
vtkPeriodicDataArray();
- ~vtkPeriodicDataArray() VTK_OVERRIDE;
+ ~vtkPeriodicDataArray() override;
//@{
/**
@@ -327,12 +327,12 @@ protected:
/**
* Get the transformed range by components
*/
- bool ComputeScalarRange(double* range) VTK_OVERRIDE;
+ bool ComputeScalarRange(double* range) override;
/**
* Get the transformed range on all components
*/
- bool ComputeVectorRange(double range[2]) VTK_OVERRIDE;
+ bool ComputeVectorRange(double range[2]) override;
/**
* Update the transformed periodic range
diff --git a/Common/Core/vtkPoints.h b/Common/Core/vtkPoints.h
index 6170ed3ae4757b9da1aa64cd3eff37a4799cba3b..c8e36d7daaec129ce059a62889448af5a03fddbd 100644
--- a/Common/Core/vtkPoints.h
+++ b/Common/Core/vtkPoints.h
@@ -39,7 +39,7 @@ public:
static vtkPoints *New();
vtkTypeMacro(vtkPoints,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Allocate initial memory size. ext is no longer used.
@@ -235,18 +235,18 @@ public:
/**
* The modified time of the points.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
/**
* Update the modification time for this object and its Data.
* As this object acts as a shell around a DataArray and
* forwards Set methods it needs to forward Modifed as well.
*/
- void Modified() VTK_OVERRIDE;
+ void Modified() override;
protected:
vtkPoints(int dataType = VTK_FLOAT);
- ~vtkPoints() VTK_OVERRIDE;
+ ~vtkPoints() override;
double Bounds[6];
vtkTimeStamp ComputeTime; // Time at which bounds computed
diff --git a/Common/Core/vtkPoints2D.h b/Common/Core/vtkPoints2D.h
index 15edb6ce57fe88e27ae654a0dd44c437a0d59067..fd54dc04fab78c4fb0df7a27c42a648731ee23e9 100644
--- a/Common/Core/vtkPoints2D.h
+++ b/Common/Core/vtkPoints2D.h
@@ -39,7 +39,7 @@ public:
static vtkPoints2D *New();
vtkTypeMacro(vtkPoints2D, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Allocate initial memory size. ext is no longer used.
@@ -206,7 +206,7 @@ public:
protected:
vtkPoints2D(int dataType = VTK_FLOAT);
- ~vtkPoints2D() VTK_OVERRIDE;
+ ~vtkPoints2D() override;
double Bounds[4];
vtkTimeStamp ComputeTime; // Time at which bounds computed
diff --git a/Common/Core/vtkPriorityQueue.h b/Common/Core/vtkPriorityQueue.h
index 126c9564f5931de5f882b8359b9a117157e14f56..960814dd737f4bad93eccb9efd6681a882eee8b7 100644
--- a/Common/Core/vtkPriorityQueue.h
+++ b/Common/Core/vtkPriorityQueue.h
@@ -60,7 +60,7 @@ public:
static vtkPriorityQueue *New();
vtkTypeMacro(vtkPriorityQueue,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Allocate initial space for priority queue.
@@ -124,7 +124,7 @@ public:
protected:
vtkPriorityQueue();
- ~vtkPriorityQueue() VTK_OVERRIDE;
+ ~vtkPriorityQueue() override;
Item *Resize(const vtkIdType sz);
diff --git a/Common/Core/vtkRandomSequence.h b/Common/Core/vtkRandomSequence.h
index f27f83a5b5e4717efe4fb6b865ea5f5afd887f02..9b05502f5b05d0f23d1a2872118c1bde99c794f6 100644
--- a/Common/Core/vtkRandomSequence.h
+++ b/Common/Core/vtkRandomSequence.h
@@ -39,7 +39,7 @@ class VTKCOMMONCORE_EXPORT vtkRandomSequence : public vtkObject
{
public:
vtkTypeMacro(vtkRandomSequence,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Current value
@@ -53,7 +53,7 @@ public:
protected:
vtkRandomSequence();
- ~vtkRandomSequence() VTK_OVERRIDE;
+ ~vtkRandomSequence() override;
private:
vtkRandomSequence(const vtkRandomSequence&) VTK_DELETE_FUNCTION;
void operator=(const vtkRandomSequence&) VTK_DELETE_FUNCTION;
diff --git a/Common/Core/vtkReferenceCount.h b/Common/Core/vtkReferenceCount.h
index 79fc9ca0b6702c98c956463d3b7d97635859d5d5..c8244f85f87bc179e1ca6126aa131b644120a97f 100644
--- a/Common/Core/vtkReferenceCount.h
+++ b/Common/Core/vtkReferenceCount.h
@@ -33,11 +33,11 @@ public:
static vtkReferenceCount *New();
vtkTypeMacro(vtkReferenceCount,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkReferenceCount();
- ~vtkReferenceCount() VTK_OVERRIDE;
+ ~vtkReferenceCount() override;
private:
vtkReferenceCount(const vtkReferenceCount&) VTK_DELETE_FUNCTION;
diff --git a/Common/Core/vtkSOADataArrayTemplate.h b/Common/Core/vtkSOADataArrayTemplate.h
index f0e82f81eccd8f531a8f97fa51846e783c714885..39ea804b280bdeac00298d98205b60254fd69a2a 100644
--- a/Common/Core/vtkSOADataArrayTemplate.h
+++ b/Common/Core/vtkSOADataArrayTemplate.h
@@ -121,7 +121,7 @@ public:
/**
* Set component @a comp of all tuples to @a value.
*/
- void FillTypedComponent(int compIdx, ValueType value) VTK_OVERRIDE;
+ void FillTypedComponent(int compIdx, ValueType value) override;
/**
* Use this API to pass externally allocated memory to this instance. Since
@@ -150,13 +150,13 @@ public:
* Use of this method is discouraged, it creates a deep copy of the data into
* a contiguous AoS-ordered buffer and prints a warning.
*/
- void *GetVoidPointer(vtkIdType valueIdx) VTK_OVERRIDE;
+ void *GetVoidPointer(vtkIdType valueIdx) override;
/**
* Export a copy of the data in AoS ordering to the preallocated memory
* buffer.
*/
- void ExportToVoidPointer(void *ptr) VTK_OVERRIDE;
+ void ExportToVoidPointer(void *ptr) override;
#ifndef __VTK_WRAP__
//@{
@@ -187,23 +187,23 @@ public:
//@}
#endif
- int GetArrayType() VTK_OVERRIDE { return vtkAbstractArray::SoADataArrayTemplate; }
- VTK_NEWINSTANCE vtkArrayIterator *NewIterator() VTK_OVERRIDE;
- void SetNumberOfComponents(int numComps) VTK_OVERRIDE;
- void ShallowCopy(vtkDataArray *other) VTK_OVERRIDE;
+ int GetArrayType() override { return vtkAbstractArray::SoADataArrayTemplate; }
+ VTK_NEWINSTANCE vtkArrayIterator *NewIterator() override;
+ void SetNumberOfComponents(int numComps) override;
+ void ShallowCopy(vtkDataArray *other) override;
// Reimplemented for efficiency:
void InsertTuples(vtkIdType dstStart, vtkIdType n, vtkIdType srcStart,
- vtkAbstractArray* source) VTK_OVERRIDE;
+ vtkAbstractArray* source) override;
// MSVC doesn't like 'using' here (error C2487). Just forward instead:
// using Superclass::InsertTuples;
void InsertTuples(vtkIdList *dstIds, vtkIdList *srcIds,
- vtkAbstractArray *source) VTK_OVERRIDE
+ vtkAbstractArray *source) override
{ this->Superclass::InsertTuples(dstIds, srcIds, source); }
protected:
vtkSOADataArrayTemplate();
- ~vtkSOADataArrayTemplate() VTK_OVERRIDE;
+ ~vtkSOADataArrayTemplate() override;
/**
* Allocate space for numTuples. Old data is not preserved. If numTuples == 0,
diff --git a/Common/Core/vtkScalarsToColors.h b/Common/Core/vtkScalarsToColors.h
index ef1dc843e43d5c440b1761e5823c62d53df54a86..a48ea3c6193320bc2a8b12970daf2f11d0e3bf6d 100644
--- a/Common/Core/vtkScalarsToColors.h
+++ b/Common/Core/vtkScalarsToColors.h
@@ -61,7 +61,7 @@ class VTKCOMMONCORE_EXPORT vtkScalarsToColors : public vtkObject
{
public:
vtkTypeMacro(vtkScalarsToColors,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkScalarsToColors *New();
/**
@@ -388,7 +388,7 @@ public:
protected:
vtkScalarsToColors();
- ~vtkScalarsToColors() VTK_OVERRIDE;
+ ~vtkScalarsToColors() override;
/**
* An internal method that assumes that the input already has the right
diff --git a/Common/Core/vtkSetGet.h b/Common/Core/vtkSetGet.h
index 0ce0083fbfda88f33297ea4b1a1bf6467cf62299..b1651145737f1d764c869d9728109481c0826ba3 100644
--- a/Common/Core/vtkSetGet.h
+++ b/Common/Core/vtkSetGet.h
@@ -628,7 +628,7 @@ virtual double *Get##name() \
// superclass of thisClass.
#define vtkAbstractTypeMacroWithNewInstanceType(thisClass,superclass,instanceType,thisClassName) \
protected: \
- const char* GetClassNameInternal() const VTK_OVERRIDE \
+ const char* GetClassNameInternal() const override \
{ \
return thisClassName; \
} \
@@ -642,7 +642,7 @@ virtual double *Get##name() \
} \
return superclass::IsTypeOf(type); \
} \
- vtkTypeBool IsA(const char *type) VTK_OVERRIDE \
+ vtkTypeBool IsA(const char *type) override \
{ \
return this->thisClass::IsTypeOf(type); \
} \
@@ -669,7 +669,7 @@ virtual double *Get##name() \
#define vtkTypeMacro(thisClass,superclass) \
vtkAbstractTypeMacro(thisClass, superclass) \
protected: \
- vtkObjectBase *NewInstanceInternal() const VTK_OVERRIDE \
+ vtkObjectBase *NewInstanceInternal() const override \
{ \
return thisClass::New(); \
} \
@@ -710,7 +710,7 @@ virtual double *Get##name() \
#define vtkTemplateTypeMacro(thisClass,superclass) \
vtkAbstractTemplateTypeMacro(thisClass, superclass) \
protected: \
- vtkObjectBase *NewInstanceInternal() const VTK_OVERRIDE \
+ vtkObjectBase *NewInstanceInternal() const override \
{ \
return thisClass::New(); \
} \
diff --git a/Common/Core/vtkShortArray.h b/Common/Core/vtkShortArray.h
index 2e41acfee3b26174bdf24ec74d8d309db5517943..3db316e6ced7a7175f70ae5cd3b22851cccaae14 100644
--- a/Common/Core/vtkShortArray.h
+++ b/Common/Core/vtkShortArray.h
@@ -44,7 +44,7 @@ public:
#undef vtkDataArray
#endif
static vtkShortArray* New();
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
// This macro expands to the set of method declarations that
// make up the interface of vtkAOSDataArrayTemplate, which is ignored
@@ -73,7 +73,7 @@ public:
protected:
vtkShortArray();
- ~vtkShortArray() VTK_OVERRIDE;
+ ~vtkShortArray() override;
private:
diff --git a/Common/Core/vtkSignedCharArray.h b/Common/Core/vtkSignedCharArray.h
index 4fc0ab1855ae5eb73dd8c1bf1fe8edeb8910af8c..2d0cca8dae84c0b7ae6ccd4ecd64c19e965b9e41 100644
--- a/Common/Core/vtkSignedCharArray.h
+++ b/Common/Core/vtkSignedCharArray.h
@@ -40,7 +40,7 @@ public:
#undef vtkDataArray
#endif
static vtkSignedCharArray* New();
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
// This macro expands to the set of method declarations that
// make up the interface of vtkAOSDataArrayTemplate, which is ignored
@@ -69,7 +69,7 @@ public:
protected:
vtkSignedCharArray();
- ~vtkSignedCharArray() VTK_OVERRIDE;
+ ~vtkSignedCharArray() override;
private:
diff --git a/Common/Core/vtkSortDataArray.h b/Common/Core/vtkSortDataArray.h
index 4c0e0f699706c94b850cc811bf73ccba70244d29..1417b0ff53f7943a87e89582df772332e95798ee 100644
--- a/Common/Core/vtkSortDataArray.h
+++ b/Common/Core/vtkSortDataArray.h
@@ -83,7 +83,7 @@ public:
*/
static vtkSortDataArray *New();
vtkTypeMacro(vtkSortDataArray, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
@@ -180,7 +180,7 @@ public:
protected:
vtkSortDataArray();
- ~vtkSortDataArray() VTK_OVERRIDE;
+ ~vtkSortDataArray() override;
// A more efficient sort for single component arrays. This is delegated to
// by the methods above (if appropriate).
diff --git a/Common/Core/vtkSparseArray.h b/Common/Core/vtkSparseArray.h
index 1344c86744fcdec08b4522f4b97f4e33e8475c33..9d41f3673a77a01e2cb9e17536277bc8ec2d7295 100644
--- a/Common/Core/vtkSparseArray.h
+++ b/Common/Core/vtkSparseArray.h
@@ -77,30 +77,30 @@ class vtkSparseArray : public vtkTypedArray<T>
public:
vtkTemplateTypeMacro(vtkSparseArray<T>, vtkTypedArray<T>)
static vtkSparseArray<T>* New();
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
typedef typename vtkArray::CoordinateT CoordinateT;
typedef typename vtkArray::DimensionT DimensionT;
typedef typename vtkArray::SizeT SizeT;
// vtkArray API
- bool IsDense() VTK_OVERRIDE;
- const vtkArrayExtents& GetExtents() VTK_OVERRIDE;
- SizeT GetNonNullSize() VTK_OVERRIDE;
- void GetCoordinatesN(const SizeT n, vtkArrayCoordinates& coordinates) VTK_OVERRIDE;
- vtkArray* DeepCopy() VTK_OVERRIDE;
+ bool IsDense() override;
+ const vtkArrayExtents& GetExtents() override;
+ SizeT GetNonNullSize() override;
+ void GetCoordinatesN(const SizeT n, vtkArrayCoordinates& coordinates) override;
+ vtkArray* DeepCopy() override;
// vtkTypedArray API
- const T& GetValue(CoordinateT i) VTK_OVERRIDE;
- const T& GetValue(CoordinateT i, CoordinateT j) VTK_OVERRIDE;
- const T& GetValue(CoordinateT i, CoordinateT j, CoordinateT k) VTK_OVERRIDE;
- const T& GetValue(const vtkArrayCoordinates& coordinates) VTK_OVERRIDE;
- const T& GetValueN(const SizeT n) VTK_OVERRIDE;
- void SetValue(CoordinateT i, const T& value) VTK_OVERRIDE;
- void SetValue(CoordinateT i, CoordinateT j, const T& value) VTK_OVERRIDE;
- void SetValue(CoordinateT i, CoordinateT j, CoordinateT k, const T& value) VTK_OVERRIDE;
- void SetValue(const vtkArrayCoordinates& coordinates, const T& value) VTK_OVERRIDE;
- void SetValueN(const SizeT n, const T& value) VTK_OVERRIDE;
+ const T& GetValue(CoordinateT i) override;
+ const T& GetValue(CoordinateT i, CoordinateT j) override;
+ const T& GetValue(CoordinateT i, CoordinateT j, CoordinateT k) override;
+ const T& GetValue(const vtkArrayCoordinates& coordinates) override;
+ const T& GetValueN(const SizeT n) override;
+ void SetValue(CoordinateT i, const T& value) override;
+ void SetValue(CoordinateT i, CoordinateT j, const T& value) override;
+ void SetValue(CoordinateT i, CoordinateT j, CoordinateT k, const T& value) override;
+ void SetValue(const vtkArrayCoordinates& coordinates, const T& value) override;
+ void SetValueN(const SizeT n, const T& value) override;
// vtkSparseArray API
@@ -212,15 +212,15 @@ public:
protected:
vtkSparseArray();
- ~vtkSparseArray() VTK_OVERRIDE;
+ ~vtkSparseArray() override;
private:
vtkSparseArray(const vtkSparseArray&) VTK_DELETE_FUNCTION;
void operator=(const vtkSparseArray&) VTK_DELETE_FUNCTION;
- void InternalResize(const vtkArrayExtents& extents) VTK_OVERRIDE;
- void InternalSetDimensionLabel(DimensionT i, const vtkStdString& label) VTK_OVERRIDE;
- vtkStdString InternalGetDimensionLabel(DimensionT i) VTK_OVERRIDE;
+ void InternalResize(const vtkArrayExtents& extents) override;
+ void InternalSetDimensionLabel(DimensionT i, const vtkStdString& label) override;
+ vtkStdString InternalGetDimensionLabel(DimensionT i) override;
typedef vtkSparseArray<T> ThisT;
diff --git a/Common/Core/vtkStringArray.h b/Common/Core/vtkStringArray.h
index ce54f18d180a168c9b588c61b2c3bbf5a1fc5f2b..3eca2b4f1c0d55df14311cbbca075ec46a520816 100644
--- a/Common/Core/vtkStringArray.h
+++ b/Common/Core/vtkStringArray.h
@@ -38,7 +38,7 @@ class VTKCOMMONCORE_EXPORT vtkStringArray : public vtkAbstractArray
public:
static vtkStringArray* New();
vtkTypeMacro(vtkStringArray,vtkAbstractArray);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//
//
@@ -49,15 +49,15 @@ public:
/**
* Get the data type.
*/
- int GetDataType() VTK_OVERRIDE
+ int GetDataType() override
{ return VTK_STRING; }
- int IsNumeric() VTK_OVERRIDE { return 0; }
+ int IsNumeric() override { return 0; }
/**
* Release storage and reset array to initial state.
*/
- void Initialize() VTK_OVERRIDE;
+ void Initialize() override;
/**
* Return the size of the data type. WARNING: This may not mean
@@ -65,18 +65,18 @@ public:
* sizeof(std::string) and not take into account the data
* included in any particular string.
*/
- int GetDataTypeSize() VTK_OVERRIDE;
+ int GetDataTypeSize() override;
/**
* Free any unnecessary memory.
* Resize object to just fit data requirement. Reclaims extra memory.
*/
- void Squeeze() VTK_OVERRIDE { this->ResizeAndExtend (this->MaxId+1); }
+ void Squeeze() override { this->ResizeAndExtend (this->MaxId+1); }
/**
* Resize the array while conserving the data.
*/
- int Resize(vtkIdType numTuples) VTK_OVERRIDE;
+ int Resize(vtkIdType numTuples) override;
/**
* Set the tuple at the ith location using the jth tuple in the source array.
@@ -84,13 +84,13 @@ public:
* and structure. Note that range checking and memory allocation is not
* performed; use in conjunction with SetNumberOfTuples() to allocate space.
*/
- void SetTuple(vtkIdType i, vtkIdType j, vtkAbstractArray* source) VTK_OVERRIDE;
+ void SetTuple(vtkIdType i, vtkIdType j, vtkAbstractArray* source) override;
/**
* Insert the jth tuple in the source array, at ith location in this array.
* Note that memory allocation is performed as necessary to hold the data.
*/
- void InsertTuple(vtkIdType i, vtkIdType j, vtkAbstractArray* source) VTK_OVERRIDE;
+ void InsertTuple(vtkIdType i, vtkIdType j, vtkAbstractArray* source) override;
/**
* Copy the tuples indexed in srcIds from the source array to the tuple
@@ -98,7 +98,7 @@ public:
* Note that memory allocation is performed as necessary to hold the data.
*/
void InsertTuples(vtkIdList *dstIds, vtkIdList *srcIds,
- vtkAbstractArray *source) VTK_OVERRIDE;
+ vtkAbstractArray *source) override;
/**
* Copy n consecutive tuples starting at srcStart from the source array to
@@ -106,14 +106,14 @@ public:
* Note that memory allocation is performed as necessary to hold the data.
*/
void InsertTuples(vtkIdType dstStart, vtkIdType n, vtkIdType srcStart,
- vtkAbstractArray* source) VTK_OVERRIDE;
+ vtkAbstractArray* source) override;
/**
* Insert the jth tuple in the source array, at the end in this array.
* Note that memory allocation is performed as necessary to hold the data.
* Returns the location at which the data was inserted.
*/
- vtkIdType InsertNextTuple(vtkIdType j, vtkAbstractArray* source) VTK_OVERRIDE;
+ vtkIdType InsertNextTuple(vtkIdType j, vtkAbstractArray* source) override;
/**
* Set the ith tuple in this array as the interpolated tuple value,
@@ -123,7 +123,7 @@ public:
* and strcuture.
*/
void InterpolateTuple(vtkIdType i, vtkIdList *ptIndices,
- vtkAbstractArray* source, double* weights) VTK_OVERRIDE;
+ vtkAbstractArray* source, double* weights) override;
/**
* Insert the ith tuple in this array as interpolated from the two values,
@@ -135,7 +135,7 @@ public:
*/
void InterpolateTuple(vtkIdType i,
vtkIdType id1, vtkAbstractArray* source1,
- vtkIdType id2, vtkAbstractArray* source2, double t) VTK_OVERRIDE;
+ vtkIdType id2, vtkAbstractArray* source2, double t) override;
/**
* Given a list of indices, return an array of values. You must
@@ -143,7 +143,7 @@ public:
* enough space to hold the data and that the types match
* sufficiently to allow conversion (if necessary).
*/
- void GetTuples(vtkIdList *ptIds, vtkAbstractArray *output) VTK_OVERRIDE;
+ void GetTuples(vtkIdList *ptIds, vtkAbstractArray *output) override;
/**
* Get the values for the range of indices specified (i.e.,
@@ -152,13 +152,13 @@ public:
* the type of the output array is compatible with the type of this
* array.
*/
- void GetTuples(vtkIdType p1, vtkIdType p2, vtkAbstractArray *output) VTK_OVERRIDE;
+ void GetTuples(vtkIdType p1, vtkIdType p2, vtkAbstractArray *output) override;
/**
* Allocate memory for this array. Delete old storage only if necessary.
* Note that ext is no longer used.
*/
- int Allocate( vtkIdType sz, vtkIdType ext=1000 ) VTK_OVERRIDE;
+ int Allocate( vtkIdType sz, vtkIdType ext=1000 ) override;
/**
* Get the data at a particular index.
@@ -182,7 +182,7 @@ public:
* Set the number of tuples (a component group) in the array. Note that
* this may allocate space depending on the number of components.
*/
- void SetNumberOfTuples(vtkIdType number) VTK_OVERRIDE
+ void SetNumberOfTuples(vtkIdType number) override
{ this->SetNumberOfValues(this->NumberOfComponents* number); }
/**
@@ -190,12 +190,12 @@ public:
* allocation as well as setting the MaxId ivar. Used in conjunction with
* SetValue() method for fast insertion.
*/
- void SetNumberOfValues(vtkIdType number) VTK_OVERRIDE;
+ void SetNumberOfValues(vtkIdType number) override;
vtkIdType GetNumberOfValues() { return this->MaxId + 1; }
int GetNumberOfElementComponents() { return 0; }
- int GetElementComponentSize() VTK_OVERRIDE { return static_cast<int>(sizeof(vtkStdString::value_type)); }
+ int GetElementComponentSize() override { return static_cast<int>(sizeof(vtkStdString::value_type)); }
/**
* Insert data at a specified position in the array.
@@ -209,13 +209,13 @@ public:
* Set a value in the array form a variant.
* Insert a value into the array from a variant.
*/
- void SetVariantValue(vtkIdType idx, vtkVariant value) VTK_OVERRIDE;
+ void SetVariantValue(vtkIdType idx, vtkVariant value) override;
/**
* Safely set a value in the array form a variant.
* Safely insert a value into the array from a variant.
*/
- void InsertVariantValue(vtkIdType idx, vtkVariant value) VTK_OVERRIDE;
+ void InsertVariantValue(vtkIdType idx, vtkVariant value) override;
/**
* Insert data at the end of the array. Return its location in the array.
@@ -236,13 +236,13 @@ public:
* to verify that the memory has been allocated etc.
*/
vtkStdString* GetPointer(vtkIdType id) { return this->Array + id; }
- void* GetVoidPointer(vtkIdType id) VTK_OVERRIDE { return this->GetPointer(id); }
+ void* GetVoidPointer(vtkIdType id) override { return this->GetPointer(id); }
/**
* Deep copy of another string array. Will complain and change nothing
* if the array passed in is not a vtkStringArray.
*/
- void DeepCopy( vtkAbstractArray* aa ) VTK_OVERRIDE;
+ void DeepCopy( vtkAbstractArray* aa ) override;
/**
* This method lets the user specify data to be held by the array. The
@@ -255,10 +255,10 @@ public:
* that the array was allocated using the C++ new operator (and not malloc).
*/
void SetArray(vtkStdString* array, vtkIdType size, int save);
- void SetVoidArray(void* array, vtkIdType size, int save) VTK_OVERRIDE
+ void SetVoidArray(void* array, vtkIdType size, int save) override
{ this->SetArray(static_cast<vtkStdString*>(array), size, save); }
void SetVoidArray(void* array, vtkIdType size, int save,
- int vtkNotUsed(deleteMethod)) VTK_OVERRIDE
+ int vtkNotUsed(deleteMethod)) override
{ this->SetArray(static_cast<vtkStdString*>(array), size, save); }
/**
@@ -272,26 +272,26 @@ public:
* This function takes into account the size of the contents of the
* strings as well as the string containers themselves.
*/
- unsigned long GetActualMemorySize() VTK_OVERRIDE;
+ unsigned long GetActualMemorySize() override;
/**
* Returns a vtkArrayIteratorTemplate<vtkStdString>.
*/
- VTK_NEWINSTANCE vtkArrayIterator* NewIterator() VTK_OVERRIDE;
+ VTK_NEWINSTANCE vtkArrayIterator* NewIterator() override;
/**
* Returns the size of the data in DataTypeSize units. Thus, the number of bytes
* for the data can be computed by GetDataSize() * GetDataTypeSize().
* The size computation includes the string termination character for each string.
*/
- vtkIdType GetDataSize() VTK_OVERRIDE;
+ vtkIdType GetDataSize() override;
//@{
/**
* Return the indices where a specific value appears.
*/
- vtkIdType LookupValue(vtkVariant value) VTK_OVERRIDE;
- void LookupValue(vtkVariant value, vtkIdList* ids) VTK_OVERRIDE;
+ vtkIdType LookupValue(vtkVariant value) override;
+ void LookupValue(vtkVariant value, vtkIdList* ids) override;
//@}
vtkIdType LookupValue(const vtkStdString& value);
@@ -308,7 +308,7 @@ public:
* the fast lookup will know to rebuild itself. Otherwise, the lookup
* functions will give incorrect results.
*/
- void DataChanged() VTK_OVERRIDE;
+ void DataChanged() override;
/**
* Tell the array explicitly that a single data element has
@@ -322,11 +322,11 @@ public:
* if it exists. The lookup will be rebuilt on the next call to a lookup
* function.
*/
- void ClearLookup() VTK_OVERRIDE;
+ void ClearLookup() override;
protected:
vtkStringArray();
- ~vtkStringArray() VTK_OVERRIDE;
+ ~vtkStringArray() override;
vtkStdString* Array; // pointer to data
vtkStdString* ResizeAndExtend(vtkIdType sz); // function to resize data
diff --git a/Common/Core/vtkStringOutputWindow.h b/Common/Core/vtkStringOutputWindow.h
index 0f3160250fe989cac439fa46115a5d878e1e3ad3..805cee186093b330b665e88ce07fee658ab3c062 100644
--- a/Common/Core/vtkStringOutputWindow.h
+++ b/Common/Core/vtkStringOutputWindow.h
@@ -35,13 +35,13 @@ public:
static vtkStringOutputWindow* New();
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Put the text into the log file.
* New lines are converted to carriage return new lines.
*/
- void DisplayText(const char*) VTK_OVERRIDE;
+ void DisplayText(const char*) override;
/**
* Get the current output as a string
@@ -50,7 +50,7 @@ public:
protected:
vtkStringOutputWindow();
- ~vtkStringOutputWindow() VTK_OVERRIDE;
+ ~vtkStringOutputWindow() override;
void Initialize();
std::ostringstream OStream;
diff --git a/Common/Core/vtkTestDataArray.h b/Common/Core/vtkTestDataArray.h
index 7bd1c918e06f4d3d3d6160a9767c5eccdb52b9cc..d7cdc6f3cdc3da4911aa4a35cfb049bb5f58c97d 100644
--- a/Common/Core/vtkTestDataArray.h
+++ b/Common/Core/vtkTestDataArray.h
@@ -50,7 +50,7 @@ public:
static vtkTestDataArray<ArrayType>* New()
{ VTK_STANDARD_NEW_BODY(vtkTestDataArray<ArrayType>); }
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE
+ void PrintSelf(ostream &os, vtkIndent indent) override
{ GenericDataArrayType::PrintSelf(os,indent); }
ValueType GetValue(vtkIdType valueIdx) const
@@ -68,7 +68,7 @@ public:
void SetTypedComponent(vtkIdType tupleIdx, int compIdx, ValueType value)
{ this->Array->SetTypedComponent(tupleIdx,compIdx,value); }
- void *GetVoidPointer(vtkIdType valueIdx) VTK_OVERRIDE
+ void *GetVoidPointer(vtkIdType valueIdx) override
{ return this->Array->GetVoidPointer(valueIdx); }
protected:
diff --git a/Common/Core/vtkTimePointUtility.h b/Common/Core/vtkTimePointUtility.h
index a3875bdc1c374c5cb504db6830741c1473610fd8..3f2f15831bcfbcac654db415710a9da1af976b6d 100644
--- a/Common/Core/vtkTimePointUtility.h
+++ b/Common/Core/vtkTimePointUtility.h
@@ -36,7 +36,7 @@ class VTKCOMMONCORE_EXPORT vtkTimePointUtility : public vtkObject
public:
static vtkTimePointUtility *New();
vtkTypeMacro(vtkTimePointUtility,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Return the time point for 12:00am on a specified day.
@@ -166,7 +166,7 @@ public:
protected:
vtkTimePointUtility() {}
- ~vtkTimePointUtility() VTK_OVERRIDE {}
+ ~vtkTimePointUtility() override {}
private:
vtkTimePointUtility(const vtkTimePointUtility&) VTK_DELETE_FUNCTION;
diff --git a/Common/Core/vtkTypedArray.h b/Common/Core/vtkTypedArray.h
index 23cff5c2ad9eeaa08533c3d8d3a2046d3a87d73a..4267f165d7c5dd79b55288b484992848a2e81897 100644
--- a/Common/Core/vtkTypedArray.h
+++ b/Common/Core/vtkTypedArray.h
@@ -62,16 +62,16 @@ public:
using vtkArray::GetVariantValue;
using vtkArray::SetVariantValue;
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
// vtkArray API
- vtkVariant GetVariantValue(const vtkArrayCoordinates& coordinates) VTK_OVERRIDE;
- vtkVariant GetVariantValueN(const SizeT n) VTK_OVERRIDE;
- void SetVariantValue(const vtkArrayCoordinates& coordinates, const vtkVariant& value) VTK_OVERRIDE;
- void SetVariantValueN(const SizeT n, const vtkVariant& value) VTK_OVERRIDE;
- void CopyValue(vtkArray* source, const vtkArrayCoordinates& source_coordinates, const vtkArrayCoordinates& target_coordinates) VTK_OVERRIDE;
- void CopyValue(vtkArray* source, const SizeT source_index, const vtkArrayCoordinates& target_coordinates) VTK_OVERRIDE;
- void CopyValue(vtkArray* source, const vtkArrayCoordinates& source_coordinates, const SizeT target_index) VTK_OVERRIDE;
+ vtkVariant GetVariantValue(const vtkArrayCoordinates& coordinates) override;
+ vtkVariant GetVariantValueN(const SizeT n) override;
+ void SetVariantValue(const vtkArrayCoordinates& coordinates, const vtkVariant& value) override;
+ void SetVariantValueN(const SizeT n, const vtkVariant& value) override;
+ void CopyValue(vtkArray* source, const vtkArrayCoordinates& source_coordinates, const vtkArrayCoordinates& target_coordinates) override;
+ void CopyValue(vtkArray* source, const SizeT source_index, const vtkArrayCoordinates& target_coordinates) override;
+ void CopyValue(vtkArray* source, const vtkArrayCoordinates& source_coordinates, const SizeT target_index) override;
//@{
/**
@@ -117,7 +117,7 @@ public:
protected:
vtkTypedArray() {}
- ~vtkTypedArray() VTK_OVERRIDE {}
+ ~vtkTypedArray() override {}
private:
vtkTypedArray(const vtkTypedArray&) VTK_DELETE_FUNCTION;
diff --git a/Common/Core/vtkTypedArray.h.in b/Common/Core/vtkTypedArray.h.in
index 5dfd4866ad67d7eecbbf2d84a2d11a22a68157d3..831aeabb8e2a0882e14a39b979488525d9b88c1a 100644
--- a/Common/Core/vtkTypedArray.h.in
+++ b/Common/Core/vtkTypedArray.h.in
@@ -34,7 +34,7 @@ class VTKCOMMONCORE_EXPORT vtkType@VTK_TYPE_NAME@Array : public vtkTypeArrayBase
public:
static vtkType@VTK_TYPE_NAME@Array* New();
vtkTypeMacro(vtkType@VTK_TYPE_NAME@Array,vtkTypeArrayBase);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
// Description:
// A faster alternative to SafeDownCast for downcasting vtkAbstractArrays.
diff --git a/Common/Core/vtkTypedDataArray.h b/Common/Core/vtkTypedDataArray.h
index d812c043aca3bb496d455f5ace4fe57cf6c3a716..db7f86984caa95bcfae98ee7eadc9b0e0fd0e40e 100644
--- a/Common/Core/vtkTypedDataArray.h
+++ b/Common/Core/vtkTypedDataArray.h
@@ -86,19 +86,19 @@ public:
/**
* Return the VTK data type held by this array.
*/
- int GetDataType() VTK_OVERRIDE;
+ int GetDataType() override;
/**
* Return the size of the element type in bytes.
*/
- int GetDataTypeSize() VTK_OVERRIDE;
+ int GetDataTypeSize() override;
/**
* Specify the number of values for this object to hold. Does an
* allocation as well as setting the MaxId ivar. Used in conjunction with
* SetValue() method for fast insertion.
*/
- void SetNumberOfValues(vtkIdType num) VTK_OVERRIDE;
+ void SetNumberOfValues(vtkIdType num) override;
/**
* Set the tuple value at the ith location in the array.
@@ -153,17 +153,17 @@ public:
/**
* Method for type-checking in FastDownCast implementations.
*/
- int GetArrayType() VTK_OVERRIDE { return vtkAbstractArray::TypedDataArray; }
+ int GetArrayType() override { return vtkAbstractArray::TypedDataArray; }
// Reintroduced as pure virtual since the base vtkGenericDataArray method
// requires new allocation/resize APIs, though existing MappedDataArrays
// would just use the vtkDataArray-level virtuals.
- int Allocate(vtkIdType size, vtkIdType ext = 1000) VTK_OVERRIDE = 0;
- int Resize(vtkIdType numTuples) VTK_OVERRIDE = 0;
+ int Allocate(vtkIdType size, vtkIdType ext = 1000) override = 0;
+ int Resize(vtkIdType numTuples) override = 0;
protected:
vtkTypedDataArray();
- ~vtkTypedDataArray() VTK_OVERRIDE;
+ ~vtkTypedDataArray() override;
/**
* Needed for vtkGenericDataArray API, but just aborts. Override Allocate
diff --git a/Common/Core/vtkUnicodeStringArray.h b/Common/Core/vtkUnicodeStringArray.h
index 1b27643b91e130b341457271306483cae493430b..6cf7ff631697043716aae93a527ee312bae2d33e 100644
--- a/Common/Core/vtkUnicodeStringArray.h
+++ b/Common/Core/vtkUnicodeStringArray.h
@@ -42,46 +42,46 @@ class VTKCOMMONCORE_EXPORT vtkUnicodeStringArray :
public:
static vtkUnicodeStringArray* New();
vtkTypeMacro(vtkUnicodeStringArray,vtkAbstractArray);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
-
- int Allocate(vtkIdType sz, vtkIdType ext=1000) VTK_OVERRIDE;
- void Initialize() VTK_OVERRIDE;
- int GetDataType() VTK_OVERRIDE;
- int GetDataTypeSize() VTK_OVERRIDE;
- int GetElementComponentSize() VTK_OVERRIDE;
- void SetNumberOfTuples(vtkIdType number) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
+
+ int Allocate(vtkIdType sz, vtkIdType ext=1000) override;
+ void Initialize() override;
+ int GetDataType() override;
+ int GetDataTypeSize() override;
+ int GetElementComponentSize() override;
+ void SetNumberOfTuples(vtkIdType number) override;
void SetTuple(vtkIdType i, vtkIdType j,
- vtkAbstractArray* source) VTK_OVERRIDE;
+ vtkAbstractArray* source) override;
void InsertTuple(vtkIdType i, vtkIdType j,
- vtkAbstractArray* source) VTK_OVERRIDE;
+ vtkAbstractArray* source) override;
void InsertTuples(vtkIdList *dstIds, vtkIdList *srcIds,
- vtkAbstractArray *source) VTK_OVERRIDE;
+ vtkAbstractArray *source) override;
void InsertTuples(vtkIdType dstStart, vtkIdType n, vtkIdType srcStart,
- vtkAbstractArray* source) VTK_OVERRIDE;
- vtkIdType InsertNextTuple(vtkIdType j, vtkAbstractArray* source) VTK_OVERRIDE;
- void* GetVoidPointer(vtkIdType id) VTK_OVERRIDE;
- void DeepCopy(vtkAbstractArray* da) VTK_OVERRIDE;
+ vtkAbstractArray* source) override;
+ vtkIdType InsertNextTuple(vtkIdType j, vtkAbstractArray* source) override;
+ void* GetVoidPointer(vtkIdType id) override;
+ void DeepCopy(vtkAbstractArray* da) override;
void InterpolateTuple(vtkIdType i, vtkIdList *ptIndices,
- vtkAbstractArray* source, double* weights) VTK_OVERRIDE;
+ vtkAbstractArray* source, double* weights) override;
void InterpolateTuple(vtkIdType i,
vtkIdType id1, vtkAbstractArray* source1,
- vtkIdType id2, vtkAbstractArray* source2, double t) VTK_OVERRIDE;
- void Squeeze() VTK_OVERRIDE;
- int Resize(vtkIdType numTuples) VTK_OVERRIDE;
- void SetVoidArray(void *array, vtkIdType size, int save) VTK_OVERRIDE;
+ vtkIdType id2, vtkAbstractArray* source2, double t) override;
+ void Squeeze() override;
+ int Resize(vtkIdType numTuples) override;
+ void SetVoidArray(void *array, vtkIdType size, int save) override;
void SetVoidArray(void *array, vtkIdType size, int save,
- int deleteMethod) VTK_OVERRIDE;
- unsigned long GetActualMemorySize() VTK_OVERRIDE; // in bytes
- int IsNumeric() VTK_OVERRIDE;
- VTK_NEWINSTANCE vtkArrayIterator* NewIterator() VTK_OVERRIDE;
- vtkVariant GetVariantValue(vtkIdType idx) VTK_OVERRIDE;
- vtkIdType LookupValue(vtkVariant value) VTK_OVERRIDE;
- void LookupValue(vtkVariant value, vtkIdList* ids) VTK_OVERRIDE;
-
- void SetVariantValue(vtkIdType idx, vtkVariant value) VTK_OVERRIDE;
- void InsertVariantValue(vtkIdType idx, vtkVariant value) VTK_OVERRIDE;
- void DataChanged() VTK_OVERRIDE;
- void ClearLookup() VTK_OVERRIDE;
+ int deleteMethod) override;
+ unsigned long GetActualMemorySize() override; // in bytes
+ int IsNumeric() override;
+ VTK_NEWINSTANCE vtkArrayIterator* NewIterator() override;
+ vtkVariant GetVariantValue(vtkIdType idx) override;
+ vtkIdType LookupValue(vtkVariant value) override;
+ void LookupValue(vtkVariant value, vtkIdList* ids) override;
+
+ void SetVariantValue(vtkIdType idx, vtkVariant value) override;
+ void InsertVariantValue(vtkIdType idx, vtkVariant value) override;
+ void DataChanged() override;
+ void ClearLookup() override;
vtkIdType InsertNextValue(const vtkUnicodeString&);
void InsertValue(vtkIdType idx, const vtkUnicodeString&); // Ranged checked
@@ -94,7 +94,7 @@ public:
protected:
vtkUnicodeStringArray();
- ~vtkUnicodeStringArray() VTK_OVERRIDE;
+ ~vtkUnicodeStringArray() override;
private:
vtkUnicodeStringArray(const vtkUnicodeStringArray&) VTK_DELETE_FUNCTION;
diff --git a/Common/Core/vtkUnsignedCharArray.h b/Common/Core/vtkUnsignedCharArray.h
index b7bc8d4bf6194d548a4e3cd5d959daca518db99f..c01467be03458b351c92a1b23768818c6d57f42c 100644
--- a/Common/Core/vtkUnsignedCharArray.h
+++ b/Common/Core/vtkUnsignedCharArray.h
@@ -40,7 +40,7 @@ public:
#undef vtkDataArray
#endif
static vtkUnsignedCharArray* New();
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
// This macro expands to the set of method declarations that
// make up the interface of vtkAOSDataArrayTemplate, which is ignored
@@ -69,7 +69,7 @@ public:
protected:
vtkUnsignedCharArray();
- ~vtkUnsignedCharArray() VTK_OVERRIDE;
+ ~vtkUnsignedCharArray() override;
private:
diff --git a/Common/Core/vtkUnsignedIntArray.h b/Common/Core/vtkUnsignedIntArray.h
index 45200dbd317eb607ab4beefd2232f8699e03fd9c..97bb0df0942a7d2eae0bd360c7f8f5456b5d5b12 100644
--- a/Common/Core/vtkUnsignedIntArray.h
+++ b/Common/Core/vtkUnsignedIntArray.h
@@ -44,7 +44,7 @@ public:
#undef vtkDataArray
#endif
static vtkUnsignedIntArray* New();
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
// This macro expands to the set of method declarations that
// make up the interface of vtkAOSDataArrayTemplate, which is ignored
@@ -73,7 +73,7 @@ public:
protected:
vtkUnsignedIntArray();
- ~vtkUnsignedIntArray() VTK_OVERRIDE;
+ ~vtkUnsignedIntArray() override;
private:
diff --git a/Common/Core/vtkUnsignedLongArray.h b/Common/Core/vtkUnsignedLongArray.h
index 4e68c20936e689964233ee04cd2e5a520e074128..63fb92947827629344023af40c353549f98cdd4d 100644
--- a/Common/Core/vtkUnsignedLongArray.h
+++ b/Common/Core/vtkUnsignedLongArray.h
@@ -46,7 +46,7 @@ public:
#undef vtkDataArray
#endif
static vtkUnsignedLongArray* New();
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
// This macro expands to the set of method declarations that
// make up the interface of vtkAOSDataArrayTemplate, which is ignored
@@ -75,7 +75,7 @@ public:
protected:
vtkUnsignedLongArray();
- ~vtkUnsignedLongArray() VTK_OVERRIDE;
+ ~vtkUnsignedLongArray() override;
private:
diff --git a/Common/Core/vtkUnsignedLongLongArray.h b/Common/Core/vtkUnsignedLongLongArray.h
index 08c228eb867f057ab0ce2e85a90218c73ccd021a..d99831de136baec4ca2c962660af7a80e36a232d 100644
--- a/Common/Core/vtkUnsignedLongLongArray.h
+++ b/Common/Core/vtkUnsignedLongLongArray.h
@@ -44,7 +44,7 @@ public:
#undef vtkDataArray
#endif
static vtkUnsignedLongLongArray* New();
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
// This macro expands to the set of method declarations that
// make up the interface of vtkAOSDataArrayTemplate, which is ignored
@@ -74,7 +74,7 @@ public:
protected:
vtkUnsignedLongLongArray();
- ~vtkUnsignedLongLongArray() VTK_OVERRIDE;
+ ~vtkUnsignedLongLongArray() override;
private:
diff --git a/Common/Core/vtkUnsignedShortArray.h b/Common/Core/vtkUnsignedShortArray.h
index dbff48820a273c604fcc55055c05fabb123714ff..5cb4dfeba8444d01f70d770852ef880cdbd29711 100644
--- a/Common/Core/vtkUnsignedShortArray.h
+++ b/Common/Core/vtkUnsignedShortArray.h
@@ -44,7 +44,7 @@ public:
#undef vtkDataArray
#endif
static vtkUnsignedShortArray* New();
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
// This macro expands to the set of method declarations that
// make up the interface of vtkAOSDataArrayTemplate, which is ignored
@@ -74,7 +74,7 @@ public:
protected:
vtkUnsignedShortArray();
- ~vtkUnsignedShortArray() VTK_OVERRIDE;
+ ~vtkUnsignedShortArray() override;
private:
diff --git a/Common/Core/vtkVariantArray.h b/Common/Core/vtkVariantArray.h
index b891181dd6de2604a43144ef857b3d4514e18ee1..c95db18e5abed5b9e528fbbef60f3e794f15f343 100644
--- a/Common/Core/vtkVariantArray.h
+++ b/Common/Core/vtkVariantArray.h
@@ -49,7 +49,7 @@ class VTKCOMMONCORE_EXPORT vtkVariantArray : public vtkAbstractArray
public:
static vtkVariantArray* New();
vtkTypeMacro(vtkVariantArray,vtkAbstractArray);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//
// Functions required by vtkAbstractArray
@@ -59,25 +59,25 @@ public:
* Allocate memory for this array. Delete old storage only if necessary.
* Note that ext is no longer used.
*/
- int Allocate(vtkIdType sz, vtkIdType ext=1000) VTK_OVERRIDE;
+ int Allocate(vtkIdType sz, vtkIdType ext=1000) override;
/**
* Release storage and reset array to initial state.
*/
- void Initialize() VTK_OVERRIDE;
+ void Initialize() override;
/**
* Return the underlying data type. An integer indicating data type is
* returned as specified in vtkSetGet.h.
*/
- int GetDataType() VTK_OVERRIDE;
+ int GetDataType() override;
/**
* Return the size of the underlying data type. For a bit, 1 is
* returned. For string 0 is returned. Arrays with variable length
* components return 0.
*/
- int GetDataTypeSize() VTK_OVERRIDE;
+ int GetDataTypeSize() override;
/**
* Return the size, in bytes, of the lowest-level element of an
@@ -86,13 +86,13 @@ public:
* sizeof(vtkStdString::value_type), which winds up being
* sizeof(char).
*/
- int GetElementComponentSize() VTK_OVERRIDE;
+ int GetElementComponentSize() override;
/**
* Set the number of tuples (a component group) in the array. Note that
* this may allocate space depending on the number of components.
*/
- void SetNumberOfTuples(vtkIdType number) VTK_OVERRIDE;
+ void SetNumberOfTuples(vtkIdType number) override;
/**
* Set the tuple at the ith location using the jth tuple in the source array.
@@ -101,14 +101,14 @@ public:
* performed; use in conjunction with SetNumberOfTuples() to allocate space.
*/
void SetTuple(vtkIdType i, vtkIdType j,
- vtkAbstractArray* source) VTK_OVERRIDE;
+ vtkAbstractArray* source) override;
/**
* Insert the jth tuple in the source array, at ith location in this array.
* Note that memory allocation is performed as necessary to hold the data.
*/
void InsertTuple(vtkIdType i, vtkIdType j,
- vtkAbstractArray* source) VTK_OVERRIDE;
+ vtkAbstractArray* source) override;
/**
* Copy the tuples indexed in srcIds from the source array to the tuple
@@ -116,7 +116,7 @@ public:
* Note that memory allocation is performed as necessary to hold the data.
*/
void InsertTuples(vtkIdList *dstIds, vtkIdList *srcIds,
- vtkAbstractArray *source) VTK_OVERRIDE;
+ vtkAbstractArray *source) override;
/**
* Copy n consecutive tuples starting at srcStart from the source array to
@@ -124,27 +124,27 @@ public:
* Note that memory allocation is performed as necessary to hold the data.
*/
void InsertTuples(vtkIdType dstStart, vtkIdType n, vtkIdType srcStart,
- vtkAbstractArray* source) VTK_OVERRIDE;
+ vtkAbstractArray* source) override;
/**
* Insert the jth tuple in the source array, at the end in this array.
* Note that memory allocation is performed as necessary to hold the data.
* Returns the location at which the data was inserted.
*/
- vtkIdType InsertNextTuple(vtkIdType j, vtkAbstractArray* source) VTK_OVERRIDE;
+ vtkIdType InsertNextTuple(vtkIdType j, vtkAbstractArray* source) override;
/**
* Return a void pointer. For image pipeline interface and other
* special pointer manipulation.
*/
- void *GetVoidPointer(vtkIdType id) VTK_OVERRIDE;
+ void *GetVoidPointer(vtkIdType id) override;
/**
* Deep copy of data. Implementation left to subclasses, which
* should support as many type conversions as possible given the
* data type.
*/
- void DeepCopy(vtkAbstractArray *da) VTK_OVERRIDE;
+ void DeepCopy(vtkAbstractArray *da) override;
/**
* Set the ith tuple in this array as the interpolated tuple value,
@@ -154,7 +154,7 @@ public:
* and strcuture.
*/
void InterpolateTuple(vtkIdType i, vtkIdList *ptIndices,
- vtkAbstractArray* source, double* weights) VTK_OVERRIDE;
+ vtkAbstractArray* source, double* weights) override;
/**
* Insert the ith tuple in this array as interpolated from the two values,
@@ -166,20 +166,20 @@ public:
*/
void InterpolateTuple(vtkIdType i,
vtkIdType id1, vtkAbstractArray* source1,
- vtkIdType id2, vtkAbstractArray* source2, double t) VTK_OVERRIDE;
+ vtkIdType id2, vtkAbstractArray* source2, double t) override;
/**
* Free any unnecessary memory.
* Description:
* Resize object to just fit data requirement. Reclaims extra memory.
*/
- void Squeeze() VTK_OVERRIDE;
+ void Squeeze() override;
/**
* Resize the array while conserving the data. Returns 1 if
* resizing succeeded and 0 otherwise.
*/
- int Resize(vtkIdType numTuples) VTK_OVERRIDE;
+ int Resize(vtkIdType numTuples) override;
//@{
/**
@@ -190,9 +190,9 @@ public:
* The class uses the actual array provided; it does not copy the data
* from the supplied array.
*/
- void SetVoidArray(void *arr, vtkIdType size, int save) VTK_OVERRIDE;
+ void SetVoidArray(void *arr, vtkIdType size, int save) override;
void SetVoidArray(void *arr, vtkIdType size, int save,
- int deleteM) VTK_OVERRIDE;
+ int deleteM) override;
//@}
/**
@@ -203,18 +203,18 @@ public:
* information returned is valid only after the pipeline has
* been updated.
*/
- unsigned long GetActualMemorySize() VTK_OVERRIDE;
+ unsigned long GetActualMemorySize() override;
/**
* Since each item can be of a different type, we say that a variant array is not numeric.
*/
- int IsNumeric() VTK_OVERRIDE;
+ int IsNumeric() override;
/**
* Subclasses must override this method and provide the right
* kind of templated vtkArrayIteratorTemplate.
*/
- VTK_NEWINSTANCE vtkArrayIterator* NewIterator() VTK_OVERRIDE;
+ VTK_NEWINSTANCE vtkArrayIterator* NewIterator() override;
//
// Additional functions
@@ -243,12 +243,12 @@ public:
/**
* Insert a value into the array from a variant.
*/
- void SetVariantValue(vtkIdType idx, vtkVariant value) VTK_OVERRIDE;
+ void SetVariantValue(vtkIdType idx, vtkVariant value) override;
/**
* Safely insert a value into the array from a variant.
*/
- void InsertVariantValue(vtkIdType idx, vtkVariant value) VTK_OVERRIDE;
+ void InsertVariantValue(vtkIdType idx, vtkVariant value) override;
/**
* Expand the array by one and set the value at that location.
@@ -271,7 +271,7 @@ public:
* allocation as well as setting the MaxId ivar. Used in conjunction with
* SetValue() method for fast insertion.
*/
- void SetNumberOfValues(vtkIdType number) VTK_OVERRIDE;
+ void SetNumberOfValues(vtkIdType number) override;
/**
* Return the number of values in the array.
@@ -282,8 +282,8 @@ public:
/**
* Return the indices where a specific value appears.
*/
- vtkIdType LookupValue(vtkVariant value) VTK_OVERRIDE;
- void LookupValue(vtkVariant value, vtkIdList* ids) VTK_OVERRIDE;
+ vtkIdType LookupValue(vtkVariant value) override;
+ void LookupValue(vtkVariant value, vtkIdList* ids) override;
//@}
/**
@@ -294,7 +294,7 @@ public:
* the fast lookup will know to rebuild itself. Otherwise, the lookup
* functions will give incorrect results.
*/
- void DataChanged() VTK_OVERRIDE;
+ void DataChanged() override;
/**
* Tell the array explicitly that a single data element has
@@ -308,13 +308,13 @@ public:
* if it exists. The lookup will be rebuilt on the next call to a lookup
* function.
*/
- void ClearLookup() VTK_OVERRIDE;
+ void ClearLookup() override;
/**
* This destructor is public to work around a bug in version 1.36.0 of
* the Boost.Serialization library.
*/
- ~vtkVariantArray() VTK_OVERRIDE;
+ ~vtkVariantArray() override;
protected:
// Construct object with default tuple dimension (number of components) of 1.
diff --git a/Common/Core/vtkVersion.h b/Common/Core/vtkVersion.h
index 79615e3173a1bb3787fa6bc209fb45ae2933ed78..316d7a3057a8cf51371d7fa56ae90a05bc11f2e2 100644
--- a/Common/Core/vtkVersion.h
+++ b/Common/Core/vtkVersion.h
@@ -53,7 +53,7 @@ public:
protected:
vtkVersion() {} //insure constructor/destructor protected
- ~vtkVersion() VTK_OVERRIDE {}
+ ~vtkVersion() override {}
private:
vtkVersion(const vtkVersion&) VTK_DELETE_FUNCTION;
void operator=(const vtkVersion&) VTK_DELETE_FUNCTION;
diff --git a/Common/Core/vtkVoidArray.h b/Common/Core/vtkVoidArray.h
index 1bae8c1c80d9c0e5096da0d414fb26875b394f0b..25e00e3847d3efaf9a0e3eef5486a86daeebb2d0 100644
--- a/Common/Core/vtkVoidArray.h
+++ b/Common/Core/vtkVoidArray.h
@@ -36,7 +36,7 @@ public:
static vtkVoidArray *New();
vtkTypeMacro(vtkVoidArray,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Allocate memory for this array. Delete old storage only if necessary.
@@ -128,7 +128,7 @@ public:
protected:
vtkVoidArray();
- ~vtkVoidArray() VTK_OVERRIDE;
+ ~vtkVoidArray() override;
vtkIdType NumberOfPointers;
vtkIdType Size;
diff --git a/Common/Core/vtkWin32OutputWindow.h b/Common/Core/vtkWin32OutputWindow.h
index 6a690e96c0bd3d053a0b3bb4da3753a660a47a8f..a7b3f0385ca6704683ca5bbccb90d16806daf08a 100644
--- a/Common/Core/vtkWin32OutputWindow.h
+++ b/Common/Core/vtkWin32OutputWindow.h
@@ -37,7 +37,7 @@ class VTKCOMMONCORE_EXPORT vtkWin32OutputWindow : public vtkOutputWindow
public:
// Methods from vtkObject
vtkTypeMacro(vtkWin32OutputWindow,vtkOutputWindow);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Create a vtkWin32OutputWindow.
diff --git a/Common/Core/vtkWin32ProcessOutputWindow.h b/Common/Core/vtkWin32ProcessOutputWindow.h
index 5418e2a4641a280c6703cb0101b113050f6d493b..d34b2db3fb42edf828cdfd5cd7951f5ffbac0585 100644
--- a/Common/Core/vtkWin32ProcessOutputWindow.h
+++ b/Common/Core/vtkWin32ProcessOutputWindow.h
@@ -33,7 +33,7 @@ class VTKCOMMONCORE_EXPORT vtkWin32ProcessOutputWindow : public vtkOutputWindow
public:
vtkTypeMacro(vtkWin32ProcessOutputWindow,vtkOutputWindow);
static vtkWin32ProcessOutputWindow* New();
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Send text to the output window process.
diff --git a/Common/Core/vtkWindow.h b/Common/Core/vtkWindow.h
index 6cf631be9323b05966d5f1b181352ba3b5b3d59c..c9ada4df729f7c1d9e4c5ae10cc778a3e13b44ea 100644
--- a/Common/Core/vtkWindow.h
+++ b/Common/Core/vtkWindow.h
@@ -35,7 +35,7 @@ class VTKCOMMONCORE_EXPORT vtkWindow : public vtkObject
{
public:
vtkTypeMacro(vtkWindow,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -198,7 +198,7 @@ public:
protected:
int OffScreenRendering;
vtkWindow();
- ~vtkWindow() VTK_OVERRIDE;
+ ~vtkWindow() override;
char *WindowName;
int Size[2];
diff --git a/Common/Core/vtkXMLFileOutputWindow.h b/Common/Core/vtkXMLFileOutputWindow.h
index 231467c4df1709f1969368d8a67b2d5d0ae21b8c..7c0b483f0acee2ff5692fd0838294d14777b2582 100644
--- a/Common/Core/vtkXMLFileOutputWindow.h
+++ b/Common/Core/vtkXMLFileOutputWindow.h
@@ -54,11 +54,11 @@ public:
* replace &, <, > with &, <, and >.
* Each display method outputs a different XML tag.
*/
- void DisplayText(const char*) VTK_OVERRIDE;
- void DisplayErrorText(const char*) VTK_OVERRIDE;
- void DisplayWarningText(const char*) VTK_OVERRIDE;
- void DisplayGenericWarningText(const char*) VTK_OVERRIDE;
- void DisplayDebugText(const char*) VTK_OVERRIDE;
+ void DisplayText(const char*) override;
+ void DisplayErrorText(const char*) override;
+ void DisplayWarningText(const char*) override;
+ void DisplayGenericWarningText(const char*) override;
+ void DisplayDebugText(const char*) override;
//@}
/**
@@ -68,7 +68,7 @@ public:
protected:
vtkXMLFileOutputWindow() {}
- ~vtkXMLFileOutputWindow() VTK_OVERRIDE {}
+ ~vtkXMLFileOutputWindow() override {}
void Initialize();
virtual void DisplayXML(const char*, const char*);
diff --git a/Common/DataModel/vtkAMRDataInternals.h b/Common/DataModel/vtkAMRDataInternals.h
index 621e3fd376745fcd675b3a198557143ee02f4dd8..bcab32b231a7e8661e28adb296d63aff0fff94d0 100644
--- a/Common/DataModel/vtkAMRDataInternals.h
+++ b/Common/DataModel/vtkAMRDataInternals.h
@@ -47,7 +47,7 @@ public:
vtkTypeMacro(vtkAMRDataInternals, vtkObject);
void Initialize();
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
void Insert(unsigned int index, vtkUniformGrid* grid);
vtkUniformGrid* GetDataSet(unsigned int compositeIndex);
@@ -64,7 +64,7 @@ public:
protected:
vtkAMRDataInternals();
- ~vtkAMRDataInternals() VTK_OVERRIDE;
+ ~vtkAMRDataInternals() override;
void GenerateIndex(bool force=false);
diff --git a/Common/DataModel/vtkAMRInformation.h b/Common/DataModel/vtkAMRInformation.h
index 5f9538b029d167bc9fe5d7caae06bc16db654740..6fe91da7e6fce1aaa21cfbffa50062032a7406e2 100644
--- a/Common/DataModel/vtkAMRInformation.h
+++ b/Common/DataModel/vtkAMRInformation.h
@@ -51,7 +51,7 @@ public:
static vtkAMRInformation* New();
vtkTypeMacro(vtkAMRInformation, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
bool operator==(const vtkAMRInformation& other);
@@ -251,7 +251,7 @@ public:
private:
vtkAMRInformation();
- ~vtkAMRInformation() VTK_OVERRIDE;
+ ~vtkAMRInformation() override;
vtkAMRInformation(const vtkAMRInformation&) VTK_DELETE_FUNCTION;
void operator=(const vtkAMRInformation&) VTK_DELETE_FUNCTION;
diff --git a/Common/DataModel/vtkAMRUtilities.h b/Common/DataModel/vtkAMRUtilities.h
index 8a4725396b495d9999afd65c45cd73826af9fbd6..686b3ed26aa7aac01db6b98b9cfdab32d2b1de1c 100644
--- a/Common/DataModel/vtkAMRUtilities.h
+++ b/Common/DataModel/vtkAMRUtilities.h
@@ -40,7 +40,7 @@ class VTKCOMMONDATAMODEL_EXPORT vtkAMRUtilities : public vtkObject
public:
// Standard Routines
vtkTypeMacro(vtkAMRUtilities,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* This method detects and strips partially overlapping cells from a
@@ -70,7 +70,7 @@ public:
protected:
vtkAMRUtilities() {}
- ~vtkAMRUtilities() VTK_OVERRIDE {}
+ ~vtkAMRUtilities() override {}
/**
* Given the real-extent w.r.t. the ghosted grid, this method copies the
diff --git a/Common/DataModel/vtkAbstractCellLinks.h b/Common/DataModel/vtkAbstractCellLinks.h
index b50931b977e3c82406cb13bd2013b086b64c504f..a1277299c876795013d54ebd0f6ad93baccbc6e2 100644
--- a/Common/DataModel/vtkAbstractCellLinks.h
+++ b/Common/DataModel/vtkAbstractCellLinks.h
@@ -47,7 +47,7 @@ public:
* Standard type and print methods.
*/
vtkTypeMacro(vtkAbstractCellLinks,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
@@ -68,7 +68,7 @@ public:
protected:
vtkAbstractCellLinks();
- ~vtkAbstractCellLinks() VTK_OVERRIDE;
+ ~vtkAbstractCellLinks() override;
private:
vtkAbstractCellLinks(const vtkAbstractCellLinks&) VTK_DELETE_FUNCTION;
diff --git a/Common/DataModel/vtkAbstractCellLocator.h b/Common/DataModel/vtkAbstractCellLocator.h
index 4e3b685fef8f49b01465fb379f6819fbfa99c255..6d782cbdec3e35276f27b59d8e8b80da0f915408 100644
--- a/Common/DataModel/vtkAbstractCellLocator.h
+++ b/Common/DataModel/vtkAbstractCellLocator.h
@@ -49,7 +49,7 @@ class VTKCOMMONDATAMODEL_EXPORT vtkAbstractCellLocator : public vtkLocator
{
public:
vtkTypeMacro(vtkAbstractCellLocator,vtkLocator);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -272,7 +272,7 @@ public:
protected:
vtkAbstractCellLocator();
- ~vtkAbstractCellLocator() VTK_OVERRIDE;
+ ~vtkAbstractCellLocator() override;
//@{
/**
diff --git a/Common/DataModel/vtkAbstractElectronicData.h b/Common/DataModel/vtkAbstractElectronicData.h
index 178a31706a496cf18506b17d5175a43812f0aee0..95041767d60bf3989be2fc5723aa1b39e63f5afe 100644
--- a/Common/DataModel/vtkAbstractElectronicData.h
+++ b/Common/DataModel/vtkAbstractElectronicData.h
@@ -31,7 +31,7 @@ class VTKCOMMONDATAMODEL_EXPORT vtkAbstractElectronicData : public vtkDataObject
{
public:
vtkTypeMacro(vtkAbstractElectronicData,vtkDataObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Returns the number of molecular orbitals available.
@@ -99,7 +99,7 @@ public:
/**
* Deep copies the data object into this.
*/
- void DeepCopy(vtkDataObject *obj) VTK_OVERRIDE;
+ void DeepCopy(vtkDataObject *obj) override;
//@{
/**
@@ -111,7 +111,7 @@ public:
protected:
vtkAbstractElectronicData();
- ~vtkAbstractElectronicData() VTK_OVERRIDE;
+ ~vtkAbstractElectronicData() override;
double Padding;
diff --git a/Common/DataModel/vtkAbstractPointLocator.h b/Common/DataModel/vtkAbstractPointLocator.h
index bd753ee90c6698df21ad00815bf81e29c4c95631..3a8844074e59bb6959936b4b6c04f329daa8b0aa 100644
--- a/Common/DataModel/vtkAbstractPointLocator.h
+++ b/Common/DataModel/vtkAbstractPointLocator.h
@@ -43,7 +43,7 @@ public:
* Standard type and print methods.
*/
vtkTypeMacro(vtkAbstractPointLocator,vtkLocator);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -109,7 +109,7 @@ public:
protected:
vtkAbstractPointLocator();
- ~vtkAbstractPointLocator() VTK_OVERRIDE;
+ ~vtkAbstractPointLocator() override;
double Bounds[6]; // bounds of points
vtkIdType NumberOfBuckets; // total size of locator
diff --git a/Common/DataModel/vtkAdjacentVertexIterator.h b/Common/DataModel/vtkAdjacentVertexIterator.h
index 0792ec4d19e0c9b0d6fe328d533f0c0550ab3a90..79750eb12bffc6b4a89c934d362a8876805fc136 100644
--- a/Common/DataModel/vtkAdjacentVertexIterator.h
+++ b/Common/DataModel/vtkAdjacentVertexIterator.h
@@ -46,7 +46,7 @@ class VTKCOMMONDATAMODEL_EXPORT vtkAdjacentVertexIterator : public vtkObject
public:
static vtkAdjacentVertexIterator *New();
vtkTypeMacro(vtkAdjacentVertexIterator, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Initialize the iterator with a graph and vertex.
@@ -83,7 +83,7 @@ public:
protected:
vtkAdjacentVertexIterator();
- ~vtkAdjacentVertexIterator() VTK_OVERRIDE;
+ ~vtkAdjacentVertexIterator() override;
/**
* Protected method for setting the graph used
diff --git a/Common/DataModel/vtkAnimationScene.h b/Common/DataModel/vtkAnimationScene.h
index 41ff0f6422d529d8b53329b2d3d79b3664e91ef1..4da5cf976b92ce6768a87987c21885ceb0b06e30 100644
--- a/Common/DataModel/vtkAnimationScene.h
+++ b/Common/DataModel/vtkAnimationScene.h
@@ -42,7 +42,7 @@ class VTKCOMMONDATAMODEL_EXPORT vtkAnimationScene: public vtkAnimationCue
{
public:
vtkTypeMacro(vtkAnimationScene, vtkAnimationCue);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkAnimationScene* New();
//@{
@@ -108,7 +108,7 @@ public:
* Overridden to allow change to Normalized mode only
* if none of the constituent cues is in Relative time mode.
*/
- void SetTimeMode(int mode) VTK_OVERRIDE;
+ void SetTimeMode(int mode) override;
/**
* Returns if the animation is being played.
@@ -123,16 +123,16 @@ public:
protected:
vtkAnimationScene();
- ~vtkAnimationScene() VTK_OVERRIDE;
+ ~vtkAnimationScene() override;
//@{
/**
* Called on every valid tick.
* Calls ticks on all the contained cues.
*/
- void TickInternal(double currenttime, double deltatime, double clocktime) VTK_OVERRIDE;
- void StartCueInternal() VTK_OVERRIDE;
- void EndCueInternal() VTK_OVERRIDE;
+ void TickInternal(double currenttime, double deltatime, double clocktime) override;
+ void StartCueInternal() override;
+ void EndCueInternal() override;
//@}
void InitializeChildren();
diff --git a/Common/DataModel/vtkAnnotation.h b/Common/DataModel/vtkAnnotation.h
index c63d81751a285ba199d2ec24e2db5de7a68d606b..ed64aee3401c28c2e5584dcc632c3d1248bf3962 100644
--- a/Common/DataModel/vtkAnnotation.h
+++ b/Common/DataModel/vtkAnnotation.h
@@ -49,7 +49,7 @@ class VTKCOMMONDATAMODEL_EXPORT vtkAnnotation : public vtkDataObject
{
public:
vtkTypeMacro(vtkAnnotation, vtkDataObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkAnnotation* New();
//@{
@@ -109,28 +109,28 @@ public:
/**
* Initialize the annotation to an empty state.
*/
- void Initialize() VTK_OVERRIDE;
+ void Initialize() override;
/**
* Make this annotation have the same properties and have
* the same selection of another annotation.
*/
- void ShallowCopy(vtkDataObject* other) VTK_OVERRIDE;
+ void ShallowCopy(vtkDataObject* other) override;
/**
* Make this annotation have the same properties and have
* a copy of the selection of another annotation.
*/
- void DeepCopy(vtkDataObject* other) VTK_OVERRIDE;
+ void DeepCopy(vtkDataObject* other) override;
/**
* Get the modified time of this object.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
protected:
vtkAnnotation();
- ~vtkAnnotation() VTK_OVERRIDE;
+ ~vtkAnnotation() override;
vtkSelection* Selection;
diff --git a/Common/DataModel/vtkAnnotationLayers.h b/Common/DataModel/vtkAnnotationLayers.h
index 9b87c5b9a91eefb766030836f997cf034b9649a6..edcb4489ea0d92a90899a2cd391f453763b2da82 100644
--- a/Common/DataModel/vtkAnnotationLayers.h
+++ b/Common/DataModel/vtkAnnotationLayers.h
@@ -43,7 +43,7 @@ class VTKCOMMONDATAMODEL_EXPORT vtkAnnotationLayers : public vtkDataObject
{
public:
vtkTypeMacro(vtkAnnotationLayers, vtkDataObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkAnnotationLayers* New();
//@{
@@ -86,19 +86,19 @@ public:
/**
* Initialize the data structure to an empty state.
*/
- void Initialize() VTK_OVERRIDE;
+ void Initialize() override;
/**
* Copy data from another data object into this one
* which references the same member annotations.
*/
- void ShallowCopy(vtkDataObject* other) VTK_OVERRIDE;
+ void ShallowCopy(vtkDataObject* other) override;
/**
* Copy data from another data object into this one,
* performing a deep copy of member annotations.
*/
- void DeepCopy(vtkDataObject* other) VTK_OVERRIDE;
+ void DeepCopy(vtkDataObject* other) override;
//@{
/**
@@ -111,11 +111,11 @@ public:
/**
* The modified time for this object.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
protected:
vtkAnnotationLayers();
- ~vtkAnnotationLayers() VTK_OVERRIDE;
+ ~vtkAnnotationLayers() override;
class Internals;
Internals* Implementation;
diff --git a/Common/DataModel/vtkArrayData.h b/Common/DataModel/vtkArrayData.h
index b62fa0bdb05b3644aedcc5cacf3dfb1eeef7bbd8..a2b8b8c784bf1dee18e12a65275d1955caef7177 100644
--- a/Common/DataModel/vtkArrayData.h
+++ b/Common/DataModel/vtkArrayData.h
@@ -51,7 +51,7 @@ class VTKCOMMONDATAMODEL_EXPORT vtkArrayData : public vtkDataObject
public:
static vtkArrayData* New();
vtkTypeMacro(vtkArrayData, vtkDataObject);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
static vtkArrayData* GetData(vtkInformation* info);
static vtkArrayData* GetData(vtkInformationVector* v, int i = 0);
@@ -84,14 +84,14 @@ public:
/**
* Return class name of data type (VTK_ARRAY_DATA).
*/
- int GetDataObjectType() VTK_OVERRIDE {return VTK_ARRAY_DATA;}
+ int GetDataObjectType() override {return VTK_ARRAY_DATA;}
- void ShallowCopy(vtkDataObject* other) VTK_OVERRIDE;
- void DeepCopy(vtkDataObject* other) VTK_OVERRIDE;
+ void ShallowCopy(vtkDataObject* other) override;
+ void DeepCopy(vtkDataObject* other) override;
protected:
vtkArrayData();
- ~vtkArrayData() VTK_OVERRIDE;
+ ~vtkArrayData() override;
private:
vtkArrayData(const vtkArrayData&) VTK_DELETE_FUNCTION;
diff --git a/Common/DataModel/vtkArrayListTemplate.h b/Common/DataModel/vtkArrayListTemplate.h
index 3d2421b8041f8b7d2fa9c5c5454aeca742cde3b7..ce29045cf4e8834b1a19378aca591032e3fc2191 100644
--- a/Common/DataModel/vtkArrayListTemplate.h
+++ b/Common/DataModel/vtkArrayListTemplate.h
@@ -85,11 +85,11 @@ struct ArrayPair : public BaseArrayPair
BaseArrayPair(num,numComp,outArray), Input(in), Output(out), NullValue(null)
{
}
- ~ArrayPair() VTK_OVERRIDE //calm down some finicky compilers
+ ~ArrayPair() override //calm down some finicky compilers
{
}
- void Copy(vtkIdType inId, vtkIdType outId) VTK_OVERRIDE
+ void Copy(vtkIdType inId, vtkIdType outId) override
{
for (int j=0; j < this->NumComp; ++j)
{
@@ -98,7 +98,7 @@ struct ArrayPair : public BaseArrayPair
}
void Interpolate(int numWeights, const vtkIdType *ids,
- const double *weights, vtkIdType outId) VTK_OVERRIDE
+ const double *weights, vtkIdType outId) override
{
for (int j=0; j < this->NumComp; ++j)
{
@@ -111,7 +111,7 @@ struct ArrayPair : public BaseArrayPair
}
}
- void InterpolateEdge(vtkIdType v0, vtkIdType v1, double t, vtkIdType outId) VTK_OVERRIDE
+ void InterpolateEdge(vtkIdType v0, vtkIdType v1, double t, vtkIdType outId) override
{
double v;
vtkIdType numComp=this->NumComp;
@@ -123,7 +123,7 @@ struct ArrayPair : public BaseArrayPair
}
}
- void AssignNullValue(vtkIdType outId) VTK_OVERRIDE
+ void AssignNullValue(vtkIdType outId) override
{
for (int j=0; j < this->NumComp; ++j)
{
@@ -131,7 +131,7 @@ struct ArrayPair : public BaseArrayPair
}
}
- void Realloc(vtkIdType sze) VTK_OVERRIDE
+ void Realloc(vtkIdType sze) override
{
this->OutputArray->WriteVoidPointer(0,sze*this->NumComp);
this->Output = static_cast<T*>(this->OutputArray->GetVoidPointer(0));
@@ -152,11 +152,11 @@ struct RealArrayPair : public BaseArrayPair
BaseArrayPair(num,numComp,outArray), Input(in), Output(out), NullValue(null)
{
}
- ~RealArrayPair() VTK_OVERRIDE //calm down some finicky compilers
+ ~RealArrayPair() override //calm down some finicky compilers
{
}
- void Copy(vtkIdType inId, vtkIdType outId) VTK_OVERRIDE
+ void Copy(vtkIdType inId, vtkIdType outId) override
{
for (int j=0; j < this->NumComp; ++j)
{
@@ -165,7 +165,7 @@ struct RealArrayPair : public BaseArrayPair
}
void Interpolate(int numWeights, const vtkIdType *ids,
- const double *weights, vtkIdType outId) VTK_OVERRIDE
+ const double *weights, vtkIdType outId) override
{
for (int j=0; j < this->NumComp; ++j)
{
@@ -178,7 +178,7 @@ struct RealArrayPair : public BaseArrayPair
}
}
- void InterpolateEdge(vtkIdType v0, vtkIdType v1, double t, vtkIdType outId) VTK_OVERRIDE
+ void InterpolateEdge(vtkIdType v0, vtkIdType v1, double t, vtkIdType outId) override
{
double v;
vtkIdType numComp=this->NumComp;
@@ -190,7 +190,7 @@ struct RealArrayPair : public BaseArrayPair
}
}
- void AssignNullValue(vtkIdType outId) VTK_OVERRIDE
+ void AssignNullValue(vtkIdType outId) override
{
for (int j=0; j < this->NumComp; ++j)
{
@@ -198,7 +198,7 @@ struct RealArrayPair : public BaseArrayPair
}
}
- void Realloc(vtkIdType sze) VTK_OVERRIDE
+ void Realloc(vtkIdType sze) override
{
this->OutputArray->WriteVoidPointer(0,sze*this->NumComp);
this->Output = static_cast<TOutput*>(this->OutputArray->GetVoidPointer(0));
diff --git a/Common/DataModel/vtkAttributesErrorMetric.h b/Common/DataModel/vtkAttributesErrorMetric.h
index 61f257d8e95fda016d15a5988a4059af09d5a7fb..5343ce1f39f14a6eddb223def179efd446deb5fb 100644
--- a/Common/DataModel/vtkAttributesErrorMetric.h
+++ b/Common/DataModel/vtkAttributesErrorMetric.h
@@ -48,7 +48,7 @@ public:
* Standard VTK type and error macros.
*/
vtkTypeMacro(vtkAttributesErrorMetric,vtkGenericSubdivisionErrorMetric);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -114,7 +114,7 @@ public:
* =GetAttributeCollection()->GetNumberOfPointCenteredComponents()+6
*/
int RequiresEdgeSubdivision(double *leftPoint, double *midPoint, double *rightPoint,
- double alpha) VTK_OVERRIDE;
+ double alpha) override;
/**
* Return the error at the mid-point. The type of error depends on the state
@@ -130,11 +130,11 @@ public:
* \post positive_result: result>=0
*/
double GetError(double *leftPoint, double *midPoint,
- double *rightPoint, double alpha) VTK_OVERRIDE;
+ double *rightPoint, double alpha) override;
protected:
vtkAttributesErrorMetric();
- ~vtkAttributesErrorMetric() VTK_OVERRIDE;
+ ~vtkAttributesErrorMetric() override;
/**
* Compute the square absolute attribute tolerance, only if the cached value
diff --git a/Common/DataModel/vtkBSPCuts.h b/Common/DataModel/vtkBSPCuts.h
index 1ebfc769ba502b65d13354802d3d35ab6357b1c5..f5176a56eb9e7bc4aa2dd9192aa6fc465931459e 100644
--- a/Common/DataModel/vtkBSPCuts.h
+++ b/Common/DataModel/vtkBSPCuts.h
@@ -46,7 +46,7 @@ class VTKCOMMONDATAMODEL_EXPORT vtkBSPCuts : public vtkDataObject
public:
static vtkBSPCuts *New();
vtkTypeMacro(vtkBSPCuts, vtkDataObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Initialize the cuts with arrays of information. This type of
@@ -118,21 +118,21 @@ public:
/**
* Restore data object to initial state,
*/
- void Initialize() VTK_OVERRIDE;
+ void Initialize() override;
//@{
/**
* Shallow copy. These copy the data, but not any of the
* pipeline connections.
*/
- void ShallowCopy(vtkDataObject *src) VTK_OVERRIDE;
- void DeepCopy(vtkDataObject *src) VTK_OVERRIDE;
+ void ShallowCopy(vtkDataObject *src) override;
+ void DeepCopy(vtkDataObject *src) override;
//@}
protected:
vtkBSPCuts();
- ~vtkBSPCuts() VTK_OVERRIDE;
+ ~vtkBSPCuts() override;
static void DeleteAllDescendants(vtkKdNode *kd);
diff --git a/Common/DataModel/vtkBSPIntersections.h b/Common/DataModel/vtkBSPIntersections.h
index 9594a4eb65b14a208a01402d9f6cf4848217d262..1dfab8447ae2a849865215f45aa730ef35bfeb45 100644
--- a/Common/DataModel/vtkBSPIntersections.h
+++ b/Common/DataModel/vtkBSPIntersections.h
@@ -46,7 +46,7 @@ class VTKCOMMONDATAMODEL_EXPORT vtkBSPIntersections : public vtkObject
{
public:
vtkTypeMacro(vtkBSPIntersections, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkBSPIntersections *New();
@@ -158,7 +158,7 @@ public:
protected:
vtkBSPIntersections();
- ~vtkBSPIntersections() VTK_OVERRIDE;
+ ~vtkBSPIntersections() override;
vtkGetMacro(RegionListBuildTime, vtkMTimeType);
diff --git a/Common/DataModel/vtkBiQuadraticQuad.h b/Common/DataModel/vtkBiQuadraticQuad.h
index 77ae54f19a454c5e4500171d0be37e77902afcc0..b652283b34a8dfe386882e789f16bd4a06eb2087 100644
--- a/Common/DataModel/vtkBiQuadraticQuad.h
+++ b/Common/DataModel/vtkBiQuadraticQuad.h
@@ -53,35 +53,35 @@ class VTKCOMMONDATAMODEL_EXPORT vtkBiQuadraticQuad : public vtkNonLinearCell
public:
static vtkBiQuadraticQuad *New ();
vtkTypeMacro(vtkBiQuadraticQuad,vtkNonLinearCell);
- void PrintSelf (ostream & os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf (ostream & os, vtkIndent indent) override;
/**
* Implement the vtkCell API. See the vtkCell API for descriptions
* of these methods.
*/
- int GetCellType() VTK_OVERRIDE { return VTK_BIQUADRATIC_QUAD; }
- int GetCellDimension() VTK_OVERRIDE { return 2; }
- int GetNumberOfEdges() VTK_OVERRIDE { return 4; }
- int GetNumberOfFaces() VTK_OVERRIDE { return 0; }
- vtkCell *GetEdge (int) VTK_OVERRIDE;
- vtkCell *GetFace (int) VTK_OVERRIDE { return nullptr; }
-
- int CellBoundary (int subId, double pcoords[3], vtkIdList * pts) VTK_OVERRIDE;
+ int GetCellType() override { return VTK_BIQUADRATIC_QUAD; }
+ int GetCellDimension() override { return 2; }
+ int GetNumberOfEdges() override { return 4; }
+ int GetNumberOfFaces() override { return 0; }
+ vtkCell *GetEdge (int) override;
+ vtkCell *GetFace (int) override { return nullptr; }
+
+ int CellBoundary (int subId, double pcoords[3], vtkIdList * pts) override;
int EvaluatePosition (double x[3], double *closestPoint,
int &subId, double pcoords[3],
- double &dist2, double *weights) VTK_OVERRIDE;
+ double &dist2, double *weights) override;
void EvaluateLocation (int &subId, double pcoords[3], double x[3],
- double *weights) VTK_OVERRIDE;
- int Triangulate (int index, vtkIdList * ptIds, vtkPoints * pts) VTK_OVERRIDE;
+ double *weights) override;
+ int Triangulate (int index, vtkIdList * ptIds, vtkPoints * pts) override;
void Derivatives (int subId, double pcoords[3], double *values,
- int dim, double *derivs) VTK_OVERRIDE;
- double *GetParametricCoords() VTK_OVERRIDE;
+ int dim, double *derivs) override;
+ double *GetParametricCoords() override;
void Contour (double value, vtkDataArray * cellScalars,
vtkIncrementalPointLocator * locator, vtkCellArray * verts,
vtkCellArray * lines, vtkCellArray * polys,
vtkPointData * inPd, vtkPointData * outPd, vtkCellData * inCd,
- vtkIdType cellId, vtkCellData * outCd) VTK_OVERRIDE;
+ vtkIdType cellId, vtkCellData * outCd) override;
/**
* Clip this biquadratic quad using scalar value provided. Like contouring,
@@ -91,7 +91,7 @@ public:
vtkIncrementalPointLocator * locator, vtkCellArray * polys,
vtkPointData * inPd, vtkPointData * outPd,
vtkCellData * inCd, vtkIdType cellId, vtkCellData * outCd,
- int insideOut) VTK_OVERRIDE;
+ int insideOut) override;
/**
* Line-edge intersection. Intersection has to occur within [0,1] parametric
@@ -99,18 +99,18 @@ public:
*/
int IntersectWithLine (double p1[3], double p2[3], double tol, double &t,
double x[3], double pcoords[3],
- int &subId) VTK_OVERRIDE;
+ int &subId) override;
/**
* Return the center of the pyramid in parametric coordinates.
*/
- int GetParametricCenter(double pcoords[3]) VTK_OVERRIDE;
+ int GetParametricCenter(double pcoords[3]) override;
- void InterpolateFunctions (double pcoords[3], double weights[9]) VTK_OVERRIDE
+ void InterpolateFunctions (double pcoords[3], double weights[9]) override
{
vtkBiQuadraticQuad::InterpolationFunctionsPrivate(pcoords,weights);
}
- void InterpolateDerivs (double pcoords[3], double derivs[18]) VTK_OVERRIDE
+ void InterpolateDerivs (double pcoords[3], double derivs[18]) override
{
vtkBiQuadraticQuad::InterpolationDerivsPrivate(pcoords,derivs);
}
@@ -118,7 +118,7 @@ public:
protected:
vtkBiQuadraticQuad();
- ~vtkBiQuadraticQuad() VTK_OVERRIDE;
+ ~vtkBiQuadraticQuad() override;
vtkQuadraticEdge *Edge;
vtkQuad *Quad;
diff --git a/Common/DataModel/vtkBiQuadraticQuadraticHexahedron.h b/Common/DataModel/vtkBiQuadraticQuadraticHexahedron.h
index 4a63c98b852f904fa01e62b297e1de09358f9237..2db79b964e71b29f1d09a28609feda42faef5c09 100644
--- a/Common/DataModel/vtkBiQuadraticQuadraticHexahedron.h
+++ b/Common/DataModel/vtkBiQuadraticQuadraticHexahedron.h
@@ -82,36 +82,36 @@ class VTKCOMMONDATAMODEL_EXPORT vtkBiQuadraticQuadraticHexahedron : public vtkNo
public:
static vtkBiQuadraticQuadraticHexahedron *New();
vtkTypeMacro(vtkBiQuadraticQuadraticHexahedron,vtkNonLinearCell);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
* Implement the vtkCell API. See the vtkCell API for descriptions
* of these methods.
*/
- int GetCellType() VTK_OVERRIDE {return VTK_BIQUADRATIC_QUADRATIC_HEXAHEDRON;}
- int GetCellDimension() VTK_OVERRIDE {return 3;}
- int GetNumberOfEdges() VTK_OVERRIDE {return 12;}
- int GetNumberOfFaces() VTK_OVERRIDE {return 6;}
- vtkCell *GetEdge(int) VTK_OVERRIDE;
- vtkCell *GetFace(int) VTK_OVERRIDE;
+ int GetCellType() override {return VTK_BIQUADRATIC_QUADRATIC_HEXAHEDRON;}
+ int GetCellDimension() override {return 3;}
+ int GetNumberOfEdges() override {return 12;}
+ int GetNumberOfFaces() override {return 6;}
+ vtkCell *GetEdge(int) override;
+ vtkCell *GetFace(int) override;
//@}
- int CellBoundary(int subId, double pcoords[3], vtkIdList *pts) VTK_OVERRIDE;
+ int CellBoundary(int subId, double pcoords[3], vtkIdList *pts) override;
void Contour(double value, vtkDataArray *cellScalars,
vtkIncrementalPointLocator *locator, vtkCellArray *verts,
vtkCellArray *lines, vtkCellArray *polys,
vtkPointData *inPd, vtkPointData *outPd,
- vtkCellData *inCd, vtkIdType cellId, vtkCellData *outCd) VTK_OVERRIDE;
+ vtkCellData *inCd, vtkIdType cellId, vtkCellData *outCd) override;
int EvaluatePosition(double x[3], double* closestPoint,
int& subId, double pcoords[3],
- double& dist2, double *weights) VTK_OVERRIDE;
+ double& dist2, double *weights) override;
void EvaluateLocation(int& subId, double pcoords[3], double x[3],
- double *weights) VTK_OVERRIDE;
- int Triangulate(int index, vtkIdList *ptIds, vtkPoints *pts) VTK_OVERRIDE;
+ double *weights) override;
+ int Triangulate(int index, vtkIdList *ptIds, vtkPoints *pts) override;
void Derivatives(int subId, double pcoords[3], double *values,
- int dim, double *derivs) VTK_OVERRIDE;
- double *GetParametricCoords() VTK_OVERRIDE;
+ int dim, double *derivs) override;
+ double *GetParametricCoords() override;
/**
* Clip this biquadratic hexahedron using scalar value provided. Like
@@ -122,14 +122,14 @@ public:
vtkIncrementalPointLocator *locator, vtkCellArray *tetras,
vtkPointData *inPd, vtkPointData *outPd,
vtkCellData *inCd, vtkIdType cellId, vtkCellData *outCd,
- int insideOut) VTK_OVERRIDE;
+ int insideOut) override;
/**
* Line-edge intersection. Intersection has to occur within [0,1] parametric
* coordinates and with specified tolerance.
*/
int IntersectWithLine(double p1[3], double p2[3], double tol, double& t,
- double x[3], double pcoords[3], int& subId) VTK_OVERRIDE;
+ double x[3], double pcoords[3], int& subId) override;
/**
* @deprecated Replaced by vtkBiQuadraticQuadraticHexahedron::InterpolateFunctions as of VTK 5.2
@@ -144,11 +144,11 @@ public:
* Compute the interpolation functions/derivatives
* (aka shape functions/derivatives)
*/
- void InterpolateFunctions(double pcoords[3], double weights[24]) VTK_OVERRIDE
+ void InterpolateFunctions(double pcoords[3], double weights[24]) override
{
vtkBiQuadraticQuadraticHexahedron::InterpolationFunctions(pcoords,weights);
}
- void InterpolateDerivs(double pcoords[3], double derivs[72]) VTK_OVERRIDE
+ void InterpolateDerivs(double pcoords[3], double derivs[72]) override
{
vtkBiQuadraticQuadraticHexahedron::InterpolationDerivs(pcoords,derivs);
}
@@ -171,7 +171,7 @@ public:
protected:
vtkBiQuadraticQuadraticHexahedron();
- ~vtkBiQuadraticQuadraticHexahedron() VTK_OVERRIDE;
+ ~vtkBiQuadraticQuadraticHexahedron() override;
vtkQuadraticEdge *Edge;
vtkQuadraticQuad *Face;
diff --git a/Common/DataModel/vtkBiQuadraticQuadraticWedge.h b/Common/DataModel/vtkBiQuadraticQuadraticWedge.h
index 9570fa0ad99a154a03860aa8efa9205049e8db3c..daf30aa20f43eb1359bf7c20ce2fd93f5499d423 100644
--- a/Common/DataModel/vtkBiQuadraticQuadraticWedge.h
+++ b/Common/DataModel/vtkBiQuadraticQuadraticWedge.h
@@ -55,36 +55,36 @@ class VTKCOMMONDATAMODEL_EXPORT vtkBiQuadraticQuadraticWedge : public vtkNonLine
public:
static vtkBiQuadraticQuadraticWedge *New ();
vtkTypeMacro(vtkBiQuadraticQuadraticWedge,vtkNonLinearCell);
- void PrintSelf (ostream & os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf (ostream & os, vtkIndent indent) override;
//@{
/**
* Implement the vtkCell API. See the vtkCell API for descriptions
* of these methods.
*/
- int GetCellType() VTK_OVERRIDE { return VTK_BIQUADRATIC_QUADRATIC_WEDGE; }
- int GetCellDimension() VTK_OVERRIDE { return 3; }
- int GetNumberOfEdges() VTK_OVERRIDE { return 9; }
- int GetNumberOfFaces() VTK_OVERRIDE { return 5; }
- vtkCell *GetEdge (int edgeId) VTK_OVERRIDE;
- vtkCell *GetFace (int faceId) VTK_OVERRIDE;
+ int GetCellType() override { return VTK_BIQUADRATIC_QUADRATIC_WEDGE; }
+ int GetCellDimension() override { return 3; }
+ int GetNumberOfEdges() override { return 9; }
+ int GetNumberOfFaces() override { return 5; }
+ vtkCell *GetEdge (int edgeId) override;
+ vtkCell *GetFace (int faceId) override;
//@}
- int CellBoundary (int subId, double pcoords[3], vtkIdList * pts) VTK_OVERRIDE;
+ int CellBoundary (int subId, double pcoords[3], vtkIdList * pts) override;
void Contour (double value, vtkDataArray * cellScalars,
vtkIncrementalPointLocator * locator, vtkCellArray * verts,
vtkCellArray * lines, vtkCellArray * polys,
vtkPointData * inPd, vtkPointData * outPd, vtkCellData * inCd,
- vtkIdType cellId, vtkCellData * outCd) VTK_OVERRIDE;
+ vtkIdType cellId, vtkCellData * outCd) override;
int EvaluatePosition (double x[3], double *closestPoint,
int &subId, double pcoords[3], double &dist2,
- double *weights) VTK_OVERRIDE;
+ double *weights) override;
void EvaluateLocation (int &subId, double pcoords[3], double x[3],
- double *weights) VTK_OVERRIDE;
- int Triangulate (int index, vtkIdList * ptIds, vtkPoints * pts) VTK_OVERRIDE;
+ double *weights) override;
+ int Triangulate (int index, vtkIdList * ptIds, vtkPoints * pts) override;
void Derivatives (int subId, double pcoords[3], double *values, int dim,
- double *derivs) VTK_OVERRIDE;
- double *GetParametricCoords () VTK_OVERRIDE;
+ double *derivs) override;
+ double *GetParametricCoords () override;
/**
* Clip this quadratic Wedge using scalar value provided. Like
@@ -95,20 +95,20 @@ public:
vtkIncrementalPointLocator * locator, vtkCellArray * tetras,
vtkPointData * inPd, vtkPointData * outPd,
vtkCellData * inCd, vtkIdType cellId, vtkCellData * outCd,
- int insideOut) VTK_OVERRIDE;
+ int insideOut) override;
/**
* Line-edge intersection. Intersection has to occur within [0,1] parametric
* coordinates and with specified tolerance.
*/
int IntersectWithLine (double p1[3], double p2[3], double tol, double &t,
- double x[3], double pcoords[3], int &subId) VTK_OVERRIDE;
+ double x[3], double pcoords[3], int &subId) override;
/**
* Return the center of the quadratic wedge in parametric coordinates.
*/
- int GetParametricCenter (double pcoords[3]) VTK_OVERRIDE;
+ int GetParametricCenter (double pcoords[3]) override;
/**
* @deprecated Replaced by vtkBiQuadraticQuadraticWedge::InterpolateFunctions as of VTK 5.2
@@ -123,11 +123,11 @@ public:
* Compute the interpolation functions/derivatives
* (aka shape functions/derivatives)
*/
- void InterpolateFunctions (double pcoords[3], double weights[15]) VTK_OVERRIDE
+ void InterpolateFunctions (double pcoords[3], double weights[15]) override
{
vtkBiQuadraticQuadraticWedge::InterpolationFunctions(pcoords,weights);
}
- void InterpolateDerivs (double pcoords[3], double derivs[45]) VTK_OVERRIDE
+ void InterpolateDerivs (double pcoords[3], double derivs[45]) override
{
vtkBiQuadraticQuadraticWedge::InterpolationDerivs(pcoords,derivs);
}
@@ -150,7 +150,7 @@ public:
protected:
vtkBiQuadraticQuadraticWedge ();
- ~vtkBiQuadraticQuadraticWedge () VTK_OVERRIDE;
+ ~vtkBiQuadraticQuadraticWedge () override;
vtkQuadraticEdge *Edge;
vtkQuadraticTriangle *TriangleFace;
diff --git a/Common/DataModel/vtkBiQuadraticTriangle.h b/Common/DataModel/vtkBiQuadraticTriangle.h
index ad1f296436a7e5a3a82f13e0ff2a827b2d6ca35d..9e03a38ea74980139129d37b30fa85af7f2b1e4b 100644
--- a/Common/DataModel/vtkBiQuadraticTriangle.h
+++ b/Common/DataModel/vtkBiQuadraticTriangle.h
@@ -50,36 +50,36 @@ class VTKCOMMONDATAMODEL_EXPORT vtkBiQuadraticTriangle : public vtkNonLinearCell
public:
static vtkBiQuadraticTriangle *New();
vtkTypeMacro(vtkBiQuadraticTriangle,vtkNonLinearCell);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
* Implement the vtkCell API. See the vtkCell API for descriptions
* of these methods.
*/
- int GetCellType() VTK_OVERRIDE {return VTK_BIQUADRATIC_TRIANGLE;};
- int GetCellDimension() VTK_OVERRIDE {return 2;}
- int GetNumberOfEdges() VTK_OVERRIDE {return 3;}
- int GetNumberOfFaces() VTK_OVERRIDE {return 0;}
- vtkCell *GetEdge(int edgeId) VTK_OVERRIDE;
- vtkCell *GetFace(int) VTK_OVERRIDE {return nullptr;}
+ int GetCellType() override {return VTK_BIQUADRATIC_TRIANGLE;};
+ int GetCellDimension() override {return 2;}
+ int GetNumberOfEdges() override {return 3;}
+ int GetNumberOfFaces() override {return 0;}
+ vtkCell *GetEdge(int edgeId) override;
+ vtkCell *GetFace(int) override {return nullptr;}
//@}
- int CellBoundary(int subId, double pcoords[3], vtkIdList *pts) VTK_OVERRIDE;
+ int CellBoundary(int subId, double pcoords[3], vtkIdList *pts) override;
void Contour(double value, vtkDataArray *cellScalars,
vtkIncrementalPointLocator *locator, vtkCellArray *verts,
vtkCellArray *lines, vtkCellArray *polys,
vtkPointData *inPd, vtkPointData *outPd,
- vtkCellData *inCd, vtkIdType cellId, vtkCellData *outCd) VTK_OVERRIDE;
+ vtkCellData *inCd, vtkIdType cellId, vtkCellData *outCd) override;
int EvaluatePosition(double x[3], double* closestPoint,
int& subId, double pcoords[3],
- double& dist2, double *weights) VTK_OVERRIDE;
+ double& dist2, double *weights) override;
void EvaluateLocation(int& subId, double pcoords[3], double x[3],
- double *weights) VTK_OVERRIDE;
- int Triangulate(int index, vtkIdList *ptIds, vtkPoints *pts) VTK_OVERRIDE;
+ double *weights) override;
+ int Triangulate(int index, vtkIdList *ptIds, vtkPoints *pts) override;
void Derivatives(int subId, double pcoords[3], double *values,
- int dim, double *derivs) VTK_OVERRIDE;
- double *GetParametricCoords() VTK_OVERRIDE;
+ int dim, double *derivs) override;
+ double *GetParametricCoords() override;
/**
* Clip this quadratic triangle using scalar value provided. Like
@@ -90,26 +90,26 @@ public:
vtkIncrementalPointLocator *locator, vtkCellArray *polys,
vtkPointData *inPd, vtkPointData *outPd,
vtkCellData *inCd, vtkIdType cellId, vtkCellData *outCd,
- int insideOut) VTK_OVERRIDE;
+ int insideOut) override;
/**
* Line-edge intersection. Intersection has to occur within [0,1] parametric
* coordinates and with specified tolerance.
*/
int IntersectWithLine(double p1[3], double p2[3], double tol, double& t,
- double x[3], double pcoords[3], int& subId) VTK_OVERRIDE;
+ double x[3], double pcoords[3], int& subId) override;
/**
* Return the center of the quadratic triangle in parametric coordinates.
*/
- int GetParametricCenter(double pcoords[3]) VTK_OVERRIDE;
+ int GetParametricCenter(double pcoords[3]) override;
/**
* Return the distance of the parametric coordinate provided to the
* cell. If inside the cell, a distance of zero is returned.
*/
- double GetParametricDistance(double pcoords[3]) VTK_OVERRIDE;
+ double GetParametricDistance(double pcoords[3]) override;
/**
* @deprecated Replaced by vtkBiQuadraticTriangle::InterpolateFunctions as of VTK 5.2
@@ -124,11 +124,11 @@ public:
* Compute the interpolation functions/derivatives
* (aka shape functions/derivatives)
*/
- void InterpolateFunctions(double pcoords[3], double weights[7]) VTK_OVERRIDE
+ void InterpolateFunctions(double pcoords[3], double weights[7]) override
{
vtkBiQuadraticTriangle::InterpolationFunctions(pcoords,weights);
}
- void InterpolateDerivs(double pcoords[3], double derivs[14]) VTK_OVERRIDE
+ void InterpolateDerivs(double pcoords[3], double derivs[14]) override
{
vtkBiQuadraticTriangle::InterpolationDerivs(pcoords,derivs);
}
@@ -136,7 +136,7 @@ public:
protected:
vtkBiQuadraticTriangle();
- ~vtkBiQuadraticTriangle() VTK_OVERRIDE;
+ ~vtkBiQuadraticTriangle() override;
vtkQuadraticEdge *Edge;
vtkTriangle *Face;
diff --git a/Common/DataModel/vtkBox.h b/Common/DataModel/vtkBox.h
index 6d99e24e8cd8e7025dfff60c7ed675a33532703d..f173b27141b97632709bdff3d2885d7d75c0f249 100644
--- a/Common/DataModel/vtkBox.h
+++ b/Common/DataModel/vtkBox.h
@@ -39,7 +39,7 @@ class VTKCOMMONDATAMODEL_EXPORT vtkBox : public vtkImplicitFunction
{
public:
vtkTypeMacro(vtkBox,vtkImplicitFunction);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct box with center at (0,0,0) and each side of length 1.0.
@@ -50,12 +50,12 @@ public:
* Evaluate box defined by the two points (pMin,pMax).
*/
using vtkImplicitFunction::EvaluateFunction;
- double EvaluateFunction(double x[3]) VTK_OVERRIDE;
+ double EvaluateFunction(double x[3]) override;
/**
* Evaluate the gradient of the box.
*/
- void EvaluateGradient(double x[3], double n[3]) VTK_OVERRIDE;
+ void EvaluateGradient(double x[3], double n[3]) override;
//@{
/**
@@ -132,7 +132,7 @@ public:
protected:
vtkBox();
- ~vtkBox() VTK_OVERRIDE;
+ ~vtkBox() override;
vtkBoundingBox *BBox;
double Bounds[6]; //supports the GetBounds() method
diff --git a/Common/DataModel/vtkCell.h b/Common/DataModel/vtkCell.h
index 8659b408b12fcb7c1175ef7f1b0e89a94dfeabbf..c5515a247673cae06a1db294708cf556d255cd04 100644
--- a/Common/DataModel/vtkCell.h
+++ b/Common/DataModel/vtkCell.h
@@ -57,7 +57,7 @@ class VTKCOMMONDATAMODEL_EXPORT vtkCell : public vtkObject
{
public:
vtkTypeMacro(vtkCell,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Initialize cell from outside with point ids and point
@@ -364,7 +364,7 @@ public:
protected:
vtkCell();
- ~vtkCell() VTK_OVERRIDE;
+ ~vtkCell() override;
double Bounds[6];
diff --git a/Common/DataModel/vtkCell3D.h b/Common/DataModel/vtkCell3D.h
index bbf6e83d1e0dbf7d607317ed7af7a3a9f02a0e33..fc768404636605cbf499ec76e8e99c45904c0a61 100644
--- a/Common/DataModel/vtkCell3D.h
+++ b/Common/DataModel/vtkCell3D.h
@@ -39,7 +39,7 @@ class VTKCOMMONDATAMODEL_EXPORT vtkCell3D : public vtkCell
{
public:
vtkTypeMacro(vtkCell3D,vtkCell);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Get the pair of vertices that define an edge. The method returns the
@@ -64,7 +64,7 @@ public:
vtkCellArray *lines, vtkCellArray *polys,
vtkPointData *inPd, vtkPointData *outPd,
vtkCellData *inCd, vtkIdType cellId,
- vtkCellData *outCd) VTK_OVERRIDE;
+ vtkCellData *outCd) override;
/**
* Cut (or clip) the cell based on the input cellScalars and the specified
@@ -82,12 +82,12 @@ public:
vtkIncrementalPointLocator *locator, vtkCellArray *connectivity,
vtkPointData *inPd, vtkPointData *outPd,
vtkCellData *inCd, vtkIdType cellId, vtkCellData *outCd,
- int insideOut) VTK_OVERRIDE;
+ int insideOut) override;
/**
* The topological dimension of the cell. (Satisfies vtkCell API.)
*/
- int GetCellDimension() VTK_OVERRIDE {return 3;}
+ int GetCellDimension() override {return 3;}
//@{
/**
@@ -101,7 +101,7 @@ public:
protected:
vtkCell3D();
- ~vtkCell3D() VTK_OVERRIDE;
+ ~vtkCell3D() override;
vtkOrderedTriangulator *Triangulator;
double MergeTolerance;
diff --git a/Common/DataModel/vtkCellArray.h b/Common/DataModel/vtkCellArray.h
index 7a97a91a671b6130b1ec866b8f0adef80d38e20c..7b7ad82033f09fb03e7854203f039c330a16da73 100644
--- a/Common/DataModel/vtkCellArray.h
+++ b/Common/DataModel/vtkCellArray.h
@@ -45,7 +45,7 @@ class VTKCOMMONDATAMODEL_EXPORT vtkCellArray : public vtkObject
{
public:
vtkTypeMacro(vtkCellArray,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Instantiate cell array (connectivity list).
@@ -281,7 +281,7 @@ public:
protected:
vtkCellArray();
- ~vtkCellArray() VTK_OVERRIDE;
+ ~vtkCellArray() override;
vtkIdType NumberOfCells;
vtkIdType InsertLocation; //keep track of current insertion point
diff --git a/Common/DataModel/vtkCellData.h b/Common/DataModel/vtkCellData.h
index db8c9b96f19000d7e50d055f3e9ab99be94177a9..97a898f76cf9536aecf90172fdb4313a34f12f09 100644
--- a/Common/DataModel/vtkCellData.h
+++ b/Common/DataModel/vtkCellData.h
@@ -35,11 +35,11 @@ public:
static vtkCellData *New();
vtkTypeMacro(vtkCellData,vtkDataSetAttributes);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkCellData() {} //make sure constructor and desctructor are protected
- ~vtkCellData() VTK_OVERRIDE {}
+ ~vtkCellData() override {}
private:
vtkCellData(const vtkCellData&) VTK_DELETE_FUNCTION;
diff --git a/Common/DataModel/vtkCellIterator.h b/Common/DataModel/vtkCellIterator.h
index 02277f968a6390f3065e84827abdfb8a5e379a4e..a05b532b1749548b8bd39141fd655c835968fc36 100644
--- a/Common/DataModel/vtkCellIterator.h
+++ b/Common/DataModel/vtkCellIterator.h
@@ -77,7 +77,7 @@ class vtkPoints;
class VTKCOMMONDATAMODEL_EXPORT vtkCellIterator : public vtkObject
{
public:
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
vtkAbstractTypeMacro(vtkCellIterator, vtkObject)
/**
@@ -152,7 +152,7 @@ public:
protected:
vtkCellIterator();
- ~vtkCellIterator() VTK_OVERRIDE;
+ ~vtkCellIterator() override;
/**
* Update internal state to point to the first cell.
diff --git a/Common/DataModel/vtkCellLinks.h b/Common/DataModel/vtkCellLinks.h
index 5486a2d746958e33486d6ef4334d54aed1859cbe..01412b9363eec40328a76dfa65d2b72abc9002a5 100644
--- a/Common/DataModel/vtkCellLinks.h
+++ b/Common/DataModel/vtkCellLinks.h
@@ -57,14 +57,14 @@ public:
*/
static vtkCellLinks *New();
vtkTypeMacro(vtkCellLinks,vtkAbstractCellLinks);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
* Build the link list array. All subclasses of vtkAbstractCellLinks
* must support this method.
*/
- void BuildLinks(vtkDataSet *data) VTK_OVERRIDE;
+ void BuildLinks(vtkDataSet *data) override;
/**
* Build the link list array with a provided connectivity array.
@@ -163,7 +163,7 @@ public:
protected:
vtkCellLinks():Array(nullptr),Size(0),MaxId(-1),Extend(1000) {}
- ~vtkCellLinks() VTK_OVERRIDE;
+ ~vtkCellLinks() override;
/**
* Increment the count of the number of cells using the point.
diff --git a/Common/DataModel/vtkCellLocator.h b/Common/DataModel/vtkCellLocator.h
index 73f4679adf705fdc8029b8dcb0bd045c0f5ec172..dde1354332874c5dd7a29f9ac1a10d0a3ede450b 100644
--- a/Common/DataModel/vtkCellLocator.h
+++ b/Common/DataModel/vtkCellLocator.h
@@ -47,7 +47,7 @@ class VTKCOMMONDATAMODEL_EXPORT vtkCellLocator : public vtkAbstractCellLocator
{
public:
vtkTypeMacro(vtkCellLocator,vtkAbstractCellLocator);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct with automatic computation of divisions, averaging
@@ -77,7 +77,7 @@ public:
int IntersectWithLine(double a0[3], double a1[3], double tol,
double& t, double x[3], double pcoords[3],
int &subId, vtkIdType &cellId,
- vtkGenericCell *cell) VTK_OVERRIDE;
+ vtkGenericCell *cell) override;
/**
* Return the closest point and the cell which is closest to the point x.
@@ -93,7 +93,7 @@ public:
void FindClosestPoint(
double x[3], double closestPoint[3],
vtkGenericCell *cell, vtkIdType &cellId,
- int &subId, double& dist2) VTK_OVERRIDE;
+ int &subId, double& dist2) override;
/**
* Return the closest point within a specified radius and the cell which is
@@ -115,7 +115,7 @@ public:
vtkIdType FindClosestPointWithinRadius(
double x[3], double radius, double closestPoint[3],
vtkGenericCell *cell, vtkIdType &cellId,
- int &subId, double& dist2, int &inside) VTK_OVERRIDE;
+ int &subId, double& dist2, int &inside) override;
/**
* Get the cells in a particular bucket.
@@ -135,14 +135,14 @@ public:
*/
vtkIdType FindCell(
double x[3], double tol2, vtkGenericCell *GenCell,
- double pcoords[3], double *weights) VTK_OVERRIDE;
+ double pcoords[3], double *weights) override;
/**
* Return a list of unique cell ids inside of a given bounding box. The
* user must provide the vtkIdList to populate. This method returns data
* only after the locator has been built.
*/
- void FindCellsWithinBounds(double *bbox, vtkIdList *cells) VTK_OVERRIDE;
+ void FindCellsWithinBounds(double *bbox, vtkIdList *cells) override;
/**
* Given a finite line defined by the two points (p1,p2), return the list
@@ -152,23 +152,23 @@ public:
* built.
*/
void FindCellsAlongLine(double p1[3], double p2[3],
- double tolerance, vtkIdList *cells) VTK_OVERRIDE;
+ double tolerance, vtkIdList *cells) override;
//@{
/**
* Satisfy vtkLocator abstract interface.
*/
- void FreeSearchStructure() VTK_OVERRIDE;
- void BuildLocator() VTK_OVERRIDE;
+ void FreeSearchStructure() override;
+ void BuildLocator() override;
virtual void BuildLocatorIfNeeded();
virtual void ForceBuildLocator();
virtual void BuildLocatorInternal();
- void GenerateRepresentation(int level, vtkPolyData *pd) VTK_OVERRIDE;
+ void GenerateRepresentation(int level, vtkPolyData *pd) override;
//@}
protected:
vtkCellLocator();
- ~vtkCellLocator() VTK_OVERRIDE;
+ ~vtkCellLocator() override;
void GetBucketNeighbors(int ijk[3], int ndivs, int level);
void GetOverlappingBuckets(double x[3], int ijk[3], double dist,
diff --git a/Common/DataModel/vtkCellTypes.h b/Common/DataModel/vtkCellTypes.h
index f5d61c1edb9a4e6fb125971ba550f6a77ea7d6c2..88e67e4362ab9b0be7283fef80384370ba50a22d 100644
--- a/Common/DataModel/vtkCellTypes.h
+++ b/Common/DataModel/vtkCellTypes.h
@@ -48,7 +48,7 @@ class VTKCOMMONDATAMODEL_EXPORT vtkCellTypes : public vtkObject
public:
static vtkCellTypes *New();
vtkTypeMacro(vtkCellTypes,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Allocate memory for this array. Delete old storage only if necessary.
@@ -148,7 +148,7 @@ public:
protected:
vtkCellTypes();
- ~vtkCellTypes() VTK_OVERRIDE;
+ ~vtkCellTypes() override;
vtkUnsignedCharArray *TypeArray; // pointer to types array
vtkIntArray *LocationArray; // pointer to array of offsets
diff --git a/Common/DataModel/vtkCompositeDataIterator.h b/Common/DataModel/vtkCompositeDataIterator.h
index 29952fdc98440dff68dc70d96e460f43998c2591..83c563e5c07989ce6d478678c19896f967acc66f 100644
--- a/Common/DataModel/vtkCompositeDataIterator.h
+++ b/Common/DataModel/vtkCompositeDataIterator.h
@@ -36,7 +36,7 @@ class VTKCOMMONDATAMODEL_EXPORT vtkCompositeDataIterator : public vtkObject
{
public:
vtkTypeMacro(vtkCompositeDataIterator, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -117,7 +117,7 @@ public:
protected:
vtkCompositeDataIterator();
- ~vtkCompositeDataIterator() VTK_OVERRIDE;
+ ~vtkCompositeDataIterator() override;
int SkipEmptyNodes;
int Reverse;
vtkCompositeDataSet* DataSet;
diff --git a/Common/DataModel/vtkCompositeDataSet.h b/Common/DataModel/vtkCompositeDataSet.h
index bb5c95477e77428c9c81ba20e98c0aa2736370b5..a6de1ff64c15ddc201cb3011b8d185c7f0fb8a21 100644
--- a/Common/DataModel/vtkCompositeDataSet.h
+++ b/Common/DataModel/vtkCompositeDataSet.h
@@ -46,7 +46,7 @@ class VTKCOMMONDATAMODEL_EXPORT vtkCompositeDataSet : public vtkDataObject
{
public:
vtkTypeMacro(vtkCompositeDataSet, vtkDataObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Return a new iterator (the iterator has to be deleted by user).
@@ -57,7 +57,7 @@ public:
* Return class name of data type (see vtkType.h for
* definitions).
*/
- int GetDataObjectType() VTK_OVERRIDE {return VTK_COMPOSITE_DATA_SET;}
+ int GetDataObjectType() override {return VTK_COMPOSITE_DATA_SET;}
/**
* Copies the tree structure from the input. All pointers to non-composite
@@ -87,7 +87,7 @@ public:
* Return the actual size of the data in kibibytes (1024 bytes). This number
* is valid only after the pipeline has updated.
*/
- unsigned long GetActualMemorySize() VTK_OVERRIDE;
+ unsigned long GetActualMemorySize() override;
//@{
/**
@@ -100,14 +100,14 @@ public:
/**
* Restore data object to initial state,
*/
- void Initialize() VTK_OVERRIDE;
+ void Initialize() override;
//@{
/**
* Shallow and Deep copy.
*/
- void ShallowCopy(vtkDataObject *src) VTK_OVERRIDE;
- void DeepCopy(vtkDataObject *src) VTK_OVERRIDE;
+ void ShallowCopy(vtkDataObject *src) override;
+ void DeepCopy(vtkDataObject *src) override;
//@}
/**
@@ -133,7 +133,7 @@ public:
protected:
vtkCompositeDataSet();
- ~vtkCompositeDataSet() VTK_OVERRIDE;
+ ~vtkCompositeDataSet() override;
private:
vtkCompositeDataSet(const vtkCompositeDataSet&) VTK_DELETE_FUNCTION;
diff --git a/Common/DataModel/vtkCone.h b/Common/DataModel/vtkCone.h
index 9c9d17ca6bd7bce41bb5c375920f3c09eb950b92..d45e376c43deb31925765502cce547e83490bcf5 100644
--- a/Common/DataModel/vtkCone.h
+++ b/Common/DataModel/vtkCone.h
@@ -43,20 +43,20 @@ public:
static vtkCone *New();
vtkTypeMacro(vtkCone,vtkImplicitFunction);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
* Evaluate cone equation.
*/
using vtkImplicitFunction::EvaluateFunction;
- double EvaluateFunction(double x[3]) VTK_OVERRIDE;
+ double EvaluateFunction(double x[3]) override;
//@}
/**
* Evaluate cone normal.
*/
- void EvaluateGradient(double x[3], double g[3]) VTK_OVERRIDE;
+ void EvaluateGradient(double x[3], double g[3]) override;
//@{
/**
@@ -68,7 +68,7 @@ public:
protected:
vtkCone();
- ~vtkCone() VTK_OVERRIDE {}
+ ~vtkCone() override {}
double Angle;
diff --git a/Common/DataModel/vtkConvexPointSet.h b/Common/DataModel/vtkConvexPointSet.h
index 738e5ddbc667f2483f602735cfc1d1f7691b782b..ce569ad03e79a16952754c7fd8d7860c2c64d26f 100644
--- a/Common/DataModel/vtkConvexPointSet.h
+++ b/Common/DataModel/vtkConvexPointSet.h
@@ -44,7 +44,7 @@ class VTKCOMMONDATAMODEL_EXPORT vtkConvexPointSet : public vtkCell3D
public:
static vtkConvexPointSet *New();
vtkTypeMacro(vtkConvexPointSet,vtkCell3D);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* See vtkCell3D API for description of this method.
@@ -54,20 +54,20 @@ public:
/**
* See vtkCell3D API for description of these methods.
*/
- void GetEdgePoints(int vtkNotUsed(edgeId), int* &vtkNotUsed(pts)) VTK_OVERRIDE {}
- void GetFacePoints(int vtkNotUsed(faceId), int* &vtkNotUsed(pts)) VTK_OVERRIDE {}
- double *GetParametricCoords() VTK_OVERRIDE;
+ void GetEdgePoints(int vtkNotUsed(edgeId), int* &vtkNotUsed(pts)) override {}
+ void GetFacePoints(int vtkNotUsed(faceId), int* &vtkNotUsed(pts)) override {}
+ double *GetParametricCoords() override;
/**
* See the vtkCell API for descriptions of these methods.
*/
- int GetCellType() VTK_OVERRIDE {return VTK_CONVEX_POINT_SET;}
+ int GetCellType() override {return VTK_CONVEX_POINT_SET;}
/**
* This cell requires that it be initialized prior to access.
*/
- int RequiresInitialization() VTK_OVERRIDE {return 1;}
- void Initialize() VTK_OVERRIDE;
+ int RequiresInitialization() override {return 1;}
+ void Initialize() override;
//@{
/**
@@ -80,10 +80,10 @@ public:
* faces. (Note: GetNumberOfEdges() currently returns 0 because it is a
* rarely used method and hard to implement. It can be changed in the future.
*/
- int GetNumberOfEdges() VTK_OVERRIDE {return 0;}
- vtkCell *GetEdge(int) VTK_OVERRIDE {return nullptr;}
- int GetNumberOfFaces() VTK_OVERRIDE;
- vtkCell *GetFace(int faceId) VTK_OVERRIDE;
+ int GetNumberOfEdges() override {return 0;}
+ vtkCell *GetEdge(int) override {return nullptr;}
+ int GetNumberOfFaces() override;
+ vtkCell *GetFace(int faceId) override;
//@}
/**
@@ -94,7 +94,7 @@ public:
vtkIncrementalPointLocator *locator, vtkCellArray *verts,
vtkCellArray *lines, vtkCellArray *polys,
vtkPointData *inPd, vtkPointData *outPd,
- vtkCellData *inCd, vtkIdType cellId, vtkCellData *outCd) VTK_OVERRIDE;
+ vtkCellData *inCd, vtkIdType cellId, vtkCellData *outCd) override;
/**
* Satisfy the vtkCell API. This method contours by triangulating the
@@ -105,7 +105,7 @@ public:
vtkIncrementalPointLocator *locator, vtkCellArray *connectivity,
vtkPointData *inPd, vtkPointData *outPd,
vtkCellData *inCd, vtkIdType cellId, vtkCellData *outCd,
- int insideOut) VTK_OVERRIDE;
+ int insideOut) override;
/**
* Satisfy the vtkCell API. This method determines the subId, pcoords,
@@ -114,63 +114,63 @@ public:
*/
int EvaluatePosition(double x[3], double* closestPoint,
int& subId, double pcoords[3],
- double& dist2, double *weights) VTK_OVERRIDE;
+ double& dist2, double *weights) override;
/**
* The inverse of EvaluatePosition.
*/
void EvaluateLocation(int& subId, double pcoords[3], double x[3],
- double *weights) VTK_OVERRIDE;
+ double *weights) override;
/**
* Triangulates the cells and then intersects them to determine the
* intersection point.
*/
int IntersectWithLine(double p1[3], double p2[3], double tol, double& t,
- double x[3], double pcoords[3], int& subId) VTK_OVERRIDE;
+ double x[3], double pcoords[3], int& subId) override;
/**
* Triangulate using methods of vtkOrderedTriangulator.
*/
- int Triangulate(int index, vtkIdList *ptIds, vtkPoints *pts) VTK_OVERRIDE;
+ int Triangulate(int index, vtkIdList *ptIds, vtkPoints *pts) override;
/**
* Computes derivatives by triangulating and from subId and pcoords,
* evaluating derivatives on the resulting tetrahedron.
*/
void Derivatives(int subId, double pcoords[3], double *values,
- int dim, double *derivs) VTK_OVERRIDE;
+ int dim, double *derivs) override;
/**
* Returns the set of points forming a face of the triangulation of these
* points that are on the boundary of the cell that are closest
* parametrically to the point specified.
*/
- int CellBoundary(int subId, double pcoords[3], vtkIdList *pts) VTK_OVERRIDE;
+ int CellBoundary(int subId, double pcoords[3], vtkIdList *pts) override;
/**
* Return the center of the cell in parametric coordinates.
*/
- int GetParametricCenter(double pcoords[3]) VTK_OVERRIDE;
+ int GetParametricCenter(double pcoords[3]) override;
/**
* A convex point set is triangulated prior to any operations on it so
* it is not a primary cell, it is a composite cell.
*/
- int IsPrimaryCell() VTK_OVERRIDE {return 0;}
+ int IsPrimaryCell() override {return 0;}
//@{
/**
* Compute the interpolation functions/derivatives
* (aka shape functions/derivatives)
*/
- void InterpolateFunctions(double pcoords[3], double *sf) VTK_OVERRIDE;
- void InterpolateDerivs(double pcoords[3], double *derivs) VTK_OVERRIDE;
+ void InterpolateFunctions(double pcoords[3], double *sf) override;
+ void InterpolateDerivs(double pcoords[3], double *derivs) override;
//@}
protected:
vtkConvexPointSet();
- ~vtkConvexPointSet() VTK_OVERRIDE;
+ ~vtkConvexPointSet() override;
vtkTetra *Tetra;
vtkIdList *TetraIds;
diff --git a/Common/DataModel/vtkCubicLine.h b/Common/DataModel/vtkCubicLine.h
index 63c1f869d030a5d30dad7fbc496553d97ad3c5a4..a5d005c68426908ee75e0db9e0dce19842370127 100644
--- a/Common/DataModel/vtkCubicLine.h
+++ b/Common/DataModel/vtkCubicLine.h
@@ -44,40 +44,40 @@ class VTKCOMMONDATAMODEL_EXPORT vtkCubicLine : public vtkNonLinearCell
public:
static vtkCubicLine *New();
vtkTypeMacro(vtkCubicLine,vtkNonLinearCell);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
* See the vtkCell API for descriptions of these methods.
*/
- int GetCellType() VTK_OVERRIDE {return VTK_CUBIC_LINE;};
- int GetCellDimension() VTK_OVERRIDE {return 1;};
- int GetNumberOfEdges() VTK_OVERRIDE {return 0;};
- int GetNumberOfFaces() VTK_OVERRIDE {return 0;};
- vtkCell *GetEdge(int) VTK_OVERRIDE {return nullptr;};
- vtkCell *GetFace(int) VTK_OVERRIDE {return nullptr;};
- int CellBoundary(int subId, double pcoords[3], vtkIdList *pts) VTK_OVERRIDE;
+ int GetCellType() override {return VTK_CUBIC_LINE;};
+ int GetCellDimension() override {return 1;};
+ int GetNumberOfEdges() override {return 0;};
+ int GetNumberOfFaces() override {return 0;};
+ vtkCell *GetEdge(int) override {return nullptr;};
+ vtkCell *GetFace(int) override {return nullptr;};
+ int CellBoundary(int subId, double pcoords[3], vtkIdList *pts) override;
void Contour(double value, vtkDataArray *cellScalars,
vtkIncrementalPointLocator *locator, vtkCellArray *verts,
vtkCellArray *lines, vtkCellArray *polys,
vtkPointData *inPd, vtkPointData *outPd,
- vtkCellData *inCd, vtkIdType cellId, vtkCellData *outCd) VTK_OVERRIDE;
+ vtkCellData *inCd, vtkIdType cellId, vtkCellData *outCd) override;
int EvaluatePosition(double x[3], double* closestPoint,
int& subId, double pcoords[3],
- double& dist2, double *weights) VTK_OVERRIDE;
+ double& dist2, double *weights) override;
void EvaluateLocation(int& subId, double pcoords[3], double x[3],
- double *weights) VTK_OVERRIDE;
- int Triangulate(int index, vtkIdList *ptIds, vtkPoints *pts) VTK_OVERRIDE;
+ double *weights) override;
+ int Triangulate(int index, vtkIdList *ptIds, vtkPoints *pts) override;
void Derivatives(int subId, double pcoords[3], double *values,
- int dim, double *derivs) VTK_OVERRIDE;
- double *GetParametricCoords() VTK_OVERRIDE;
+ int dim, double *derivs) override;
+ double *GetParametricCoords() override;
//@}
/**
* Return the distance of the parametric coordinate provided to the
* cell. If inside the cell, a distance of zero is returned.
*/
- double GetParametricDistance(double pcoords[3]) VTK_OVERRIDE;
+ double GetParametricDistance(double pcoords[3]) override;
/**
* Clip this line using scalar value provided. Like contouring, except
@@ -87,19 +87,19 @@ public:
vtkIncrementalPointLocator *locator, vtkCellArray *lines,
vtkPointData *inPd, vtkPointData *outPd,
vtkCellData *inCd, vtkIdType cellId, vtkCellData *outCd,
- int insideOut) VTK_OVERRIDE;
+ int insideOut) override;
/**
* Return the center of the triangle in parametric coordinates.
*/
- int GetParametricCenter(double pcoords[3]) VTK_OVERRIDE;
+ int GetParametricCenter(double pcoords[3]) override;
/**
* Line-line intersection. Intersection has to occur within [0,1] parametric
* coordinates and with specified tolerance.
*/
int IntersectWithLine(double p1[3], double p2[3], double tol, double& t,
- double x[3], double pcoords[3], int& subId) VTK_OVERRIDE;
+ double x[3], double pcoords[3], int& subId) override;
@@ -116,11 +116,11 @@ public:
* Compute the interpolation functions/derivatives
* (aka shape functions/derivatives)
*/
- void InterpolateFunctions(double pcoords[3], double weights[4]) VTK_OVERRIDE
+ void InterpolateFunctions(double pcoords[3], double weights[4]) override
{
vtkCubicLine::InterpolationFunctions(pcoords,weights);
}
- void InterpolateDerivs(double pcoords[3], double derivs[4]) VTK_OVERRIDE
+ void InterpolateDerivs(double pcoords[3], double derivs[4]) override
{
vtkCubicLine::InterpolationDerivs(pcoords,derivs);
}
@@ -128,7 +128,7 @@ public:
protected:
vtkCubicLine();
- ~vtkCubicLine() VTK_OVERRIDE;
+ ~vtkCubicLine() override;
vtkLine *Line;
vtkDoubleArray *Scalars; //used to avoid New/Delete in contouring/clipping
diff --git a/Common/DataModel/vtkCylinder.h b/Common/DataModel/vtkCylinder.h
index dc660941a54db69592616178961e70accd31ac63..93db331bb1a5882d91a510963db4133dd4df783c 100644
--- a/Common/DataModel/vtkCylinder.h
+++ b/Common/DataModel/vtkCylinder.h
@@ -42,7 +42,7 @@ class VTKCOMMONDATAMODEL_EXPORT vtkCylinder : public vtkImplicitFunction
{
public:
vtkTypeMacro(vtkCylinder,vtkImplicitFunction);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct cylinder radius of 0.5; centered at origin with axis
@@ -55,13 +55,13 @@ public:
* Evaluate cylinder equation F(r) = r^2 - Radius^2.
*/
using vtkImplicitFunction::EvaluateFunction;
- double EvaluateFunction(double x[3]) VTK_OVERRIDE;
+ double EvaluateFunction(double x[3]) override;
//@}
/**
* Evaluate cylinder function gradient.
*/
- void EvaluateGradient(double x[3], double g[3]) VTK_OVERRIDE;
+ void EvaluateGradient(double x[3], double g[3]) override;
//@{
/**
@@ -92,7 +92,7 @@ public:
protected:
vtkCylinder();
- ~vtkCylinder() VTK_OVERRIDE {}
+ ~vtkCylinder() override {}
double Radius;
double Center[3];
diff --git a/Common/DataModel/vtkDataObject.h b/Common/DataModel/vtkDataObject.h
index 489618c9588d47ebd2010628506cb67e0dc138c4..513080ca3cfd1fd854e164d9f85604f20a7ca942 100644
--- a/Common/DataModel/vtkDataObject.h
+++ b/Common/DataModel/vtkDataObject.h
@@ -61,7 +61,7 @@ public:
static vtkDataObject *New();
vtkTypeMacro(vtkDataObject,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -75,7 +75,7 @@ public:
* Data objects are composite objects and need to check each part for MTime.
* The information object also needs to be considered.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
/**
* Restore data object to initial state,
@@ -404,7 +404,7 @@ public:
protected:
vtkDataObject();
- ~vtkDataObject() VTK_OVERRIDE;
+ ~vtkDataObject() override;
// General field data associated with data object
vtkFieldData *FieldData;
diff --git a/Common/DataModel/vtkDataObjectCollection.h b/Common/DataModel/vtkDataObjectCollection.h
index 5a783b863e4dc8b25725ad66f9510454e009c8b3..6d66d9b05e425d94e0e1eef54e1c5a8706f1fd2d 100644
--- a/Common/DataModel/vtkDataObjectCollection.h
+++ b/Common/DataModel/vtkDataObjectCollection.h
@@ -69,7 +69,7 @@ public:
protected:
vtkDataObjectCollection() {}
- ~vtkDataObjectCollection() VTK_OVERRIDE {}
+ ~vtkDataObjectCollection() override {}
private:
diff --git a/Common/DataModel/vtkDataObjectTree.h b/Common/DataModel/vtkDataObjectTree.h
index 5e34dd20e7264ff29641e5fb46b19d403fafac19..0ff7fd787d3226bbce21d90eb09fc7463a7af660 100644
--- a/Common/DataModel/vtkDataObjectTree.h
+++ b/Common/DataModel/vtkDataObjectTree.h
@@ -47,7 +47,7 @@ class VTKCOMMONDATAMODEL_EXPORT vtkDataObjectTree : public vtkCompositeDataSet
{
public:
vtkTypeMacro(vtkDataObjectTree, vtkCompositeDataSet);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Return a new iterator (the iterator has to be deleted by user).
@@ -61,14 +61,14 @@ public:
* and NewIterator when you have a pointer to a vtkCompositeDataSet;
* NewIterator is inherited and calls NewTreeIterator internally.
*/
- VTK_NEWINSTANCE vtkCompositeDataIterator* NewIterator() VTK_OVERRIDE;
+ VTK_NEWINSTANCE vtkCompositeDataIterator* NewIterator() override;
/**
* Copies the tree structure from the input. All pointers to non-composite
* data objects are initialized to nullptr. This also shallow copies the meta data
* associated with all the nodes.
*/
- void CopyStructure(vtkCompositeDataSet* input) VTK_OVERRIDE;
+ void CopyStructure(vtkCompositeDataSet* input) override;
/**
* Sets the data set at the location pointed by the iterator.
@@ -77,7 +77,7 @@ public:
* CopyStructure).
*/
void SetDataSet(vtkCompositeDataIterator* iter,
- vtkDataObject* dataObj) VTK_OVERRIDE;
+ vtkDataObject* dataObj) override;
/**
* Sets the data at the location provided by a vtkDataObjectTreeIterator
@@ -90,7 +90,7 @@ public:
* be an iterator for composite dataset with similar structure (achieved by
* using CopyStructure).
*/
- vtkDataObject* GetDataSet(vtkCompositeDataIterator* iter) VTK_OVERRIDE;
+ vtkDataObject* GetDataSet(vtkCompositeDataIterator* iter) override;
/**
* Returns the meta-data associated with the position pointed by the iterator.
@@ -114,19 +114,19 @@ public:
* Return the actual size of the data in kibibytes (1024 bytes). This number
* is valid only after the pipeline has updated.
*/
- unsigned long GetActualMemorySize() VTK_OVERRIDE;
+ unsigned long GetActualMemorySize() override;
/**
* Restore data object to initial state,
*/
- void Initialize() VTK_OVERRIDE;
+ void Initialize() override;
//@{
/**
* Shallow and Deep copy.
*/
- void ShallowCopy(vtkDataObject *src) VTK_OVERRIDE;
- void DeepCopy(vtkDataObject *src) VTK_OVERRIDE;
+ void ShallowCopy(vtkDataObject *src) override;
+ void DeepCopy(vtkDataObject *src) override;
//@}
/**
@@ -134,7 +134,7 @@ public:
* iterate over all blocks and call GetNumberOfPoints() so it
* might be expansive.
*/
- vtkIdType GetNumberOfPoints() VTK_OVERRIDE;
+ vtkIdType GetNumberOfPoints() override;
//@{
/**
@@ -146,7 +146,7 @@ public:
protected:
vtkDataObjectTree();
- ~vtkDataObjectTree() VTK_OVERRIDE;
+ ~vtkDataObjectTree() override;
/**
* Set the number of children.
diff --git a/Common/DataModel/vtkDataObjectTreeIterator.h b/Common/DataModel/vtkDataObjectTreeIterator.h
index c7c83ff35195a552d5a11a89f833e4c17cfc70bf..f7c1e81a88c4573868c484d1fb49dc00e74bbd79 100644
--- a/Common/DataModel/vtkDataObjectTreeIterator.h
+++ b/Common/DataModel/vtkDataObjectTreeIterator.h
@@ -38,17 +38,17 @@ class VTKCOMMONDATAMODEL_EXPORT vtkDataObjectTreeIterator : public vtkCompositeD
public:
static vtkDataObjectTreeIterator* New();
vtkTypeMacro(vtkDataObjectTreeIterator, vtkCompositeDataIterator);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Move the iterator to the beginning of the collection.
*/
- void GoToFirstItem() VTK_OVERRIDE;
+ void GoToFirstItem() override;
/**
* Move the iterator to the next item in the collection.
*/
- void GoToNextItem() VTK_OVERRIDE;
+ void GoToNextItem() override;
/**
* Test whether the iterator is finished with the traversal.
@@ -56,12 +56,12 @@ public:
* It is safe to call any of the GetCurrent...() methods only when
* IsDoneWithTraversal() returns 0.
*/
- int IsDoneWithTraversal() VTK_OVERRIDE;
+ int IsDoneWithTraversal() override;
/**
* Returns the current item. Valid only when IsDoneWithTraversal() returns 0.
*/
- vtkDataObject* GetCurrentDataObject() VTK_OVERRIDE;
+ vtkDataObject* GetCurrentDataObject() override;
/**
* Returns the meta-data associated with the current item.
@@ -69,20 +69,20 @@ public:
* is not necessarily stored on the current object. So modifying the information
* is forbidden.
*/
- vtkInformation* GetCurrentMetaData() VTK_OVERRIDE;
+ vtkInformation* GetCurrentMetaData() override;
/**
* Returns if the a meta-data information object is present for the current
* item. Return 1 on success, 0 otherwise.
*/
- int HasCurrentMetaData() VTK_OVERRIDE;
+ int HasCurrentMetaData() override;
/**
* Flat index is an index obtained by traversing the tree in preorder.
* This can be used to uniquely identify nodes in the tree.
* Not valid if IsDoneWithTraversal() returns true.
*/
- unsigned int GetCurrentFlatIndex() VTK_OVERRIDE;
+ unsigned int GetCurrentFlatIndex() override;
//@{
/**
@@ -113,7 +113,7 @@ public:
protected:
vtkDataObjectTreeIterator();
- ~vtkDataObjectTreeIterator() VTK_OVERRIDE;
+ ~vtkDataObjectTreeIterator() override;
// Takes the current location to the next dataset. This traverses the tree in
// preorder fashion.
diff --git a/Common/DataModel/vtkDataObjectTypes.h b/Common/DataModel/vtkDataObjectTypes.h
index 339d919ff99ed03acf35a326b875b364d44b9cbb..db67cb5b687da00bd209ab5f26b08d14291f769c 100644
--- a/Common/DataModel/vtkDataObjectTypes.h
+++ b/Common/DataModel/vtkDataObjectTypes.h
@@ -38,7 +38,7 @@ public:
static vtkDataObjectTypes *New();
vtkTypeMacro(vtkDataObjectTypes,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Given an int (as defined in vtkType.h) identifier for a class
@@ -64,7 +64,7 @@ public:
protected:
vtkDataObjectTypes() {}
- ~vtkDataObjectTypes() VTK_OVERRIDE {}
+ ~vtkDataObjectTypes() override {}
/**
* Method used to validate data object types, for testing purposes
diff --git a/Common/DataModel/vtkDataSet.h b/Common/DataModel/vtkDataSet.h
index 325bfefc98e3619add3b0556ce96b1338422ebfb..2b362dd6f429b6a4fe1500990dad44adbdb3d72c 100644
--- a/Common/DataModel/vtkDataSet.h
+++ b/Common/DataModel/vtkDataSet.h
@@ -57,7 +57,7 @@ class VTKCOMMONDATAMODEL_EXPORT vtkDataSet : public vtkDataObject
{
public:
vtkTypeMacro(vtkDataSet,vtkDataObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Copy the geometric and topological structure of an object. Note that
@@ -240,7 +240,7 @@ public:
* Datasets are composite objects and need to check each part for MTime
* THIS METHOD IS THREAD SAFE
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
/**
* Return a pointer to this dataset's cell data.
@@ -305,7 +305,7 @@ public:
* Restore data object to initial state.
* THIS METHOD IS NOT THREAD SAFE.
*/
- void Initialize() VTK_OVERRIDE;
+ void Initialize() override;
/**
* Convenience method to get the range of the first component (and only
@@ -345,19 +345,19 @@ public:
* arrays, etc. are not included in the return value). THIS METHOD
* IS THREAD SAFE.
*/
- unsigned long GetActualMemorySize() VTK_OVERRIDE;
+ unsigned long GetActualMemorySize() override;
/**
* Return the type of data object.
*/
- int GetDataObjectType() VTK_OVERRIDE {return VTK_DATA_SET;}
+ int GetDataObjectType() override {return VTK_DATA_SET;}
//@{
/**
* Shallow and Deep copy.
*/
- void ShallowCopy(vtkDataObject *src) VTK_OVERRIDE;
- void DeepCopy(vtkDataObject *src) VTK_OVERRIDE;
+ void ShallowCopy(vtkDataObject *src) override;
+ void DeepCopy(vtkDataObject *src) override;
//@}
enum FieldDataType
@@ -404,12 +404,12 @@ public:
* in addition to the case of FIELD, which will return the field data
* for any vtkDataObject subclass.
*/
- vtkFieldData* GetAttributesAsFieldData(int type) VTK_OVERRIDE;
+ vtkFieldData* GetAttributesAsFieldData(int type) override;
/**
* Get the number of elements for a specific attribute type (POINT, CELL, etc.).
*/
- vtkIdType GetNumberOfElements(int type) VTK_OVERRIDE;
+ vtkIdType GetNumberOfElements(int type) override;
/**
* Returns 1 if there are any ghost cells
@@ -473,7 +473,7 @@ public:
protected:
// Constructor with default bounds (0,1, 0,1, 0,1).
vtkDataSet();
- ~vtkDataSet() VTK_OVERRIDE;
+ ~vtkDataSet() override;
/**
* Compute the range of the scalars and cache it into ScalarRange
diff --git a/Common/DataModel/vtkDataSetAttributes.h b/Common/DataModel/vtkDataSetAttributes.h
index ded7bce71e2cf47cd2ea28418062607d08b37db3..9823e7ce393cad7cdac28d4dc5d8f6c5abed27cf 100644
--- a/Common/DataModel/vtkDataSetAttributes.h
+++ b/Common/DataModel/vtkDataSetAttributes.h
@@ -58,13 +58,13 @@ public:
static vtkDataSetAttributes *New();
vtkTypeMacro(vtkDataSetAttributes,vtkFieldData);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Initialize all of the object's data to nullptr
* Also, clear the copy flags.
*/
- void Initialize() VTK_OVERRIDE;
+ void Initialize() override;
/**
* Attributes have a chance to bring themselves up to date; right
@@ -79,13 +79,13 @@ public:
* copy from input data).
* Ignores the copy flags but preserves them in the output.
*/
- void DeepCopy(vtkFieldData *pd) VTK_OVERRIDE;
+ void DeepCopy(vtkFieldData *pd) override;
/**
* Shallow copy of data (i.e., use reference counting).
* Ignores the copy flags but preserves them in the output.
*/
- void ShallowCopy(vtkFieldData *pd) VTK_OVERRIDE;
+ void ShallowCopy(vtkFieldData *pd) override;
// -- attribute types -----------------------------------------------------
@@ -296,7 +296,7 @@ public:
* Remove an array (with the given name) from the list of arrays.
*/
using vtkFieldData::RemoveArray;
- void RemoveArray(int index) VTK_OVERRIDE;
+ void RemoveArray(int index) override;
//@}
@@ -384,10 +384,10 @@ public:
vtkBooleanMacro(CopyPedigreeIds, int);
/// @copydoc vtkDataSetAttributes::SetCopyAttribute()
- void CopyAllOn(int ctype=ALLCOPY) VTK_OVERRIDE;
+ void CopyAllOn(int ctype=ALLCOPY) override;
/// @copydoc vtkDataSetAttributes::SetCopyAttribute()
- void CopyAllOff(int ctype=ALLCOPY) VTK_OVERRIDE;
+ void CopyAllOff(int ctype=ALLCOPY) override;
// -- passthrough operations ----------------------------------------------
@@ -400,7 +400,7 @@ public:
* that field (on or off), obey the flag, ignore (3) 3) obey
* CopyAllOn/Off
*/
- void PassData(vtkFieldData* fd) VTK_OVERRIDE;
+ void PassData(vtkFieldData* fd) override;
// -- copytuple operations ------------------------------------------------
@@ -595,7 +595,7 @@ public:
protected:
vtkDataSetAttributes();
- ~vtkDataSetAttributes() VTK_OVERRIDE;
+ ~vtkDataSetAttributes() override;
void InternalCopyAllocate(vtkDataSetAttributes* pd,
int ctype,
@@ -612,7 +612,7 @@ protected:
/**
* Initialize all of the object's data to nullptr
*/
- void InitializeFields() VTK_OVERRIDE;
+ void InitializeFields() override;
int AttributeIndices[NUM_ATTRIBUTES]; //index to attribute array in field data
int CopyAttributeFlags[ALLCOPY][NUM_ATTRIBUTES]; //copy flag for attribute data
diff --git a/Common/DataModel/vtkDataSetCellIterator.h b/Common/DataModel/vtkDataSetCellIterator.h
index 3c0ddfcb0c73f9af3f7d2e5aa7bb0d2550e65e50..0a2f1071b18a751f94e8b2b475a5abc0bcb0fc56 100644
--- a/Common/DataModel/vtkDataSetCellIterator.h
+++ b/Common/DataModel/vtkDataSetCellIterator.h
@@ -32,20 +32,20 @@ class VTKCOMMONDATAMODEL_EXPORT vtkDataSetCellIterator: public vtkCellIterator
public:
static vtkDataSetCellIterator *New();
vtkTypeMacro(vtkDataSetCellIterator, vtkCellIterator)
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
- bool IsDoneWithTraversal() VTK_OVERRIDE;
- vtkIdType GetCellId() VTK_OVERRIDE;
+ bool IsDoneWithTraversal() override;
+ vtkIdType GetCellId() override;
protected:
vtkDataSetCellIterator();
- ~vtkDataSetCellIterator() VTK_OVERRIDE;
+ ~vtkDataSetCellIterator() override;
- void ResetToFirstCell() VTK_OVERRIDE;
- void IncrementToNextCell() VTK_OVERRIDE;
- void FetchCellType() VTK_OVERRIDE;
- void FetchPointIds() VTK_OVERRIDE;
- void FetchPoints() VTK_OVERRIDE;
+ void ResetToFirstCell() override;
+ void IncrementToNextCell() override;
+ void FetchCellType() override;
+ void FetchPointIds() override;
+ void FetchPoints() override;
friend class vtkDataSet;
void SetDataSet(vtkDataSet *ds);
diff --git a/Common/DataModel/vtkDataSetCollection.h b/Common/DataModel/vtkDataSetCollection.h
index c1ed50efe0f6295f027617a38be42292bcb0c326..0371ef5f9c14787395c6debc3016d1d5c44346b3 100644
--- a/Common/DataModel/vtkDataSetCollection.h
+++ b/Common/DataModel/vtkDataSetCollection.h
@@ -71,7 +71,7 @@ public:
protected:
vtkDataSetCollection() {}
- ~vtkDataSetCollection() VTK_OVERRIDE {}
+ ~vtkDataSetCollection() override {}
private:
// hide the standard AddItem from the user and the compiler.
diff --git a/Common/DataModel/vtkDirectedAcyclicGraph.h b/Common/DataModel/vtkDirectedAcyclicGraph.h
index c6d35ef24b5bcbbbdb16e70ce684b73c547895d1..a1f9bde4ca8717dafed7a38355b571659a02f13c 100644
--- a/Common/DataModel/vtkDirectedAcyclicGraph.h
+++ b/Common/DataModel/vtkDirectedAcyclicGraph.h
@@ -56,12 +56,12 @@ class VTKCOMMONDATAMODEL_EXPORT vtkDirectedAcyclicGraph : public vtkDirectedGrap
public:
static vtkDirectedAcyclicGraph *New();
vtkTypeMacro(vtkDirectedAcyclicGraph, vtkDirectedGraph);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Return what type of dataset this is.
*/
- int GetDataObjectType() VTK_OVERRIDE {return VTK_DIRECTED_ACYCLIC_GRAPH;}
+ int GetDataObjectType() override {return VTK_DIRECTED_ACYCLIC_GRAPH;}
//@{
/**
@@ -73,13 +73,13 @@ public:
protected:
vtkDirectedAcyclicGraph();
- ~vtkDirectedAcyclicGraph() VTK_OVERRIDE;
+ ~vtkDirectedAcyclicGraph() override;
/**
* Check the storage, and accept it if it is a valid
* tree.
*/
- bool IsStructureValid(vtkGraph *g) VTK_OVERRIDE;
+ bool IsStructureValid(vtkGraph *g) override;
private:
vtkDirectedAcyclicGraph(const vtkDirectedAcyclicGraph&) VTK_DELETE_FUNCTION;
diff --git a/Common/DataModel/vtkDirectedGraph.h b/Common/DataModel/vtkDirectedGraph.h
index ad1e726030a3515e1a96b88a3d24a3a924050266..395182dda4e956a5dba6a71345f13964b36247ea 100644
--- a/Common/DataModel/vtkDirectedGraph.h
+++ b/Common/DataModel/vtkDirectedGraph.h
@@ -46,12 +46,12 @@ class VTKCOMMONDATAMODEL_EXPORT vtkDirectedGraph : public vtkGraph
public:
static vtkDirectedGraph *New();
vtkTypeMacro(vtkDirectedGraph, vtkGraph);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Return what type of dataset this is.
*/
- int GetDataObjectType() VTK_OVERRIDE {return VTK_DIRECTED_GRAPH;}
+ int GetDataObjectType() override {return VTK_DIRECTED_GRAPH;}
//@{
/**
@@ -66,11 +66,11 @@ public:
* undirected graph. This is public to allow
* the ToDirected/UndirectedGraph to work.
*/
- bool IsStructureValid(vtkGraph *g) VTK_OVERRIDE;
+ bool IsStructureValid(vtkGraph *g) override;
protected:
vtkDirectedGraph();
- ~vtkDirectedGraph() VTK_OVERRIDE;
+ ~vtkDirectedGraph() override;
private:
vtkDirectedGraph(const vtkDirectedGraph&) VTK_DELETE_FUNCTION;
diff --git a/Common/DataModel/vtkDistributedGraphHelper.h b/Common/DataModel/vtkDistributedGraphHelper.h
index a1cd1d29c86ab699620c1e06c5026a5262e37123..0b891e09160b30eeac632806e58952ed73f76b34 100644
--- a/Common/DataModel/vtkDistributedGraphHelper.h
+++ b/Common/DataModel/vtkDistributedGraphHelper.h
@@ -78,7 +78,7 @@ class VTKCOMMONDATAMODEL_EXPORT vtkDistributedGraphHelper : public vtkObject
{
public:
vtkTypeMacro(vtkDistributedGraphHelper,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Returns owner of vertex v, by extracting top ceil(log2 P) bits of v.
@@ -152,7 +152,7 @@ class VTKCOMMONDATAMODEL_EXPORT vtkDistributedGraphHelper : public vtkObject
protected:
vtkDistributedGraphHelper();
- ~vtkDistributedGraphHelper() VTK_OVERRIDE;
+ ~vtkDistributedGraphHelper() override;
/**
* Add a vertex, optionally with properties, to the distributed graph.
diff --git a/Common/DataModel/vtkEdgeListIterator.h b/Common/DataModel/vtkEdgeListIterator.h
index 1e2e020aaf2012bc92c1f4a9ca7e5f5f36d30fa4..42a179f6c800fceb02fc21204eee315a12a6e058 100644
--- a/Common/DataModel/vtkEdgeListIterator.h
+++ b/Common/DataModel/vtkEdgeListIterator.h
@@ -52,7 +52,7 @@ class VTKCOMMONDATAMODEL_EXPORT vtkEdgeListIterator : public vtkObject
public:
static vtkEdgeListIterator *New();
vtkTypeMacro(vtkEdgeListIterator, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
vtkGetObjectMacro(Graph, vtkGraph);
virtual void SetGraph(vtkGraph *graph);
@@ -78,7 +78,7 @@ public:
protected:
vtkEdgeListIterator();
- ~vtkEdgeListIterator() VTK_OVERRIDE;
+ ~vtkEdgeListIterator() override;
void Increment();
diff --git a/Common/DataModel/vtkEdgeTable.h b/Common/DataModel/vtkEdgeTable.h
index c4d647fbb51b45f9e05a64d553fe5299a03d3628..9bb12a38cf59ef08339439bc5b4fc727b180237e 100644
--- a/Common/DataModel/vtkEdgeTable.h
+++ b/Common/DataModel/vtkEdgeTable.h
@@ -46,7 +46,7 @@ public:
static vtkEdgeTable *New();
vtkTypeMacro(vtkEdgeTable,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Free memory and return to the initially instantiated state.
@@ -166,7 +166,7 @@ public:
protected:
vtkEdgeTable();
- ~vtkEdgeTable() VTK_OVERRIDE;
+ ~vtkEdgeTable() override;
vtkIdList **Table;
vtkIdType TableMaxId; //maximum point id inserted
diff --git a/Common/DataModel/vtkEmptyCell.h b/Common/DataModel/vtkEmptyCell.h
index 20fc02af66aa95a9d0ce630e9dc614b372b59e69..90fbc3a00ebbf1e93f49cf8eaa03d20d1367d15b 100644
--- a/Common/DataModel/vtkEmptyCell.h
+++ b/Common/DataModel/vtkEmptyCell.h
@@ -31,45 +31,45 @@ class VTKCOMMONDATAMODEL_EXPORT vtkEmptyCell : public vtkCell
public:
static vtkEmptyCell *New();
vtkTypeMacro(vtkEmptyCell,vtkCell);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
* See the vtkCell API for descriptions of these methods.
*/
- int GetCellType() VTK_OVERRIDE {return VTK_EMPTY_CELL;};
- int GetCellDimension() VTK_OVERRIDE {return 0;};
- int GetNumberOfEdges() VTK_OVERRIDE {return 0;};
- int GetNumberOfFaces() VTK_OVERRIDE {return 0;};
- vtkCell *GetEdge(int) VTK_OVERRIDE {return nullptr;};
- vtkCell *GetFace(int) VTK_OVERRIDE {return nullptr;};
- int CellBoundary(int subId, double pcoords[3], vtkIdList *pts) VTK_OVERRIDE;
+ int GetCellType() override {return VTK_EMPTY_CELL;};
+ int GetCellDimension() override {return 0;};
+ int GetNumberOfEdges() override {return 0;};
+ int GetNumberOfFaces() override {return 0;};
+ vtkCell *GetEdge(int) override {return nullptr;};
+ vtkCell *GetFace(int) override {return nullptr;};
+ int CellBoundary(int subId, double pcoords[3], vtkIdList *pts) override;
void Contour(double value, vtkDataArray *cellScalars,
vtkIncrementalPointLocator *locator, vtkCellArray *verts1,
vtkCellArray *lines, vtkCellArray *verts2,
vtkPointData *inPd, vtkPointData *outPd,
- vtkCellData *inCd, vtkIdType cellId, vtkCellData *outCd) VTK_OVERRIDE;
+ vtkCellData *inCd, vtkIdType cellId, vtkCellData *outCd) override;
void Clip(double value, vtkDataArray *cellScalars,
vtkIncrementalPointLocator *locator, vtkCellArray *pts,
vtkPointData *inPd, vtkPointData *outPd,
vtkCellData *inCd, vtkIdType cellId, vtkCellData *outCd,
- int insideOut) VTK_OVERRIDE;
+ int insideOut) override;
//@}
int EvaluatePosition(double x[3], double* closestPoint,
int& subId, double pcoords[3],
- double& dist2, double *weights) VTK_OVERRIDE;
+ double& dist2, double *weights) override;
void EvaluateLocation(int& subId, double pcoords[3], double x[3],
- double *weights) VTK_OVERRIDE;
+ double *weights) override;
int IntersectWithLine(double p1[3], double p2[3], double tol, double& t,
- double x[3], double pcoords[3], int& subId) VTK_OVERRIDE;
- int Triangulate(int index, vtkIdList *ptIds, vtkPoints *pts) VTK_OVERRIDE;
+ double x[3], double pcoords[3], int& subId) override;
+ int Triangulate(int index, vtkIdList *ptIds, vtkPoints *pts) override;
void Derivatives(int subId, double pcoords[3], double *values,
- int dim, double *derivs) VTK_OVERRIDE;
+ int dim, double *derivs) override;
protected:
vtkEmptyCell() {}
- ~vtkEmptyCell() VTK_OVERRIDE {}
+ ~vtkEmptyCell() override {}
private:
vtkEmptyCell(const vtkEmptyCell&) VTK_DELETE_FUNCTION;
diff --git a/Common/DataModel/vtkExtractStructuredGridHelper.h b/Common/DataModel/vtkExtractStructuredGridHelper.h
index b7231697ebaf4ea3a605c96d6fdb0b7d7e7e9bcb..85084471ba388bd60115eb8b34fb427e1cf66b2d 100644
--- a/Common/DataModel/vtkExtractStructuredGridHelper.h
+++ b/Common/DataModel/vtkExtractStructuredGridHelper.h
@@ -54,7 +54,7 @@ class VTKCOMMONDATAMODEL_EXPORT vtkExtractStructuredGridHelper :
public:
static vtkExtractStructuredGridHelper *New();
vtkTypeMacro(vtkExtractStructuredGridHelper,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
// Get & Set Macros
vtkGetVector6Macro(OutputWholeExtent,int);
@@ -216,7 +216,7 @@ public:
protected:
vtkExtractStructuredGridHelper();
- ~vtkExtractStructuredGridHelper() VTK_OVERRIDE;
+ ~vtkExtractStructuredGridHelper() override;
// Input parameters -- used to reinitialize when data changes.
int VOI[6];
diff --git a/Common/DataModel/vtkFieldData.h b/Common/DataModel/vtkFieldData.h
index e87b4e6cb13dad92d86a62658d5b333feb76da0d..eba28ddafa40d12fa2a3b023b37450a78cbe1a9c 100644
--- a/Common/DataModel/vtkFieldData.h
+++ b/Common/DataModel/vtkFieldData.h
@@ -56,7 +56,7 @@ public:
static vtkFieldData *New();
vtkTypeMacro(vtkFieldData,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Release all data but do not delete object.
@@ -279,7 +279,7 @@ public:
/**
* Check object's components for modified times.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
/**
* Get a field from a list of ids. Supplied field f should have same
@@ -357,7 +357,7 @@ public:
protected:
vtkFieldData();
- ~vtkFieldData() VTK_OVERRIDE;
+ ~vtkFieldData() override;
int NumberOfArrays;
int NumberOfActiveArrays;
@@ -442,7 +442,7 @@ public:
Iterator(const Iterator& source);
Iterator& operator=(const Iterator& source);
- ~Iterator() VTK_OVERRIDE;
+ ~Iterator() override;
Iterator(vtkFieldData* dsa, const int* list=nullptr,
unsigned int listSize=0);
diff --git a/Common/DataModel/vtkGenericAdaptorCell.h b/Common/DataModel/vtkGenericAdaptorCell.h
index 4c9bf2353039917412b7ec198e15e41beadfd68f..a937a365e339c997cc1c67d5811e968555ee0de8 100644
--- a/Common/DataModel/vtkGenericAdaptorCell.h
+++ b/Common/DataModel/vtkGenericAdaptorCell.h
@@ -93,7 +93,7 @@ class VTKCOMMONDATAMODEL_EXPORT vtkGenericAdaptorCell : public vtkObject
{
public:
vtkTypeMacro(vtkGenericAdaptorCell,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Unique identification number of the cell over the whole
@@ -602,7 +602,7 @@ public:
protected:
vtkGenericAdaptorCell();
- ~vtkGenericAdaptorCell() VTK_OVERRIDE;
+ ~vtkGenericAdaptorCell() override;
/**
* Reset internal structures.
diff --git a/Common/DataModel/vtkGenericAttribute.h b/Common/DataModel/vtkGenericAttribute.h
index 13b582b2b6e76cd761b627b8a853431b2769e2e3..3afd8ff271a776e31a852ff0ea5dbe9fd75d6af6 100644
--- a/Common/DataModel/vtkGenericAttribute.h
+++ b/Common/DataModel/vtkGenericAttribute.h
@@ -48,7 +48,7 @@ class VTKCOMMONDATAMODEL_EXPORT vtkGenericAttribute : public vtkObject
{
public:
vtkTypeMacro(vtkGenericAttribute,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Name of the attribute. (e.g. "velocity")
@@ -216,7 +216,7 @@ class VTKCOMMONDATAMODEL_EXPORT vtkGenericAttribute : public vtkObject
protected:
vtkGenericAttribute();
- ~vtkGenericAttribute() VTK_OVERRIDE;
+ ~vtkGenericAttribute() override;
private:
vtkGenericAttribute(const vtkGenericAttribute&) VTK_DELETE_FUNCTION;
diff --git a/Common/DataModel/vtkGenericAttributeCollection.h b/Common/DataModel/vtkGenericAttributeCollection.h
index 35153c2cb5a84c62fad444150c71b31e0a1c41d0..7d8aafa50b6b5a87b37795743a1fd13368495797 100644
--- a/Common/DataModel/vtkGenericAttributeCollection.h
+++ b/Common/DataModel/vtkGenericAttributeCollection.h
@@ -43,7 +43,7 @@ public:
* Standard type definition and print methods for a VTK class.
*/
vtkTypeMacro(vtkGenericAttributeCollection,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
@@ -163,7 +163,7 @@ public:
* vtkAttributeCollection is a composite object and needs to check each
* member of its collection for modified time.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
// *** ALL THE FOLLOWING METHODS SHOULD BE REMOVED WHEN when the
// new pipeline update mechanism is checked in.
@@ -246,7 +246,7 @@ protected:
/**
* Destructor.
*/
- ~vtkGenericAttributeCollection() VTK_OVERRIDE;
+ ~vtkGenericAttributeCollection() override;
/**
* STL vector for storing attributes
diff --git a/Common/DataModel/vtkGenericCell.h b/Common/DataModel/vtkGenericCell.h
index 9c48eb07c1aa580f6bfb123f805319b289f30188..f01b31e8927e822d451d66e5f45839d1579f6135 100644
--- a/Common/DataModel/vtkGenericCell.h
+++ b/Common/DataModel/vtkGenericCell.h
@@ -42,7 +42,7 @@ public:
static vtkGenericCell *New();
vtkTypeMacro(vtkGenericCell,vtkCell);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Set the points object to use for this cell. This updates the internal cell
@@ -60,46 +60,46 @@ public:
/**
* See the vtkCell API for descriptions of these methods.
*/
- void ShallowCopy(vtkCell *c) VTK_OVERRIDE;
- void DeepCopy(vtkCell *c) VTK_OVERRIDE;
- int GetCellType() VTK_OVERRIDE;
- int GetCellDimension() VTK_OVERRIDE;
- int IsLinear() VTK_OVERRIDE;
- int RequiresInitialization() VTK_OVERRIDE;
- void Initialize() VTK_OVERRIDE;
- int RequiresExplicitFaceRepresentation() VTK_OVERRIDE;
- void SetFaces(vtkIdType *faces) VTK_OVERRIDE;
- vtkIdType *GetFaces() VTK_OVERRIDE;
- int GetNumberOfEdges() VTK_OVERRIDE;
- int GetNumberOfFaces() VTK_OVERRIDE;
- vtkCell *GetEdge(int edgeId) VTK_OVERRIDE;
- vtkCell *GetFace(int faceId) VTK_OVERRIDE;
- int CellBoundary(int subId, double pcoords[3], vtkIdList *pts) VTK_OVERRIDE;
+ void ShallowCopy(vtkCell *c) override;
+ void DeepCopy(vtkCell *c) override;
+ int GetCellType() override;
+ int GetCellDimension() override;
+ int IsLinear() override;
+ int RequiresInitialization() override;
+ void Initialize() override;
+ int RequiresExplicitFaceRepresentation() override;
+ void SetFaces(vtkIdType *faces) override;
+ vtkIdType *GetFaces() override;
+ int GetNumberOfEdges() override;
+ int GetNumberOfFaces() override;
+ vtkCell *GetEdge(int edgeId) override;
+ vtkCell *GetFace(int faceId) override;
+ int CellBoundary(int subId, double pcoords[3], vtkIdList *pts) override;
int EvaluatePosition(double x[3], double* closestPoint,
int& subId, double pcoords[3],
- double& dist2, double *weights) VTK_OVERRIDE;
+ double& dist2, double *weights) override;
void EvaluateLocation(int& subId, double pcoords[3],
- double x[3], double *weights) VTK_OVERRIDE;
+ double x[3], double *weights) override;
void Contour(double value, vtkDataArray *cellScalars,
vtkIncrementalPointLocator *locator, vtkCellArray *verts,
vtkCellArray *lines, vtkCellArray *polys,
vtkPointData *inPd, vtkPointData *outPd,
vtkCellData *inCd, vtkIdType cellId,
- vtkCellData *outCd) VTK_OVERRIDE;
+ vtkCellData *outCd) override;
void Clip(double value, vtkDataArray *cellScalars,
vtkIncrementalPointLocator *locator, vtkCellArray *connectivity,
vtkPointData *inPd, vtkPointData *outPd,
vtkCellData *inCd, vtkIdType cellId, vtkCellData *outCd,
- int insideOut) VTK_OVERRIDE;
+ int insideOut) override;
int IntersectWithLine(double p1[3], double p2[3], double tol, double& t,
double x[3], double pcoords[3],
- int& subId) VTK_OVERRIDE;
- int Triangulate(int index, vtkIdList *ptIds, vtkPoints *pts) VTK_OVERRIDE;
+ int& subId) override;
+ int Triangulate(int index, vtkIdList *ptIds, vtkPoints *pts) override;
void Derivatives(int subId, double pcoords[3], double *values,
- int dim, double *derivs) VTK_OVERRIDE;
- int GetParametricCenter(double pcoords[3]) VTK_OVERRIDE;
- double *GetParametricCoords() VTK_OVERRIDE;
- int IsPrimaryCell() VTK_OVERRIDE;
+ int dim, double *derivs) override;
+ int GetParametricCenter(double pcoords[3]) override;
+ double *GetParametricCoords() override;
+ int IsPrimaryCell() override;
//@}
//@{
@@ -107,8 +107,8 @@ public:
* Compute the interpolation functions/derivatives
* (aka shape functions/derivatives)
*/
- void InterpolateFunctions(double pcoords[3], double *weights) VTK_OVERRIDE;
- void InterpolateDerivs(double pcoords[3], double *derivs) VTK_OVERRIDE;
+ void InterpolateFunctions(double pcoords[3], double *weights) override;
+ void InterpolateDerivs(double pcoords[3], double *derivs) override;
//@}
/**
@@ -167,7 +167,7 @@ public:
protected:
vtkGenericCell();
- ~vtkGenericCell() VTK_OVERRIDE;
+ ~vtkGenericCell() override;
vtkCell *Cell;
diff --git a/Common/DataModel/vtkGenericCellIterator.h b/Common/DataModel/vtkGenericCellIterator.h
index 74a275b7607358a76e8a869a77ec51bb98a10397..fd5a3e542bb33fd1748ee15feaf87e3e195372fd 100644
--- a/Common/DataModel/vtkGenericCellIterator.h
+++ b/Common/DataModel/vtkGenericCellIterator.h
@@ -46,7 +46,7 @@ public:
* Standard VTK construction and type macros.
*/
vtkTypeMacro(vtkGenericCellIterator,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
@@ -90,7 +90,7 @@ public:
protected:
vtkGenericCellIterator();
- ~vtkGenericCellIterator() VTK_OVERRIDE;
+ ~vtkGenericCellIterator() override;
private:
vtkGenericCellIterator(const vtkGenericCellIterator&) VTK_DELETE_FUNCTION;
diff --git a/Common/DataModel/vtkGenericCellTessellator.h b/Common/DataModel/vtkGenericCellTessellator.h
index 008bd74c4c1b85a778081e1c0c0dae63ac03c072..cdab2aa9d8ab6f184bc9119099ef2dddfee4cd91 100644
--- a/Common/DataModel/vtkGenericCellTessellator.h
+++ b/Common/DataModel/vtkGenericCellTessellator.h
@@ -59,7 +59,7 @@ class VTKCOMMONDATAMODEL_EXPORT vtkGenericCellTessellator : public vtkObject
{
public:
vtkTypeMacro(vtkGenericCellTessellator,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Tessellate a face of a 3D `cell'. The face is specified by the
@@ -150,7 +150,7 @@ public:
protected:
vtkGenericCellTessellator();
- ~vtkGenericCellTessellator() VTK_OVERRIDE;
+ ~vtkGenericCellTessellator() override;
/**
* Does the edge need to be subdivided according to at least one error
diff --git a/Common/DataModel/vtkGenericDataSet.h b/Common/DataModel/vtkGenericDataSet.h
index 598ec673e35fa3f6c228afee48e358f8b5b155cc..517f2718b3943798124cde0975045b75dd086312 100644
--- a/Common/DataModel/vtkGenericDataSet.h
+++ b/Common/DataModel/vtkGenericDataSet.h
@@ -74,7 +74,7 @@ public:
* Standard VTK type and print macros.
*/
vtkTypeMacro(vtkGenericDataSet,vtkDataObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
@@ -176,7 +176,7 @@ public:
* Datasets are composite objects and need to check each part for their
* modified time.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
/**
* Compute the geometry bounding box.
@@ -237,7 +237,7 @@ public:
* vtkDataSetAttributes instance. To retrieve field data, use
* GetAttributesAsFieldData.
*/
- vtkDataSetAttributes* GetAttributes(int type) VTK_OVERRIDE
+ vtkDataSetAttributes* GetAttributes(int type) override
{ return this->Superclass::GetAttributes(type); }
//@{
@@ -255,12 +255,12 @@ public:
* updated. It is guaranteed to be greater than or equal to the memory
* required to represent the data.
*/
- unsigned long GetActualMemorySize() VTK_OVERRIDE;
+ unsigned long GetActualMemorySize() override;
/**
* Return the type of data object.
*/
- int GetDataObjectType() VTK_OVERRIDE;
+ int GetDataObjectType() override;
/**
* Estimated size needed after tessellation (or special operation)
@@ -282,7 +282,7 @@ protected:
*/
vtkGenericDataSet();
- ~vtkGenericDataSet() VTK_OVERRIDE;
+ ~vtkGenericDataSet() override;
vtkGenericAttributeCollection *Attributes;
diff --git a/Common/DataModel/vtkGenericEdgeTable.h b/Common/DataModel/vtkGenericEdgeTable.h
index 9c981addd3e98f0c12c038ac7d0448df3da2b076..1fc05c7ba64f41420b91e86295f3af8285b84e9b 100644
--- a/Common/DataModel/vtkGenericEdgeTable.h
+++ b/Common/DataModel/vtkGenericEdgeTable.h
@@ -49,7 +49,7 @@ public:
* Standard VTK type and print macros.
*/
vtkTypeMacro(vtkGenericEdgeTable,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
@@ -249,7 +249,7 @@ public:
protected:
vtkGenericEdgeTable();
- ~vtkGenericEdgeTable() VTK_OVERRIDE;
+ ~vtkGenericEdgeTable() override;
/**
* Split the edge with the indicated point id.
diff --git a/Common/DataModel/vtkGenericInterpolatedVelocityField.h b/Common/DataModel/vtkGenericInterpolatedVelocityField.h
index 9206432a361e1dea51bcb013680ae7caa8a837d5..38f324adaff361fb2cf8f3973c8bf219848bd53e 100644
--- a/Common/DataModel/vtkGenericInterpolatedVelocityField.h
+++ b/Common/DataModel/vtkGenericInterpolatedVelocityField.h
@@ -55,7 +55,7 @@ class VTKCOMMONDATAMODEL_EXPORT vtkGenericInterpolatedVelocityField : public vtk
{
public:
vtkTypeMacro(vtkGenericInterpolatedVelocityField,vtkFunctionSet);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct a vtkGenericInterpolatedVelocityField with no initial data set.
@@ -67,7 +67,7 @@ public:
* Evaluate the velocity field, f, at (x, y, z, t).
* For now, t is ignored.
*/
- int FunctionValues(double* x, double* f) VTK_OVERRIDE;
+ int FunctionValues(double* x, double* f) override;
/**
* Add a dataset used for the implicit function evaluation.
@@ -143,7 +143,7 @@ public:
protected:
vtkGenericInterpolatedVelocityField();
- ~vtkGenericInterpolatedVelocityField() VTK_OVERRIDE;
+ ~vtkGenericInterpolatedVelocityField() override;
vtkGenericCellIterator *GenCell; // last cell
diff --git a/Common/DataModel/vtkGenericPointIterator.h b/Common/DataModel/vtkGenericPointIterator.h
index 36a6ac95aced8d95fe5e63587bb78864ef3ba6e5..83d6cf6b5226b38f6ed0bf04a4efbf08f60b3e93 100644
--- a/Common/DataModel/vtkGenericPointIterator.h
+++ b/Common/DataModel/vtkGenericPointIterator.h
@@ -44,7 +44,7 @@ public:
* Standard VTK construction and type macros.
*/
vtkTypeMacro(vtkGenericPointIterator,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
@@ -89,7 +89,7 @@ protected:
* Destructor.
*/
vtkGenericPointIterator();
- ~vtkGenericPointIterator() VTK_OVERRIDE;
+ ~vtkGenericPointIterator() override;
//@}
private:
diff --git a/Common/DataModel/vtkGenericSubdivisionErrorMetric.h b/Common/DataModel/vtkGenericSubdivisionErrorMetric.h
index 457082100312e892e8c8274fc8d7bd2e3f3c8e65..0a9e145581c845d76602afc8a61b1af80d3ab391 100644
--- a/Common/DataModel/vtkGenericSubdivisionErrorMetric.h
+++ b/Common/DataModel/vtkGenericSubdivisionErrorMetric.h
@@ -53,7 +53,7 @@ public:
* Standard VTK type and error macros.
*/
vtkTypeMacro(vtkGenericSubdivisionErrorMetric,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
@@ -111,7 +111,7 @@ public:
protected:
vtkGenericSubdivisionErrorMetric();
- ~vtkGenericSubdivisionErrorMetric() VTK_OVERRIDE;
+ ~vtkGenericSubdivisionErrorMetric() override;
vtkGenericAdaptorCell *GenericCell;
vtkGenericDataSet *DataSet;
diff --git a/Common/DataModel/vtkGeometricErrorMetric.h b/Common/DataModel/vtkGeometricErrorMetric.h
index 24d48b4447b08960be0c4d467ec646869c9972c4..3973ed2c7c580aa314d471624057be0cc469c3f0 100644
--- a/Common/DataModel/vtkGeometricErrorMetric.h
+++ b/Common/DataModel/vtkGeometricErrorMetric.h
@@ -47,7 +47,7 @@ public:
* Standard VTK type and error macros.
*/
vtkTypeMacro(vtkGeometricErrorMetric,vtkGenericSubdivisionErrorMetric);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -98,7 +98,7 @@ public:
* =GetAttributeCollection()->GetNumberOfPointCenteredComponents()+6
*/
int RequiresEdgeSubdivision(double *leftPoint, double *midPoint, double *rightPoint,
- double alpha) VTK_OVERRIDE;
+ double alpha) override;
/**
* Return the error at the mid-point. It will return an error relative to
@@ -114,7 +114,7 @@ public:
* \post positive_result: result>=0
*/
double GetError(double *leftPoint, double *midPoint,
- double *rightPoint, double alpha) VTK_OVERRIDE;
+ double *rightPoint, double alpha) override;
/**
* Return the type of output of GetError()
@@ -123,7 +123,7 @@ public:
protected:
vtkGeometricErrorMetric();
- ~vtkGeometricErrorMetric() VTK_OVERRIDE;
+ ~vtkGeometricErrorMetric() override;
/**
* Square distance between a straight line (defined by points x and y)
diff --git a/Common/DataModel/vtkGraph.cxx b/Common/DataModel/vtkGraph.cxx
index 1bca3d584a4a5a39c037f680cea220cef7447c36..887d6a451177a3c0d555a7db7e1de1dc6875b2ec 100644
--- a/Common/DataModel/vtkGraph.cxx
+++ b/Common/DataModel/vtkGraph.cxx
@@ -63,7 +63,7 @@ public:
protected:
vtkGraphEdgePoints() { }
- ~vtkGraphEdgePoints() VTK_OVERRIDE { }
+ ~vtkGraphEdgePoints() override { }
private:
vtkGraphEdgePoints(const vtkGraphEdgePoints&) VTK_DELETE_FUNCTION;
diff --git a/Common/DataModel/vtkGraph.h b/Common/DataModel/vtkGraph.h
index 983c191d9fb2a70e42668447fef20c27f5374c09..0ba768a4aeec2a3afef7f8c8326798ab822024c6 100644
--- a/Common/DataModel/vtkGraph.h
+++ b/Common/DataModel/vtkGraph.h
@@ -282,7 +282,7 @@ class VTKCOMMONDATAMODEL_EXPORT vtkGraph : public vtkDataObject
{
public:
vtkTypeMacro(vtkGraph, vtkDataObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -295,12 +295,12 @@ public:
/**
* Return what type of dataset this is.
*/
- int GetDataObjectType() VTK_OVERRIDE {return VTK_GRAPH;}
+ int GetDataObjectType() override {return VTK_GRAPH;}
/**
* Initialize to an empty graph.
*/
- void Initialize() VTK_OVERRIDE;
+ void Initialize() override;
//@{
/**
@@ -344,7 +344,7 @@ public:
/**
* The modified time of the graph.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
/**
* Initializes the out edge iterator to iterate over
@@ -471,13 +471,13 @@ public:
* Shallow copies the data object into this graph.
* If it is an incompatible graph, reports an error.
*/
- void ShallowCopy(vtkDataObject *obj) VTK_OVERRIDE;
+ void ShallowCopy(vtkDataObject *obj) override;
/**
* Deep copies the data object into this graph.
* If it is an incompatible graph, reports an error.
*/
- void DeepCopy(vtkDataObject *obj) VTK_OVERRIDE;
+ void DeepCopy(vtkDataObject *obj) override;
/**
* Does a shallow copy of the topological information,
@@ -610,12 +610,12 @@ public:
* in addition to the case of FIELD, which will return the field data
* for any vtkDataObject subclass.
*/
- vtkFieldData* GetAttributesAsFieldData(int type) VTK_OVERRIDE;
+ vtkFieldData* GetAttributesAsFieldData(int type) override;
/**
* Get the number of elements for a specific attribute type (VERTEX, EDGE, etc.).
*/
- vtkIdType GetNumberOfElements(int type) VTK_OVERRIDE;
+ vtkIdType GetNumberOfElements(int type) override;
/**
* Dump the contents of the graph to standard output.
@@ -645,7 +645,7 @@ public:
protected:
vtkGraph();
- ~vtkGraph() VTK_OVERRIDE;
+ ~vtkGraph() override;
/**
* Protected method for adding vertices, optionally with properties,
diff --git a/Common/DataModel/vtkGraphEdge.h b/Common/DataModel/vtkGraphEdge.h
index d5c0190026d2e526ad1cd133a34c6332528614a4..ecea31c9a7e25cd76535f91c13ca5eaa71943309 100644
--- a/Common/DataModel/vtkGraphEdge.h
+++ b/Common/DataModel/vtkGraphEdge.h
@@ -41,7 +41,7 @@ class VTKCOMMONDATAMODEL_EXPORT vtkGraphEdge : public vtkObject
public:
static vtkGraphEdge *New();
vtkTypeMacro(vtkGraphEdge, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -69,7 +69,7 @@ public:
protected:
vtkGraphEdge();
- ~vtkGraphEdge() VTK_OVERRIDE;
+ ~vtkGraphEdge() override;
vtkIdType Source;
vtkIdType Target;
diff --git a/Common/DataModel/vtkGraphInternals.h b/Common/DataModel/vtkGraphInternals.h
index 77574d249e19788b7c04d45c5904ae46b97184a6..e85f65387f0d7d386bf67667d4593274d0c850c1 100644
--- a/Common/DataModel/vtkGraphInternals.h
+++ b/Common/DataModel/vtkGraphInternals.h
@@ -91,7 +91,7 @@ public:
protected:
vtkGraphInternals();
- ~vtkGraphInternals() VTK_OVERRIDE;
+ ~vtkGraphInternals() override;
private:
vtkGraphInternals(const vtkGraphInternals&) VTK_DELETE_FUNCTION;
diff --git a/Common/DataModel/vtkHexagonalPrism.h b/Common/DataModel/vtkHexagonalPrism.h
index 5fe2a75dff2b4bad2bca87142a9e893844febc03..45a4e3ca7223a012decf30612660f0e175d2e0f3 100644
--- a/Common/DataModel/vtkHexagonalPrism.h
+++ b/Common/DataModel/vtkHexagonalPrism.h
@@ -47,45 +47,45 @@ class VTKCOMMONDATAMODEL_EXPORT vtkHexagonalPrism : public vtkCell3D
public:
static vtkHexagonalPrism *New();
vtkTypeMacro(vtkHexagonalPrism,vtkCell3D);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
* See vtkCell3D API for description of these methods.
*/
- void GetEdgePoints(int edgeId, int* &pts) VTK_OVERRIDE;
- void GetFacePoints(int faceId, int* &pts) VTK_OVERRIDE;
+ void GetEdgePoints(int edgeId, int* &pts) override;
+ void GetFacePoints(int faceId, int* &pts) override;
//@}
//@{
/**
* See the vtkCell API for descriptions of these methods.
*/
- int GetCellType() VTK_OVERRIDE {return VTK_HEXAGONAL_PRISM;};
- int GetCellDimension() VTK_OVERRIDE {return 3;};
- int GetNumberOfEdges() VTK_OVERRIDE {return 18;};
- int GetNumberOfFaces() VTK_OVERRIDE {return 8;};
- vtkCell *GetEdge(int edgeId) VTK_OVERRIDE;
- vtkCell *GetFace(int faceId) VTK_OVERRIDE;
- int CellBoundary(int subId, double pcoords[3], vtkIdList *pts) VTK_OVERRIDE;
+ int GetCellType() override {return VTK_HEXAGONAL_PRISM;};
+ int GetCellDimension() override {return 3;};
+ int GetNumberOfEdges() override {return 18;};
+ int GetNumberOfFaces() override {return 8;};
+ vtkCell *GetEdge(int edgeId) override;
+ vtkCell *GetFace(int faceId) override;
+ int CellBoundary(int subId, double pcoords[3], vtkIdList *pts) override;
//@}
int EvaluatePosition(double x[3], double* closestPoint,
int& subId, double pcoords[3],
- double& dist2, double *weights) VTK_OVERRIDE;
+ double& dist2, double *weights) override;
void EvaluateLocation(int& subId, double pcoords[3], double x[3],
- double *weights) VTK_OVERRIDE;
+ double *weights) override;
int IntersectWithLine(double p1[3], double p2[3], double tol, double& t,
- double x[3], double pcoords[3], int& subId) VTK_OVERRIDE;
- int Triangulate(int index, vtkIdList *ptIds, vtkPoints *pts) VTK_OVERRIDE;
+ double x[3], double pcoords[3], int& subId) override;
+ int Triangulate(int index, vtkIdList *ptIds, vtkPoints *pts) override;
void Derivatives(int subId, double pcoords[3], double *values,
- int dim, double *derivs) VTK_OVERRIDE;
- double *GetParametricCoords() VTK_OVERRIDE;
+ int dim, double *derivs) override;
+ double *GetParametricCoords() override;
/**
* Return the center of the wedge in parametric coordinates.
*/
- int GetParametricCenter(double pcoords[3]) VTK_OVERRIDE;
+ int GetParametricCenter(double pcoords[3]) override;
/**
* @deprecated Replaced by vtkHexagonalPrism::InterpolateFunctions as of VTK 5.2
@@ -100,11 +100,11 @@ public:
* Compute the interpolation functions/derivatives
* (aka shape functions/derivatives)
*/
- void InterpolateFunctions(double pcoords[3], double weights[12]) VTK_OVERRIDE
+ void InterpolateFunctions(double pcoords[3], double weights[12]) override
{
vtkHexagonalPrism::InterpolationFunctions(pcoords,weights);
}
- void InterpolateDerivs(double pcoords[3], double derivs[36]) VTK_OVERRIDE
+ void InterpolateDerivs(double pcoords[3], double derivs[36]) override
{
vtkHexagonalPrism::InterpolationDerivs(pcoords,derivs);
}
@@ -128,7 +128,7 @@ public:
protected:
vtkHexagonalPrism();
- ~vtkHexagonalPrism() VTK_OVERRIDE;
+ ~vtkHexagonalPrism() override;
vtkLine *Line;
vtkQuad *Quad;
diff --git a/Common/DataModel/vtkHexahedron.h b/Common/DataModel/vtkHexahedron.h
index 9e6e26cf501ca075f254fba26d9b7b385b9e1937..5c7e1cebb60f6ef5b6e627e777d7d77a84a2ea02 100644
--- a/Common/DataModel/vtkHexahedron.h
+++ b/Common/DataModel/vtkHexahedron.h
@@ -43,44 +43,44 @@ class VTKCOMMONDATAMODEL_EXPORT vtkHexahedron : public vtkCell3D
public:
static vtkHexahedron *New();
vtkTypeMacro(vtkHexahedron,vtkCell3D);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
* See vtkCell3D API for description of these methods.
*/
- void GetEdgePoints(int edgeId, int* &pts) VTK_OVERRIDE;
- void GetFacePoints(int faceId, int* &pts) VTK_OVERRIDE;
+ void GetEdgePoints(int edgeId, int* &pts) override;
+ void GetFacePoints(int faceId, int* &pts) override;
//@}
//@{
/**
* See the vtkCell API for descriptions of these methods.
*/
- int GetCellType() VTK_OVERRIDE {return VTK_HEXAHEDRON;}
- int GetNumberOfEdges() VTK_OVERRIDE {return 12;}
- int GetNumberOfFaces() VTK_OVERRIDE {return 6;}
- vtkCell *GetEdge(int edgeId) VTK_OVERRIDE;
- vtkCell *GetFace(int faceId) VTK_OVERRIDE;
- int CellBoundary(int subId, double pcoords[3], vtkIdList *pts) VTK_OVERRIDE;
+ int GetCellType() override {return VTK_HEXAHEDRON;}
+ int GetNumberOfEdges() override {return 12;}
+ int GetNumberOfFaces() override {return 6;}
+ vtkCell *GetEdge(int edgeId) override;
+ vtkCell *GetFace(int faceId) override;
+ int CellBoundary(int subId, double pcoords[3], vtkIdList *pts) override;
void Contour(double value, vtkDataArray *cellScalars,
vtkIncrementalPointLocator *locator, vtkCellArray *verts,
vtkCellArray *lines, vtkCellArray *polys,
vtkPointData *inPd, vtkPointData *outPd,
- vtkCellData *inCd, vtkIdType cellId, vtkCellData *outCd) VTK_OVERRIDE;
+ vtkCellData *inCd, vtkIdType cellId, vtkCellData *outCd) override;
//@}
int EvaluatePosition(double x[3], double* closestPoint,
int& subId, double pcoords[3],
- double& dist2, double *weights) VTK_OVERRIDE;
+ double& dist2, double *weights) override;
void EvaluateLocation(int& subId, double pcoords[3], double x[3],
- double *weights) VTK_OVERRIDE;
+ double *weights) override;
int IntersectWithLine(double p1[3], double p2[3], double tol, double& t,
- double x[3], double pcoords[3], int& subId) VTK_OVERRIDE;
- int Triangulate(int index, vtkIdList *ptIds, vtkPoints *pts) VTK_OVERRIDE;
+ double x[3], double pcoords[3], int& subId) override;
+ int Triangulate(int index, vtkIdList *ptIds, vtkPoints *pts) override;
void Derivatives(int subId, double pcoords[3], double *values,
- int dim, double *derivs) VTK_OVERRIDE;
- double *GetParametricCoords() VTK_OVERRIDE;
+ int dim, double *derivs) override;
+ double *GetParametricCoords() override;
/**
* @deprecated Replaced by vtkHexahedron::InterpolateFunctions as of VTK 5.2
@@ -95,11 +95,11 @@ public:
* Compute the interpolation functions/derivatives
* (aka shape functions/derivatives)
*/
- void InterpolateFunctions(double pcoords[3], double weights[8]) VTK_OVERRIDE
+ void InterpolateFunctions(double pcoords[3], double weights[8]) override
{
vtkHexahedron::InterpolationFunctions(pcoords,weights);
}
- void InterpolateDerivs(double pcoords[3], double derivs[24]) VTK_OVERRIDE
+ void InterpolateDerivs(double pcoords[3], double derivs[24]) override
{
vtkHexahedron::InterpolationDerivs(pcoords,derivs);
}
@@ -123,7 +123,7 @@ public:
protected:
vtkHexahedron();
- ~vtkHexahedron() VTK_OVERRIDE;
+ ~vtkHexahedron() override;
vtkLine *Line;
vtkQuad *Quad;
diff --git a/Common/DataModel/vtkHierarchicalBoxDataIterator.h b/Common/DataModel/vtkHierarchicalBoxDataIterator.h
index 81044a589060bbe0d58b7e907ca3b763e962deac..916d3f59bfc1e1a6a141771c6084efe2a2656abc 100644
--- a/Common/DataModel/vtkHierarchicalBoxDataIterator.h
+++ b/Common/DataModel/vtkHierarchicalBoxDataIterator.h
@@ -31,11 +31,11 @@ class VTKCOMMONDATAMODEL_EXPORT vtkHierarchicalBoxDataIterator :
public:
static vtkHierarchicalBoxDataIterator* New();
vtkTypeMacro(vtkHierarchicalBoxDataIterator,vtkUniformGridAMRDataIterator);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
protected:
vtkHierarchicalBoxDataIterator();
- ~vtkHierarchicalBoxDataIterator() VTK_OVERRIDE;
+ ~vtkHierarchicalBoxDataIterator() override;
private:
vtkHierarchicalBoxDataIterator(const vtkHierarchicalBoxDataIterator&) VTK_DELETE_FUNCTION;
diff --git a/Common/DataModel/vtkHierarchicalBoxDataSet.h b/Common/DataModel/vtkHierarchicalBoxDataSet.h
index 607956a771b64a0acdab27a11d799fff82d9e832..46956f73053dd1d55c0d2c1db54c3a758cacc262 100644
--- a/Common/DataModel/vtkHierarchicalBoxDataSet.h
+++ b/Common/DataModel/vtkHierarchicalBoxDataSet.h
@@ -37,17 +37,17 @@ class VTKCOMMONDATAMODEL_EXPORT vtkHierarchicalBoxDataSet:
public:
static vtkHierarchicalBoxDataSet *New();
vtkTypeMacro(vtkHierarchicalBoxDataSet,vtkOverlappingAMR);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
/**
* Return a new iterator (the iterator has to be deleted by user).
*/
- VTK_NEWINSTANCE vtkCompositeDataIterator* NewIterator() VTK_OVERRIDE;
+ VTK_NEWINSTANCE vtkCompositeDataIterator* NewIterator() override;
/**
* Return class name of data type (see vtkType.h for definitions).
*/
- int GetDataObjectType() VTK_OVERRIDE {return VTK_HIERARCHICAL_BOX_DATA_SET;}
+ int GetDataObjectType() override {return VTK_HIERARCHICAL_BOX_DATA_SET;}
//@{
/**
@@ -59,7 +59,7 @@ public:
protected:
vtkHierarchicalBoxDataSet();
- ~vtkHierarchicalBoxDataSet() VTK_OVERRIDE;
+ ~vtkHierarchicalBoxDataSet() override;
private:
vtkHierarchicalBoxDataSet(const vtkHierarchicalBoxDataSet&) VTK_DELETE_FUNCTION;
diff --git a/Common/DataModel/vtkHyperOctree.cxx b/Common/DataModel/vtkHyperOctree.cxx
index 8acad183d200be2c3842d064ff6629633b273d4d..b917c63e2ff2ab1c5ba2e9d05afac568a96bd4ff 100644
--- a/Common/DataModel/vtkHyperOctree.cxx
+++ b/Common/DataModel/vtkHyperOctree.cxx
@@ -149,19 +149,19 @@ public:
// Return the id of the current leaf in order to
// access to the data.
// \pre is_leaf: CurrentIsLeaf()
- int GetLeafId() VTK_OVERRIDE
+ int GetLeafId() override
{
assert("pre: is_leaf" && CurrentIsLeaf());
return this->Cursor;
}
// Status
- int CurrentIsLeaf() VTK_OVERRIDE
+ int CurrentIsLeaf() override
{
return this->IsLeaf;
}
- int CurrentIsRoot() VTK_OVERRIDE
+ int CurrentIsRoot() override
{
return (this->IsLeaf && this->Cursor==0 && this->Tree->GetLeafParentSize()==1) || (!this->IsLeaf && this->Cursor==1);
}
@@ -170,7 +170,7 @@ public:
// Description:
// Return the level of the node pointed by the cursor.
// \post positive_result: result>=0
- int GetCurrentLevel() VTK_OVERRIDE
+ int GetCurrentLevel() override
{
int result=this->GetChildHistorySize();
assert("post: positive_result" && result>=0);
@@ -182,7 +182,7 @@ public:
// Return the child number of the current node relative to its parent.
// \pre not_root: !CurrentIsRoot().
// \post valid_range: result>=0 && result<GetNumberOfChildren()
- int GetChildIndex() VTK_OVERRIDE
+ int GetChildIndex() override
{
assert("post: valid_range" && this->ChildIndex>=0 && this->ChildIndex<GetNumberOfChildren());
return this->ChildIndex;
@@ -192,7 +192,7 @@ public:
// Are the children of the current node all leaves?
// This query can be called also on a leaf node.
// \post compatible: result implies !CurrentIsLeaf()
- int CurrentIsTerminalNode() VTK_OVERRIDE
+ int CurrentIsTerminalNode() override
{
int result=!this->IsLeaf;
if(result)
@@ -209,7 +209,7 @@ public:
// Cursor movement.
// \pre can be root
// \post is_root: CurrentIsRoot()
- void ToRoot() VTK_OVERRIDE
+ void ToRoot() override
{
this->ChildHistory.clear();
this->IsLeaf=this->Tree->GetLeafParentSize()==1;
@@ -232,7 +232,7 @@ public:
//---------------------------------------------------------------------------
// \pre not_root: !CurrentIsRoot()
- void ToParent() VTK_OVERRIDE
+ void ToParent() override
{
assert("pre: not_root" && !CurrentIsRoot());
if(this->IsLeaf)
@@ -258,7 +258,7 @@ public:
//---------------------------------------------------------------------------
// \pre not_leaf: !CurrentIsLeaf()
// \pre valid_child: child>=0 && child<this->GetNumberOfChildren()
- void ToChild(int child) VTK_OVERRIDE
+ void ToChild(int child) override
{
assert("pre: not_leaf" && !CurrentIsLeaf());
assert("pre: valid_child" && child>=0 && child<this->GetNumberOfChildren());
@@ -286,7 +286,7 @@ public:
// \pre other_exists: other!=0
// \pre same_hyperoctree: this->SameTree(other)
// \post equal: this->IsEqual(other)
- void ToSameNode(vtkHyperOctreeCursor *other) VTK_OVERRIDE
+ void ToSameNode(vtkHyperOctreeCursor *other) override
{
assert("pre: other_exists" && other!=nullptr);
assert("pre: same_hyperoctree" && this->SameTree(other));
@@ -310,7 +310,7 @@ public:
// Is `this' equal to `other'?
// \pre other_exists: other!=0
// \pre same_hyperoctree: this->SameTree(other);
- int IsEqual(vtkHyperOctreeCursor *other) VTK_OVERRIDE
+ int IsEqual(vtkHyperOctreeCursor *other) override
{
assert("pre: other_exists" && other!=nullptr);
assert("pre: same_hyperoctree" && this->SameTree(other));
@@ -334,7 +334,7 @@ public:
// Create a copy of `this'.
// \post results_exists:result!=0
// \post same_tree: result->SameTree(this)
- vtkHyperOctreeCursor *Clone() VTK_OVERRIDE
+ vtkHyperOctreeCursor *Clone() override
{
vtkCompactHyperOctreeCursor<D> *result=this->NewInstance();
assert("post: results_exists" && result!=nullptr);
@@ -347,7 +347,7 @@ public:
// Description:
// Are `this' and `other' pointing on the same hyperoctree?
// \pre other_exists: other!=0
- int SameTree(vtkHyperOctreeCursor *other) VTK_OVERRIDE
+ int SameTree(vtkHyperOctreeCursor *other) override
{
assert("pre: other_exists" && other!=nullptr);
vtkCompactHyperOctreeCursor<D> *o=vtkCompactHyperOctreeCursor<D>::SafeDownCast(other);
@@ -365,7 +365,7 @@ public:
// uniform grid of 1<<GetCurrentLevel() cells in each dimension.
// \pre valid_range: d>=0 && d<GetDimension()
// \post valid_result: result>=0 && result<(1<<GetCurrentLevel())
- int GetIndex(int d) VTK_OVERRIDE
+ int GetIndex(int d) override
{
assert("pre: valid_range" && d>=0 && d<this->GetDimension());
@@ -379,7 +379,7 @@ public:
// Description:
// Return the number of children for each node of the tree.
// \post positive_number: result>0
- int GetNumberOfChildren() VTK_OVERRIDE
+ int GetNumberOfChildren() override
{
return 1<<D;
}
@@ -388,7 +388,7 @@ public:
// Description:
// Return the dimension of the tree.
// \post positive_result: result>=0
- int GetDimension() VTK_OVERRIDE
+ int GetDimension() override
{
assert("post: positive_result " && D>0);
assert("post: up_to_3 " && D<=3); // and then
@@ -406,7 +406,7 @@ public:
// \pre valid_size: sizeof(indices)==GetDimension()
// \pre valid_level: level>=0
void MoveToNode(int *indices,
- int level) VTK_OVERRIDE
+ int level) override
{
assert("pre: indices_exists" && indices!=nullptr);
assert("pre: valid_level" && level>=0);
@@ -441,7 +441,7 @@ public:
//---------------------------------------------------------------------------
// Description
// Did the last call to MoveToNode succeed?
- int Found() VTK_OVERRIDE
+ int Found() override
{
return this->IsFound;
}
@@ -659,7 +659,7 @@ public:
// Description:
// Restore the initial state: only one node and one leaf: the root.
// Attributes is empty.
- void Initialize() VTK_OVERRIDE
+ void Initialize() override
{
this->Nodes.resize(1);
this->Nodes[0].SetParent(0);
@@ -679,7 +679,7 @@ public:
}
//---------------------------------------------------------------------------
- vtkHyperOctreeCursor *NewCursor() VTK_OVERRIDE
+ vtkHyperOctreeCursor *NewCursor() override
{
vtkCompactHyperOctreeCursor<D> *result =
vtkCompactHyperOctreeCursor<D>::New();
@@ -688,7 +688,7 @@ public:
}
//---------------------------------------------------------------------------
- ~vtkCompactHyperOctree() VTK_OVERRIDE
+ ~vtkCompactHyperOctree() override
{
if (this->Attributes != nullptr)
{
@@ -697,7 +697,7 @@ public:
}
//--------------------------------------------------------------------------
- void DeepCopy(vtkHyperOctreeInternal *src) VTK_OVERRIDE
+ void DeepCopy(vtkHyperOctreeInternal *src) override
{
vtkCompactHyperOctree<D>* octree =
vtkCompactHyperOctree<D>::SafeDownCast(src);
@@ -710,7 +710,7 @@ public:
}
//---------------------------------------------------------------------------
- vtkIdType GetNumberOfLeaves() VTK_OVERRIDE
+ vtkIdType GetNumberOfLeaves() override
{
return static_cast<vtkIdType>(this->LeafParent.size());
}
@@ -719,7 +719,7 @@ public:
// Description:
// Return the number of levels.
// \post result_greater_or_equal_to_one: result>=1
- vtkIdType GetNumberOfLevels() VTK_OVERRIDE
+ vtkIdType GetNumberOfLevels() override
{
assert("post: result_greater_or_equal_to_one" && this->NumberOfLevels>=1);
return this->NumberOfLevels;
@@ -747,7 +747,7 @@ public:
//---------------------------------------------------------------------------
// Description:
// Public only for the vtkCompactHyperOctreeCursor.
- int GetNumberOfNodes() VTK_OVERRIDE
+ int GetNumberOfNodes() override
{
assert("post: not_empty" && !this->Nodes.empty());
return static_cast<int>(this->Nodes.size());
@@ -759,7 +759,7 @@ public:
// At the end, cursor points on the node that used to be leaf.
// \pre leaf_exists: leaf!=0
// \pre is_a_leaf: leaf->CurrentIsLeaf()
- void SubdivideLeaf(vtkHyperOctreeCursor *leaf) VTK_OVERRIDE
+ void SubdivideLeaf(vtkHyperOctreeCursor *leaf) override
{
assert("pre: leaf_exists" && leaf!=nullptr);
assert("pre: is_a_leaf" && leaf->CurrentIsLeaf());
@@ -832,7 +832,7 @@ public:
// \pre node_exists: node!=0
// \pre node_is_node: !node->CurrentIsLeaf()
// \pre children_are_leaves: node->CurrentIsTerminalNode()
- void CollapseTerminalNode(vtkHyperOctreeCursor *node) VTK_OVERRIDE
+ void CollapseTerminalNode(vtkHyperOctreeCursor *node) override
{
assert("pre: node_exists" && node!=nullptr);
assert("pre: node_is_node" && !node->CurrentIsLeaf());
@@ -852,7 +852,7 @@ public:
}
//---------------------------------------------------------------------------
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE
+ void PrintSelf(ostream& os, vtkIndent indent) override
{
this->Superclass::PrintSelf(os,indent);
@@ -886,7 +886,7 @@ public:
//---------------------------------------------------------------------------
// Description:
// Set the internal attributes.
- void SetAttributes(vtkDataSetAttributes *attributes) VTK_OVERRIDE
+ void SetAttributes(vtkDataSetAttributes *attributes) override
{
assert("pre: attributes_exist" && attributes!=nullptr);
if(this->Attributes!=attributes)
@@ -904,7 +904,7 @@ public:
// Description:
// Return memory used in kibibytes (1024 bytes).
// Ignore the attribute array because its size is added by the data set.
- unsigned int GetActualMemorySize() VTK_OVERRIDE
+ unsigned int GetActualMemorySize() override
{
size_t size;
size = sizeof(int) * this->GetNumberOfLeaves();
diff --git a/Common/DataModel/vtkHyperOctree.h b/Common/DataModel/vtkHyperOctree.h
index 65ce9cb579e14f9cd6b98f836ebece83a5ea0766..9e68efbbd114610b26be37bbbe774d6624cfd8ba 100644
--- a/Common/DataModel/vtkHyperOctree.h
+++ b/Common/DataModel/vtkHyperOctree.h
@@ -149,18 +149,18 @@ public:
static vtkHyperOctree *New();
vtkTypeMacro(vtkHyperOctree,vtkDataSet);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Return what type of dataset this is.
*/
- int GetDataObjectType() VTK_OVERRIDE;
+ int GetDataObjectType() override;
/**
* Copy the geometric and topological structure of an input rectilinear grid
* object.
*/
- void CopyStructure(vtkDataSet *ds) VTK_OVERRIDE;
+ void CopyStructure(vtkDataSet *ds) override;
// Return the node describes by the path from the root.
// Path is a sequence of number between 0 and 7.
@@ -197,7 +197,7 @@ public:
* Return the number of cells in the dual grid.
* \post positive_result: result>=0
*/
- vtkIdType GetNumberOfCells() VTK_OVERRIDE;
+ vtkIdType GetNumberOfCells() override;
/**
* Get the number of leaves in the tree.
@@ -208,7 +208,7 @@ public:
* Return the number of points in the dual grid.
* \post positive_result: result>=0
*/
- vtkIdType GetNumberOfPoints() VTK_OVERRIDE;
+ vtkIdType GetNumberOfPoints() override;
/**
* Return the number of points corresponding to an hyperoctree starting at
@@ -301,7 +301,7 @@ public:
* Get point coordinates with ptId such that: 0 <= ptId < NumberOfPoints.
* THIS METHOD IS NOT THREAD SAFE.
*/
- double *GetPoint(vtkIdType ptId) VTK_OVERRIDE;
+ double *GetPoint(vtkIdType ptId) override;
/**
* Copy point coordinates into user provided array x[3] for specified
@@ -309,14 +309,14 @@ public:
* THIS METHOD IS THREAD SAFE IF FIRST CALLED FROM A SINGLE THREAD AND
* THE DATASET IS NOT MODIFIED
*/
- void GetPoint(vtkIdType id, double x[3]) VTK_OVERRIDE;
+ void GetPoint(vtkIdType id, double x[3]) override;
/**
* Get cell with cellId such that: 0 <= cellId < NumberOfCells.
* THIS METHOD IS NOT THREAD SAFE.
*/
using vtkDataSet::GetCell;
- vtkCell *GetCell(vtkIdType cellId) VTK_OVERRIDE;
+ vtkCell *GetCell(vtkIdType cellId) override;
/**
* Get cell with cellId such that: 0 <= cellId < NumberOfCells.
@@ -325,7 +325,7 @@ public:
* THIS METHOD IS THREAD SAFE IF FIRST CALLED FROM A SINGLE THREAD AND
* THE DATASET IS NOT MODIFIED
*/
- void GetCell(vtkIdType cellId, vtkGenericCell *cell) VTK_OVERRIDE;
+ void GetCell(vtkIdType cellId, vtkGenericCell *cell) override;
/**
@@ -333,7 +333,7 @@ public:
* THIS METHOD IS THREAD SAFE IF FIRST CALLED FROM A SINGLE THREAD AND
* THE DATASET IS NOT MODIFIED
*/
- int GetCellType(vtkIdType cellId) VTK_OVERRIDE;
+ int GetCellType(vtkIdType cellId) override;
//@{
/**
@@ -341,7 +341,7 @@ public:
* THIS METHOD IS THREAD SAFE IF FIRST CALLED FROM A SINGLE THREAD AND
* THE DATASET IS NOT MODIFIED
*/
- void GetCellPoints(vtkIdType cellId, vtkIdList *ptIds) VTK_OVERRIDE;
+ void GetCellPoints(vtkIdType cellId, vtkIdList *ptIds) override;
virtual void GetCellPoints(vtkIdType cellId, vtkIdType& npts,
vtkIdType* &pts);
//@}
@@ -351,7 +351,7 @@ public:
* THIS METHOD IS THREAD SAFE IF FIRST CALLED FROM A SINGLE THREAD AND
* THE DATASET IS NOT MODIFIED
*/
- void GetPointCells(vtkIdType ptId, vtkIdList *cellIds) VTK_OVERRIDE;
+ void GetPointCells(vtkIdType ptId, vtkIdList *cellIds) override;
/**
@@ -362,9 +362,9 @@ public:
* THE DATASET IS NOT MODIFIED
*/
void GetCellNeighbors(vtkIdType cellId, vtkIdList *ptIds,
- vtkIdList *cellIds) VTK_OVERRIDE;
+ vtkIdList *cellIds) override;
- vtkIdType FindPoint(double x[3]) VTK_OVERRIDE;
+ vtkIdType FindPoint(double x[3]) override;
/**
* Locate cell based on global coordinate x and tolerance
@@ -379,7 +379,7 @@ public:
*/
vtkIdType FindCell(double x[3], vtkCell *cell, vtkIdType cellId,
double tol2, int& subId, double pcoords[3],
- double *weights) VTK_OVERRIDE;
+ double *weights) override;
/**
* This is a version of the above method that can be used with
@@ -391,13 +391,13 @@ public:
vtkIdType FindCell(double x[3], vtkCell *cell,
vtkGenericCell *gencell, vtkIdType cellId,
double tol2, int& subId, double pcoords[3],
- double *weights) VTK_OVERRIDE;
+ double *weights) override;
/**
* Restore data object to initial state,
* THIS METHOD IS NOT THREAD SAFE.
*/
- void Initialize() VTK_OVERRIDE;
+ void Initialize() override;
/**
* Convenience method returns largest cell size in dataset. This is generally
@@ -405,14 +405,14 @@ public:
* This is the number of points of a cell.
* THIS METHOD IS THREAD SAFE
*/
- int GetMaxCellSize() VTK_OVERRIDE;
+ int GetMaxCellSize() override;
//@{
/**
* Shallow and Deep copy.
*/
- void ShallowCopy(vtkDataObject *src) VTK_OVERRIDE;
- void DeepCopy(vtkDataObject *src) VTK_OVERRIDE;
+ void ShallowCopy(vtkDataObject *src) override;
+ void DeepCopy(vtkDataObject *src) override;
//@}
/**
@@ -531,7 +531,7 @@ public:
* arrays, etc. are not included in the return value). THIS METHOD
* IS THREAD SAFE.
*/
- unsigned long GetActualMemorySize() VTK_OVERRIDE;
+ unsigned long GetActualMemorySize() override;
//@{
/**
@@ -544,9 +544,9 @@ public:
protected:
// Constructor with default bounds (0,1, 0,1, 0,1).
vtkHyperOctree();
- ~vtkHyperOctree() VTK_OVERRIDE;
+ ~vtkHyperOctree() override;
- void ComputeBounds() VTK_OVERRIDE;
+ void ComputeBounds() override;
int Dimension; // 1, 2 or 3.
diff --git a/Common/DataModel/vtkHyperOctreeCursor.h b/Common/DataModel/vtkHyperOctreeCursor.h
index caf313cb61fe3641e4adb65d4572a689d84c97da..b78944596f1ddf6996341a4e09d88ce80436dc99 100644
--- a/Common/DataModel/vtkHyperOctreeCursor.h
+++ b/Common/DataModel/vtkHyperOctreeCursor.h
@@ -52,7 +52,7 @@ class VTKCOMMONDATAMODEL_EXPORT vtkHyperOctreeCursor : public vtkObject
{
public:
vtkTypeMacro(vtkHyperOctreeCursor,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Return the index of the current leaf in the data arrays.
@@ -177,7 +177,7 @@ public:
protected:
// Constructor.
vtkHyperOctreeCursor();
- ~vtkHyperOctreeCursor() VTK_OVERRIDE;
+ ~vtkHyperOctreeCursor() override;
private:
vtkHyperOctreeCursor(const vtkHyperOctreeCursor&) VTK_DELETE_FUNCTION;
void operator=(const vtkHyperOctreeCursor&) VTK_DELETE_FUNCTION;
diff --git a/Common/DataModel/vtkHyperOctreePointsGrabber.h b/Common/DataModel/vtkHyperOctreePointsGrabber.h
index 0be09119d0ede0597d93336e0d235ec4cfbdffb1..567b6cd966692757273a1fa35a3fa6af74b4c500 100644
--- a/Common/DataModel/vtkHyperOctreePointsGrabber.h
+++ b/Common/DataModel/vtkHyperOctreePointsGrabber.h
@@ -36,7 +36,7 @@ class VTKCOMMONDATAMODEL_EXPORT vtkHyperOctreePointsGrabber : public vtkObject
{
public:
vtkTypeMacro(vtkHyperOctreePointsGrabber,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Return the dimension of the hyperoctree.
@@ -89,7 +89,7 @@ public:
protected:
// Constructor with default bounds (0,1, 0,1, 0,1).
vtkHyperOctreePointsGrabber();
- ~vtkHyperOctreePointsGrabber() VTK_OVERRIDE;
+ ~vtkHyperOctreePointsGrabber() override;
int Dimension;
diff --git a/Common/DataModel/vtkHyperTree.cxx b/Common/DataModel/vtkHyperTree.cxx
index 94dfa0b8db592a89575739902d35a7ef382517d6..8efe6eab5f6f75998480e58af620f1d94e70dd5a 100644
--- a/Common/DataModel/vtkHyperTree.cxx
+++ b/Common/DataModel/vtkHyperTree.cxx
@@ -48,44 +48,44 @@ public:
static vtkCompactHyperTreeCursor<N>* New();
//---------------------------------------------------------------------------
- void SetTree( vtkHyperTree* tree ) VTK_OVERRIDE
+ void SetTree( vtkHyperTree* tree ) override
{
this->Tree = vtkCompactHyperTree<N>::SafeDownCast( tree );
}
//---------------------------------------------------------------------------
- vtkHyperTree* GetTree() VTK_OVERRIDE
+ vtkHyperTree* GetTree() override
{
return this->Tree;
}
//---------------------------------------------------------------------------
- vtkIdType GetVertexId() VTK_OVERRIDE
+ vtkIdType GetVertexId() override
{
return this->Index;
}
//---------------------------------------------------------------------------
- bool IsLeaf() VTK_OVERRIDE
+ bool IsLeaf() override
{
return this->Leaf;
}
//---------------------------------------------------------------------------
- bool IsRoot() VTK_OVERRIDE
+ bool IsRoot() override
{
// No special null cursor exists with this object
return ( this->Index == 0 );
}
//---------------------------------------------------------------------------
- unsigned int GetLevel() VTK_OVERRIDE
+ unsigned int GetLevel() override
{
return static_cast<unsigned int>( this->ChildHistory.size() );
}
//---------------------------------------------------------------------------
- int GetChildIndex() VTK_OVERRIDE
+ int GetChildIndex() override
{
assert( "post: valid_range" && this->ChildIndex >= 0 &&
this->ChildIndex < GetNumberOfChildren() );
@@ -93,7 +93,7 @@ public:
}
//---------------------------------------------------------------------------
- void ToRoot() VTK_OVERRIDE
+ void ToRoot() override
{
// No special null cursor exists with this object
this->Index = 0;
@@ -106,7 +106,7 @@ public:
}
//---------------------------------------------------------------------------
- void ToParent() VTK_OVERRIDE
+ void ToParent() override
{
assert( "pre: not_root" && ! IsRoot() );
@@ -125,7 +125,7 @@ public:
}
//---------------------------------------------------------------------------
- void ToChild( int child ) VTK_OVERRIDE
+ void ToChild( int child ) override
{
assert( "pre: not_leaf" && ! this->IsLeaf() );
assert( "pre: valid_child" && child >= 0
@@ -151,7 +151,7 @@ public:
}
//---------------------------------------------------------------------------
- void ToSameVertex( vtkHyperTreeCursor* other ) VTK_OVERRIDE
+ void ToSameVertex( vtkHyperTreeCursor* other ) override
{
assert( "pre: other_exists" && other != nullptr );
assert( "pre: same_hyperTree" && this->SameTree( other ) );
@@ -169,7 +169,7 @@ public:
}
//--------------------------------------------------------------------------
- bool IsEqual( vtkHyperTreeCursor* other ) VTK_OVERRIDE
+ bool IsEqual( vtkHyperTreeCursor* other ) override
{
assert( "pre: other_exists" && other != nullptr );
assert( "pre: same_hyperTree" && this->SameTree(other) );
@@ -190,7 +190,7 @@ public:
}
//--------------------------------------------------------------------------
- vtkHyperTreeCursor* Clone() VTK_OVERRIDE
+ vtkHyperTreeCursor* Clone() override
{
vtkCompactHyperTreeCursor<N>* result = this->NewInstance();
assert( "post: results_exists" && result != nullptr );
@@ -200,7 +200,7 @@ public:
}
//---------------------------------------------------------------------------
- int SameTree( vtkHyperTreeCursor* other ) VTK_OVERRIDE
+ int SameTree( vtkHyperTreeCursor* other ) override
{
assert( "pre: other_exists" && other != nullptr );
vtkCompactHyperTreeCursor<N> *o =
@@ -209,13 +209,13 @@ public:
}
//---------------------------------------------------------------------------
- int GetNumberOfChildren() VTK_OVERRIDE
+ int GetNumberOfChildren() override
{
return N;
}
//---------------------------------------------------------------------------
- int GetDimension() VTK_OVERRIDE
+ int GetDimension() override
{
assert( "post: positive_result " && this->Dimension > 0 );
assert( "post: up_to_3 " && this->Dimension <= 3 ); // and then
@@ -248,7 +248,7 @@ public:
}
//---------------------------------------------------------------------------
- void PrintSelf( ostream& os, vtkIndent indent ) VTK_OVERRIDE
+ void PrintSelf( ostream& os, vtkIndent indent ) override
{
this->Superclass::PrintSelf( os, indent );
@@ -509,7 +509,7 @@ public:
static vtkCompactHyperTree<N>* New();
//---------------------------------------------------------------------------
- void PrintSelf( ostream& os, vtkIndent indent ) VTK_OVERRIDE
+ void PrintSelf( ostream& os, vtkIndent indent ) override
{
this->Superclass::PrintSelf( os, indent );
@@ -547,7 +547,7 @@ public:
}
//---------------------------------------------------------------------------
- void Initialize() VTK_OVERRIDE
+ void Initialize() override
{
this->Nodes.resize( 1 );
this->Nodes[0].SetParent( 0 );
@@ -568,7 +568,7 @@ public:
}
//---------------------------------------------------------------------------
- vtkHyperTreeCursor* NewCursor() VTK_OVERRIDE
+ vtkHyperTreeCursor* NewCursor() override
{
vtkCompactHyperTreeCursor<N>* result = vtkCompactHyperTreeCursor<N>::New();
result->SetTree( this );
@@ -577,78 +577,78 @@ public:
}
//---------------------------------------------------------------------------
- ~vtkCompactHyperTree() VTK_OVERRIDE
+ ~vtkCompactHyperTree() override
{
}
//---------------------------------------------------------------------------
- int GetBranchFactor() VTK_OVERRIDE
+ int GetBranchFactor() override
{
return this->BranchFactor;
}
//---------------------------------------------------------------------------
- int GetDimension() VTK_OVERRIDE
+ int GetDimension() override
{
return this->Dimension;
}
//---------------------------------------------------------------------------
- void SetScale( double s[3] ) VTK_OVERRIDE
+ void SetScale( double s[3] ) override
{
memcpy( this->Scale, s, 3 * sizeof( double ) );
}
//---------------------------------------------------------------------------
- void GetScale( double s[3] ) VTK_OVERRIDE
+ void GetScale( double s[3] ) override
{
memcpy( s, this->Scale, 3 * sizeof( double ) );
}
//---------------------------------------------------------------------------
- double GetScale( unsigned int d ) VTK_OVERRIDE
+ double GetScale( unsigned int d ) override
{
return this->Scale[d];
}
//---------------------------------------------------------------------------
- vtkIdType GetNumberOfLevels() VTK_OVERRIDE
+ vtkIdType GetNumberOfLevels() override
{
return this->NumberOfLevels;
}
//---------------------------------------------------------------------------
- vtkIdType GetNumberOfChildren() VTK_OVERRIDE
+ vtkIdType GetNumberOfChildren() override
{
return N;
}
//---------------------------------------------------------------------------
- vtkIdType GetNumberOfVertices() VTK_OVERRIDE
+ vtkIdType GetNumberOfVertices() override
{
return static_cast<vtkIdType>( this->ParentIndex.size() );
}
//---------------------------------------------------------------------------
- vtkIdType GetNumberOfNodes() VTK_OVERRIDE
+ vtkIdType GetNumberOfNodes() override
{
return this->NumberOfNodes;
}
//---------------------------------------------------------------------------
- vtkIdType GetNumberOfLeaves() VTK_OVERRIDE
+ vtkIdType GetNumberOfLeaves() override
{
return static_cast<vtkIdType>( this->ParentIndex.size() ) - this->NumberOfNodes;
}
//---------------------------------------------------------------------------
- void SetGlobalIndexStart( vtkIdType start ) VTK_OVERRIDE
+ void SetGlobalIndexStart( vtkIdType start ) override
{
this->GlobalIndexStart = start;
}
//---------------------------------------------------------------------------
- void SetGlobalIndexFromLocal( vtkIdType local, vtkIdType global ) VTK_OVERRIDE
+ void SetGlobalIndexFromLocal( vtkIdType local, vtkIdType global ) override
{
// If local index outside map range, resize the latter
if ( static_cast<vtkIdType>( this->GlobalIndexTable.size() ) <= local )
@@ -668,7 +668,7 @@ public:
}
//---------------------------------------------------------------------------
- vtkIdType GetGlobalIndexFromLocal( vtkIdType local ) VTK_OVERRIDE
+ vtkIdType GetGlobalIndexFromLocal( vtkIdType local ) override
{
// If local index outside map range, return global index start + local
return ( local < static_cast<vtkIdType>( this->GlobalIndexTable.size() ) ) ?
@@ -703,7 +703,7 @@ public:
}
//---------------------------------------------------------------------------
- void SubdivideLeaf( vtkHyperTreeCursor* leafCursor ) VTK_OVERRIDE
+ void SubdivideLeaf( vtkHyperTreeCursor* leafCursor ) override
{
assert( "pre: leaf_exists" && leafCursor != nullptr );
assert( "pre: is_a_leaf" && leafCursor->IsLeaf() );
@@ -759,7 +759,7 @@ public:
}
//---------------------------------------------------------------------------
- unsigned int GetActualMemorySize() VTK_OVERRIDE
+ unsigned int GetActualMemorySize() override
{
size_t size = sizeof( vtkIdType ) * this->GetNumberOfVertices()
+ sizeof( vtkCompactHyperTreeNode<N> ) * this->GetNumberOfNodes()
diff --git a/Common/DataModel/vtkHyperTree.h b/Common/DataModel/vtkHyperTree.h
index 6f071baeedd791f6a6d7b0bc28bcbaf979841923..8b8546613e745811a3c82b040a31d1074da425e8 100644
--- a/Common/DataModel/vtkHyperTree.h
+++ b/Common/DataModel/vtkHyperTree.h
@@ -143,7 +143,7 @@ class VTKCOMMONDATAMODEL_EXPORT vtkHyperTree : public vtkObject
{
public:
vtkTypeMacro(vtkHyperTree, vtkObject);
- void PrintSelf( ostream&, vtkIndent ) VTK_OVERRIDE;
+ void PrintSelf( ostream&, vtkIndent ) override;
/**
* Restore the initial state: only one node and one leaf: the root.
diff --git a/Common/DataModel/vtkHyperTreeCursor.h b/Common/DataModel/vtkHyperTreeCursor.h
index 7cb8e02a2d4ae84f97b8bee072621e2b6ded16dd..6c10aa028c80e1cab90a52ba2d08ad3d4837f06e 100644
--- a/Common/DataModel/vtkHyperTreeCursor.h
+++ b/Common/DataModel/vtkHyperTreeCursor.h
@@ -43,7 +43,7 @@ class VTKCOMMONDATAMODEL_EXPORT vtkHyperTreeCursor : public vtkObject
{
public:
vtkTypeMacro(vtkHyperTreeCursor,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Set the HyperTree to which the cursor is pointing.
@@ -146,7 +146,7 @@ public:
protected:
// Constructor
vtkHyperTreeCursor();
- ~vtkHyperTreeCursor() VTK_OVERRIDE;
+ ~vtkHyperTreeCursor() override;
private:
vtkHyperTreeCursor(const vtkHyperTreeCursor&) VTK_DELETE_FUNCTION;
diff --git a/Common/DataModel/vtkHyperTreeGrid.cxx b/Common/DataModel/vtkHyperTreeGrid.cxx
index 2f2909bf9f4539357581a2491408c220a313b05d..532ffce7489bb6a0a0aa3e0732f00c5e6e98fced 100644
--- a/Common/DataModel/vtkHyperTreeGrid.cxx
+++ b/Common/DataModel/vtkHyperTreeGrid.cxx
@@ -78,7 +78,7 @@ public:
static vtkGeometricCursor<N>* New();
//---------------------------------------------------------------------------
- void PrintSelf( ostream& os, vtkIndent indent ) VTK_OVERRIDE
+ void PrintSelf( ostream& os, vtkIndent indent ) override
{
this->Superclass::PrintSelf( os, indent );
@@ -98,7 +98,7 @@ public:
}
//---------------------------------------------------------------------------
- vtkHyperTreeGridCursor* Clone() VTK_OVERRIDE
+ vtkHyperTreeGridCursor* Clone() override
{
// Call superclass
vtkGeometricCursor<N>* clone
@@ -116,7 +116,7 @@ public:
}
//---------------------------------------------------------------------------
- void Initialize( vtkHyperTreeGrid* grid, vtkIdType index ) VTK_OVERRIDE
+ void Initialize( vtkHyperTreeGrid* grid, vtkIdType index ) override
{
// Call superclass
this->Superclass::Initialize( grid, index );
@@ -142,7 +142,7 @@ public:
}
//---------------------------------------------------------------------------
- void ToRoot() VTK_OVERRIDE
+ void ToRoot() override
{
// Call superclass
this->Superclass::ToRoot();
@@ -162,7 +162,7 @@ public:
}
//---------------------------------------------------------------------------
- void ToChild( int child ) VTK_OVERRIDE
+ void ToChild( int child ) override
{
// Call superclass
this->Superclass::ToChild( child );
@@ -250,19 +250,19 @@ public:
}
//---------------------------------------------------------------------------
- double* GetOrigin() VTK_OVERRIDE
+ double* GetOrigin() override
{
return this->Origin;
}
//---------------------------------------------------------------------------
- double* GetSize() VTK_OVERRIDE
+ double* GetSize() override
{
return this->Size;
}
//---------------------------------------------------------------------------
- void GetBounds( double bnd[6] ) VTK_OVERRIDE
+ void GetBounds( double bnd[6] ) override
{
// Compute bounds
bnd[0] = this->Origin[0];
@@ -274,7 +274,7 @@ public:
}
//---------------------------------------------------------------------------
- void GetPoint( double pt[3] ) VTK_OVERRIDE
+ void GetPoint( double pt[3] ) override
{
// Compute center point coordinates
pt[0] = this->Origin[0] + this->Size[0] / 2.;
@@ -333,7 +333,7 @@ public:
vtkTemplateTypeMacro(vtkSuperCursor<N>,vtkGeometricCursor<N>);
//---------------------------------------------------------------------------
- void PrintSelf( ostream& os, vtkIndent indent ) VTK_OVERRIDE
+ void PrintSelf( ostream& os, vtkIndent indent ) override
{
this->Superclass::PrintSelf( os, indent );
@@ -353,7 +353,7 @@ public:
}
//---------------------------------------------------------------------------
- vtkHyperTreeGridCursor* Clone() VTK_OVERRIDE
+ vtkHyperTreeGridCursor* Clone() override
{
// Call superclass
vtkSuperCursor<N>* clone
@@ -368,7 +368,7 @@ public:
virtual void ResetSuperCursor() = 0;
//---------------------------------------------------------------------------
- void Initialize( vtkHyperTreeGrid* grid, vtkIdType index ) VTK_OVERRIDE
+ void Initialize( vtkHyperTreeGrid* grid, vtkIdType index ) override
{
// Call superclass
this->Superclass::Initialize( grid, index );
@@ -378,13 +378,13 @@ public:
}
//---------------------------------------------------------------------------
- unsigned int GetNumberOfCursors() VTK_OVERRIDE
+ unsigned int GetNumberOfCursors() override
{
return this->NumberOfCursors;
}
//---------------------------------------------------------------------------
- vtkHyperTreeGridCursor* GetCursor( unsigned int i ) VTK_OVERRIDE
+ vtkHyperTreeGridCursor* GetCursor( unsigned int i ) override
{
return this->Cursors[i];
}
@@ -396,7 +396,7 @@ public:
}
//---------------------------------------------------------------------------
- void ToChild( int child ) VTK_OVERRIDE
+ void ToChild( int child ) override
{
// Call superclass
this->Superclass::ToChild( child );
@@ -643,7 +643,7 @@ public:
static vtkVonNeumannSuperCursor<N>* New();
//---------------------------------------------------------------------------
- ~vtkVonNeumannSuperCursor() VTK_OVERRIDE
+ ~vtkVonNeumannSuperCursor() override
{
if ( this->Cursors )
{
@@ -662,7 +662,7 @@ public:
}
//---------------------------------------------------------------------------
- vtkHyperTreeGridCursor* Clone() VTK_OVERRIDE
+ vtkHyperTreeGridCursor* Clone() override
{
// Call superclass
vtkVonNeumannSuperCursor<N>* clone
@@ -681,7 +681,7 @@ public:
}
//---------------------------------------------------------------------------
- void ResetSuperCursor() VTK_OVERRIDE
+ void ResetSuperCursor() override
{
// Create hyper tree grid cursors for von Neumann neighborhood
for ( unsigned int i = 0; i < this->NumberOfCursors; ++ i )
@@ -1108,7 +1108,7 @@ public:
static vtkMooreSuperCursor<N>* New();
//---------------------------------------------------------------------------
- ~vtkMooreSuperCursor() VTK_OVERRIDE
+ ~vtkMooreSuperCursor() override
{
if ( this->Cursors )
{
@@ -1127,7 +1127,7 @@ public:
}
//---------------------------------------------------------------------------
- vtkHyperTreeGridCursor* Clone() VTK_OVERRIDE
+ vtkHyperTreeGridCursor* Clone() override
{
// Call superclass
vtkMooreSuperCursor<N>* clone
@@ -1146,7 +1146,7 @@ public:
}
//---------------------------------------------------------------------------
- void ResetSuperCursor() VTK_OVERRIDE
+ void ResetSuperCursor() override
{
#define vtkInitializeAsGeometricCursorMacro( _N_, _c_, _g_, _r_ ) \
{ \
@@ -1287,7 +1287,7 @@ public:
}
//---------------------------------------------------------------------------
- bool GetCornerCursors( unsigned int c, unsigned int l, vtkIdList* leaves ) VTK_OVERRIDE
+ bool GetCornerCursors( unsigned int c, unsigned int l, vtkIdList* leaves ) override
{
unsigned int cursorIdx = 0;
unsigned int centerCursorIdx = 0;
diff --git a/Common/DataModel/vtkHyperTreeGrid.h b/Common/DataModel/vtkHyperTreeGrid.h
index 349c7349c86738682a2aa6c810d594da485dc272..3cb55a85beea27e2de5a2d87af4bd3b6323e7343 100644
--- a/Common/DataModel/vtkHyperTreeGrid.h
+++ b/Common/DataModel/vtkHyperTreeGrid.h
@@ -78,18 +78,18 @@ public:
static vtkHyperTreeGrid* New();
vtkTypeMacro(vtkHyperTreeGrid, vtkDataSet);
- void PrintSelf( ostream&, vtkIndent ) VTK_OVERRIDE;
+ void PrintSelf( ostream&, vtkIndent ) override;
/**
* Return what type of dataset this is.
*/
- int GetDataObjectType() VTK_OVERRIDE;
+ int GetDataObjectType() override;
/**
* Copy the internal geometric and topological structure of a
* vtkHyperTreeGrid object.
*/
- void CopyStructure( vtkDataSet* ) VTK_OVERRIDE;
+ void CopyStructure( vtkDataSet* ) override;
//@{
/**
@@ -166,12 +166,12 @@ public:
/**
* Return the number of cells in the dual grid.
*/
- vtkIdType GetNumberOfCells() VTK_OVERRIDE;
+ vtkIdType GetNumberOfCells() override;
/**
* Return the number of points in the dual grid.
*/
- vtkIdType GetNumberOfPoints() VTK_OVERRIDE;
+ vtkIdType GetNumberOfPoints() override;
/**
* Return the number of levels in an individual (primal) tree.
@@ -322,7 +322,7 @@ public:
* Get point coordinates with ptId such that: 0 <= ptId < NumberOfPoints.
* THIS METHOD IS NOT THREAD SAFE.
*/
- double* GetPoint( vtkIdType ) VTK_OVERRIDE;
+ double* GetPoint( vtkIdType ) override;
/**
* This method should be avoided in favor of cell/point iterators.
@@ -332,7 +332,7 @@ public:
* THIS METHOD IS THREAD SAFE IF FIRST CALLED FROM A SINGLE THREAD AND
* THE DATASET IS NOT MODIFIED
*/
- void GetPoint( vtkIdType, double[3] ) VTK_OVERRIDE;
+ void GetPoint( vtkIdType, double[3] ) override;
/**
* This method should be avoided in favor of cell/point iterators.
@@ -340,13 +340,13 @@ public:
* Get cell with cellId such that: 0 <= cellId < NumberOfCells.
* THIS METHOD IS NOT THREAD SAFE.
*/
- vtkCell* GetCell( vtkIdType ) VTK_OVERRIDE;
+ vtkCell* GetCell( vtkIdType ) override;
/**
* Overridden so as no not unintentionally hide parent class.
* See -Woverloaded-virtual
*/
- vtkCell* GetCell( int i, int j, int k) VTK_OVERRIDE {
+ vtkCell* GetCell( int i, int j, int k) override {
return this->Superclass::GetCell(i,j,k);
};
@@ -359,7 +359,7 @@ public:
* THIS METHOD IS THREAD SAFE IF FIRST CALLED FROM A SINGLE THREAD AND
* THE DATASET IS NOT MODIFIED
*/
- void GetCell( vtkIdType, vtkGenericCell* ) VTK_OVERRIDE;
+ void GetCell( vtkIdType, vtkGenericCell* ) override;
/**
* All cell types are 2: quadrilaters,3d: hexahedrons. They may be degenerate though.
@@ -367,7 +367,7 @@ public:
* THIS METHOD IS THREAD SAFE IF FIRST CALLED FROM A SINGLE THREAD AND
* THE DATASET IS NOT MODIFIED
*/
- int GetCellType( vtkIdType ) VTK_OVERRIDE;
+ int GetCellType( vtkIdType ) override;
/**
* This method should be avoided in favor of cell/point iterators.
@@ -376,7 +376,7 @@ public:
* THIS METHOD IS THREAD SAFE IF FIRST CALLED FROM A SINGLE THREAD AND
* THE DATASET IS NOT MODIFIED
*/
- void GetCellPoints( vtkIdType, vtkIdList* ) VTK_OVERRIDE;
+ void GetCellPoints( vtkIdType, vtkIdList* ) override;
/**
* Return a pointer to a list of point ids defining cell.
@@ -391,7 +391,7 @@ public:
* THIS METHOD IS THREAD SAFE IF FIRST CALLED FROM A SINGLE THREAD AND
* THE DATASET IS NOT MODIFIED
*/
- void GetPointCells( vtkIdType, vtkIdList* ) VTK_OVERRIDE;
+ void GetPointCells( vtkIdType, vtkIdList* ) override;
/**
* This method should be avoided in favor of cell/point iterators.
@@ -403,7 +403,7 @@ public:
* THIS METHOD IS THREAD SAFE IF FIRST CALLED FROM A SINGLE THREAD AND
* THE DATASET IS NOT MODIFIED
*/
- void GetCellNeighbors( vtkIdType, vtkIdList*, vtkIdList* ) VTK_OVERRIDE;
+ void GetCellNeighbors( vtkIdType, vtkIdList*, vtkIdList* ) override;
/**
* Find cell to which this point belongs, or at least closest one,
@@ -411,7 +411,7 @@ public:
* Since dual points are leaves, use the structure of the Tree instead
* of a point locator.
*/
- vtkIdType FindPoint( double x[3] ) VTK_OVERRIDE;
+ vtkIdType FindPoint( double x[3] ) override;
/**
* Locate cell based on global coordinate x and tolerance
@@ -428,7 +428,7 @@ public:
*/
vtkIdType FindCell( double x[3], vtkCell *cell, vtkIdType cellId,
double tol2, int& subId, double pcoords[3],
- double *weights ) VTK_OVERRIDE;
+ double *weights ) override;
/**
* This is a version of the above method that can be used with
@@ -440,12 +440,12 @@ public:
vtkIdType FindCell( double x[3], vtkCell *cell,
vtkGenericCell *gencell, vtkIdType cellId,
double tol2, int& subId, double pcoords[3],
- double *weights ) VTK_OVERRIDE;
+ double *weights ) override;
/**
* Restore data object to initial state.
*/
- void Initialize() VTK_OVERRIDE;
+ void Initialize() override;
/**
* Return tree located at given index of hyper tree grid
@@ -471,22 +471,22 @@ public:
* This is the number of points of a cell.
* THIS METHOD IS THREAD SAFE
*/
- int GetMaxCellSize() VTK_OVERRIDE;
+ int GetMaxCellSize() override;
/**
* Create shallow copy of hyper tree grid.
*/
- void ShallowCopy( vtkDataObject* ) VTK_OVERRIDE;
+ void ShallowCopy( vtkDataObject* ) override;
/**
* Create deep copy of hyper tree grid.
*/
- void DeepCopy( vtkDataObject* ) VTK_OVERRIDE;
+ void DeepCopy( vtkDataObject* ) override;
/**
* Structured extent. The extent type is a 3D extent.
*/
- int GetExtentType() VTK_OVERRIDE { return VTK_3D_EXTENT; }
+ int GetExtentType() override { return VTK_3D_EXTENT; }
/**
* Return the actual size of the data in kibibytes (1024 bytes). This number
@@ -496,7 +496,7 @@ public:
* arrays, etc. are not included in the return value). THIS METHOD
* IS THREAD SAFE.
*/
- unsigned long GetActualMemorySize() VTK_OVERRIDE;
+ unsigned long GetActualMemorySize() override;
//@{
/**
@@ -691,9 +691,9 @@ protected:
/**
* Destructor
*/
- ~vtkHyperTreeGrid() VTK_OVERRIDE;
+ ~vtkHyperTreeGrid() override;
- void ComputeBounds() VTK_OVERRIDE;
+ void ComputeBounds() override;
/**
* Traverse tree with 3x3x3 super cursor. Center cursor generates dual point.
diff --git a/Common/DataModel/vtkHyperTreeGridCursor.h b/Common/DataModel/vtkHyperTreeGridCursor.h
index 96ada1c18f0f5101645dc4c9c68ded047aeb30b2..901ca41f294025dc854ee554ed0176741ef38215 100644
--- a/Common/DataModel/vtkHyperTreeGridCursor.h
+++ b/Common/DataModel/vtkHyperTreeGridCursor.h
@@ -46,14 +46,14 @@ class VTKCOMMONDATAMODEL_EXPORT vtkHyperTreeGridCursor : public vtkHyperTreeCurs
{
public:
vtkTypeMacro(vtkHyperTreeGridCursor, vtkHyperTreeCursor);
- void PrintSelf( ostream& os, vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf( ostream& os, vtkIndent indent ) override;
static vtkHyperTreeGridCursor* New();
/**
* Create a copy of `this'.
* \post results_exists:result!=0
*/
- vtkHyperTreeGridCursor* Clone() VTK_OVERRIDE;
+ vtkHyperTreeGridCursor* Clone() override;
/**
* Initialize cursor at root of given tree index in grid.
@@ -72,15 +72,15 @@ public:
/**
* Set the hyper tree to which the cursor is pointing.
*/
- void SetTree( vtkHyperTree* ) VTK_OVERRIDE;
- vtkHyperTree* GetTree() VTK_OVERRIDE {return this->Tree;};
+ void SetTree( vtkHyperTree* ) override;
+ vtkHyperTree* GetTree() override {return this->Tree;};
//vtkGetObjectMacro(Tree,vtkHyperTree);
//@}
/**
* Return the index of the current vertex in the tree.
*/
- vtkIdType GetVertexId() VTK_OVERRIDE;
+ vtkIdType GetVertexId() override;
/**
* Return the global index (relative to the grid) of the
@@ -91,44 +91,44 @@ public:
/**
* Is the cursor pointing to a leaf?
*/
- bool IsLeaf() VTK_OVERRIDE;
+ bool IsLeaf() override;
/**
* Is the cursor at tree root?
*/
- bool IsRoot() VTK_OVERRIDE;
+ bool IsRoot() override;
/**
* Get the level of the tree vertex pointed by the cursor.
*/
- unsigned int GetLevel() VTK_OVERRIDE {return this->Level;};
+ unsigned int GetLevel() override {return this->Level;};
/**
* Return the child number of the current vertex relative to its parent.
* \pre not_root: !IsRoot().
* \post valid_range: result>=0 && result<GetNumberOfChildren()
*/
- int GetChildIndex() VTK_OVERRIDE;
+ int GetChildIndex() override;
/**
* Move the cursor to the root vertex.
* \pre can be root
* \post is_root: IsRoot()
*/
- void ToRoot() VTK_OVERRIDE;
+ void ToRoot() override;
/**
* Move the cursor to the parent of the current vertex.
* \pre not_root: !IsRoot()
*/
- void ToParent() VTK_OVERRIDE;
+ void ToParent() override;
/**
* Move the cursor to child `child' of the current vertex.
* \pre not_leaf: !IsLeaf()
* \pre valid_child: child>=0 && child<this->GetNumberOfChildren()
*/
- void ToChild( int child ) VTK_OVERRIDE;
+ void ToChild( int child ) override;
/**
* Move the cursor to the same vertex pointed by `other'.
@@ -137,7 +137,7 @@ public:
* \post equal: this->IsEqual(other)
* NB: not implemented
*/
- void ToSameVertex( vtkHyperTreeCursor* vtkNotUsed(other) ) VTK_OVERRIDE { return; }
+ void ToSameVertex( vtkHyperTreeCursor* vtkNotUsed(other) ) override { return; }
/**
* Is `this' equal to `other'?
@@ -145,26 +145,26 @@ public:
* \pre same_hypertree: this->SameTree(other);
* NB: not implemented
*/
- bool IsEqual( vtkHyperTreeCursor* vtkNotUsed(other) ) VTK_OVERRIDE { return false; }
+ bool IsEqual( vtkHyperTreeCursor* vtkNotUsed(other) ) override { return false; }
/**
* Are `this' and `other' pointing on the same hypertree?
* \pre other_exists: other!=0
* NB: not implemented
*/
- int SameTree( vtkHyperTreeCursor* vtkNotUsed(other) ) VTK_OVERRIDE { return 0; }
+ int SameTree( vtkHyperTreeCursor* vtkNotUsed(other) ) override { return 0; }
/**
* Return the number of children for each node (non-vertex leaf) of the tree.
* \post positive_number: result>0
*/
- int GetNumberOfChildren() VTK_OVERRIDE;
+ int GetNumberOfChildren() override;
/**
* Return the dimension of the tree.
* \post positive_result: result>0
*/
- int GetDimension() VTK_OVERRIDE;
+ int GetDimension() override;
/**
* Compute the origin of the cursor.
@@ -224,7 +224,7 @@ protected:
/**
* Destructor
*/
- ~vtkHyperTreeGridCursor() VTK_OVERRIDE;
+ ~vtkHyperTreeGridCursor() override;
// Hyper tree grid to which the cursor is attached
vtkHyperTreeGrid* Grid;
diff --git a/Common/DataModel/vtkImageData.h b/Common/DataModel/vtkImageData.h
index f1be17084bfc05c95befee693c45b651fe6b33b7..664ff8055c9cc07ee59d73da402b26bee09f745c 100644
--- a/Common/DataModel/vtkImageData.h
+++ b/Common/DataModel/vtkImageData.h
@@ -42,60 +42,60 @@ public:
static vtkImageData *New();
vtkTypeMacro(vtkImageData,vtkDataSet);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Copy the geometric and topological structure of an input image data
* object.
*/
- void CopyStructure(vtkDataSet *ds) VTK_OVERRIDE;
+ void CopyStructure(vtkDataSet *ds) override;
/**
* Return what type of dataset this is.
*/
- int GetDataObjectType() VTK_OVERRIDE {return VTK_IMAGE_DATA;};
+ int GetDataObjectType() override {return VTK_IMAGE_DATA;};
//@{
/**
* Standard vtkDataSet API methods. See vtkDataSet for more information.
*/
- vtkIdType GetNumberOfCells() VTK_OVERRIDE;
- vtkIdType GetNumberOfPoints() VTK_OVERRIDE;
- double *GetPoint(vtkIdType ptId) VTK_OVERRIDE;
- void GetPoint(vtkIdType id, double x[3]) VTK_OVERRIDE;
- vtkCell *GetCell(vtkIdType cellId) VTK_OVERRIDE;
- vtkCell *GetCell(int i, int j, int k) VTK_OVERRIDE;
- void GetCell(vtkIdType cellId, vtkGenericCell *cell) VTK_OVERRIDE;
- void GetCellBounds(vtkIdType cellId, double bounds[6]) VTK_OVERRIDE;
+ vtkIdType GetNumberOfCells() override;
+ vtkIdType GetNumberOfPoints() override;
+ double *GetPoint(vtkIdType ptId) override;
+ void GetPoint(vtkIdType id, double x[3]) override;
+ vtkCell *GetCell(vtkIdType cellId) override;
+ vtkCell *GetCell(int i, int j, int k) override;
+ void GetCell(vtkIdType cellId, vtkGenericCell *cell) override;
+ void GetCellBounds(vtkIdType cellId, double bounds[6]) override;
virtual vtkIdType FindPoint(double x, double y, double z)
{
return this->vtkDataSet::FindPoint(x, y, z);
}
- vtkIdType FindPoint(double x[3]) VTK_OVERRIDE;
+ vtkIdType FindPoint(double x[3]) override;
vtkIdType FindCell(
double x[3], vtkCell *cell, vtkIdType cellId, double tol2,
- int& subId, double pcoords[3], double *weights) VTK_OVERRIDE;
+ int& subId, double pcoords[3], double *weights) override;
vtkIdType FindCell(
double x[3], vtkCell *cell, vtkGenericCell *gencell,
vtkIdType cellId, double tol2, int& subId,
- double pcoords[3], double *weights) VTK_OVERRIDE;
+ double pcoords[3], double *weights) override;
vtkCell *FindAndGetCell(double x[3], vtkCell *cell, vtkIdType cellId,
double tol2, int& subId, double pcoords[3],
- double *weights) VTK_OVERRIDE;
- int GetCellType(vtkIdType cellId) VTK_OVERRIDE;
- void GetCellPoints(vtkIdType cellId, vtkIdList *ptIds) VTK_OVERRIDE
+ double *weights) override;
+ int GetCellType(vtkIdType cellId) override;
+ void GetCellPoints(vtkIdType cellId, vtkIdList *ptIds) override
{vtkStructuredData::GetCellPoints(cellId,ptIds,this->DataDescription,
this->GetDimensions());}
- void GetPointCells(vtkIdType ptId, vtkIdList *cellIds) VTK_OVERRIDE
+ void GetPointCells(vtkIdType ptId, vtkIdList *cellIds) override
{vtkStructuredData::GetPointCells(ptId,cellIds,this->GetDimensions());}
- void ComputeBounds() VTK_OVERRIDE;
- int GetMaxCellSize() VTK_OVERRIDE {return 8;}; //voxel is the largest
+ void ComputeBounds() override;
+ int GetMaxCellSize() override {return 8;}; //voxel is the largest
//@}
/**
* Restore data object to initial state.
*/
- void Initialize() VTK_OVERRIDE;
+ void Initialize() override;
/**
* Same as SetExtent(0, i-1, 0, j-1, 0, k-1)
@@ -313,7 +313,7 @@ public:
* This is used internally when the exact extent is requested,
* and the source generated more than the update extent.
*/
- void Crop(const int* updateExtent) VTK_OVERRIDE;
+ void Crop(const int* updateExtent) override;
/**
* Return the actual size of the data in kibibytes (1024 bytes). This number
@@ -323,7 +323,7 @@ public:
* arrays, etc. are not included in the return value). THIS METHOD
* IS THREAD SAFE.
*/
- unsigned long GetActualMemorySize() VTK_OVERRIDE;
+ unsigned long GetActualMemorySize() override;
//@{
/**
@@ -369,28 +369,28 @@ public:
* Override these to handle origin, spacing, scalar type, and scalar
* number of components. See vtkDataObject for details.
*/
- void CopyInformationFromPipeline(vtkInformation* information) VTK_OVERRIDE;
+ void CopyInformationFromPipeline(vtkInformation* information) override;
/**
* Copy information from this data object to the pipeline information.
* This is used by the vtkTrivialProducer that is created when someone
* calls SetInputData() to connect the image to a pipeline.
*/
- void CopyInformationToPipeline(vtkInformation* information) VTK_OVERRIDE;
+ void CopyInformationToPipeline(vtkInformation* information) override;
/**
* make the output data ready for new data to be inserted. For most
* objects we just call Initialize. But for image data we leave the old
* data in case the memory can be reused.
*/
- void PrepareForNewData() VTK_OVERRIDE;
+ void PrepareForNewData() override;
//@{
/**
* Shallow and Deep copy.
*/
- void ShallowCopy(vtkDataObject *src) VTK_OVERRIDE;
- void DeepCopy(vtkDataObject *src) VTK_OVERRIDE;
+ void ShallowCopy(vtkDataObject *src) override;
+ void DeepCopy(vtkDataObject *src) override;
//@}
//--------------------------------------------------------------------------
@@ -425,7 +425,7 @@ public:
/**
* The extent type is a 3D extent
*/
- int GetExtentType() VTK_OVERRIDE { return VTK_3D_EXTENT; };
+ int GetExtentType() override { return VTK_3D_EXTENT; };
//@{
/**
@@ -437,7 +437,7 @@ public:
protected:
vtkImageData();
- ~vtkImageData() VTK_OVERRIDE;
+ ~vtkImageData() override;
// The extent of what is currently in the structured grid.
// Dimensions is just an array to return a value.
diff --git a/Common/DataModel/vtkImplicitBoolean.h b/Common/DataModel/vtkImplicitBoolean.h
index c4ee2bf83dedd90b8aeeb2299e54746b2bb2c9f3..11845d22e464809f25e7e5361f9eeed01dc83def 100644
--- a/Common/DataModel/vtkImplicitBoolean.h
+++ b/Common/DataModel/vtkImplicitBoolean.h
@@ -44,7 +44,7 @@ class VTKCOMMONDATAMODEL_EXPORT vtkImplicitBoolean : public vtkImplicitFunction
{
public:
vtkTypeMacro(vtkImplicitBoolean,vtkImplicitFunction);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
enum OperationType
{
@@ -64,18 +64,18 @@ public:
* Evaluate boolean combinations of implicit function using current operator.
*/
using vtkImplicitFunction::EvaluateFunction;
- double EvaluateFunction(double x[3]) VTK_OVERRIDE;
+ double EvaluateFunction(double x[3]) override;
//@}
/**
* Evaluate gradient of boolean combination.
*/
- void EvaluateGradient(double x[3], double g[3]) VTK_OVERRIDE;
+ void EvaluateGradient(double x[3], double g[3]) override;
/**
* Override modified time retrieval because of object dependencies.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
/**
* Add another implicit function to the list of functions.
@@ -111,7 +111,7 @@ public:
protected:
vtkImplicitBoolean();
- ~vtkImplicitBoolean() VTK_OVERRIDE;
+ ~vtkImplicitBoolean() override;
vtkImplicitFunctionCollection *FunctionList;
diff --git a/Common/DataModel/vtkImplicitDataSet.h b/Common/DataModel/vtkImplicitDataSet.h
index 9dec851b2cb1ae43459202e9e0eab2982b1c586d..79fdc5f593c394bff3c06391171a978b7c574ea2 100644
--- a/Common/DataModel/vtkImplicitDataSet.h
+++ b/Common/DataModel/vtkImplicitDataSet.h
@@ -49,7 +49,7 @@ class VTKCOMMONDATAMODEL_EXPORT vtkImplicitDataSet : public vtkImplicitFunction
{
public:
vtkTypeMacro(vtkImplicitDataSet,vtkImplicitFunction);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct an vtkImplicitDataSet with no initial dataset; the OutValue
@@ -60,7 +60,7 @@ public:
/**
* Return the MTime also considering the DataSet dependency.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
//@{
/**
@@ -68,13 +68,13 @@ public:
* at x[3].
*/
using vtkImplicitFunction::EvaluateFunction;
- double EvaluateFunction(double x[3]) VTK_OVERRIDE;
+ double EvaluateFunction(double x[3]) override;
//@}
/**
* Evaluate implicit function gradient.
*/
- void EvaluateGradient(double x[3], double n[3]) VTK_OVERRIDE;
+ void EvaluateGradient(double x[3], double n[3]) override;
//@{
/**
@@ -102,9 +102,9 @@ public:
protected:
vtkImplicitDataSet();
- ~vtkImplicitDataSet() VTK_OVERRIDE;
+ ~vtkImplicitDataSet() override;
- void ReportReferences(vtkGarbageCollector*) VTK_OVERRIDE;
+ void ReportReferences(vtkGarbageCollector*) override;
vtkDataSet *DataSet;
double OutValue;
diff --git a/Common/DataModel/vtkImplicitFunction.h b/Common/DataModel/vtkImplicitFunction.h
index 56e5fb431bec3d2a780d8987dfe8451d836d634b..2631e3e4c09e62626d63c0da80ec34c24b33fa8e 100644
--- a/Common/DataModel/vtkImplicitFunction.h
+++ b/Common/DataModel/vtkImplicitFunction.h
@@ -61,13 +61,13 @@ class VTKCOMMONDATAMODEL_EXPORT vtkImplicitFunction : public vtkObject
{
public:
vtkTypeMacro(vtkImplicitFunction,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Overload standard modified time function. If Transform is modified,
* then this object is modified as well.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
//@{
/**
@@ -126,7 +126,7 @@ public:
protected:
vtkImplicitFunction();
- ~vtkImplicitFunction() VTK_OVERRIDE;
+ ~vtkImplicitFunction() override;
vtkAbstractTransform *Transform;
double ReturnValue[3];
diff --git a/Common/DataModel/vtkImplicitFunctionCollection.h b/Common/DataModel/vtkImplicitFunctionCollection.h
index 7b46d4484ce9bda51a59fce3591a373c5069d55e..bc14ccd932d8bef58053571f620f83981cde26da 100644
--- a/Common/DataModel/vtkImplicitFunctionCollection.h
+++ b/Common/DataModel/vtkImplicitFunctionCollection.h
@@ -61,7 +61,7 @@ public:
protected:
vtkImplicitFunctionCollection() {}
- ~vtkImplicitFunctionCollection() VTK_OVERRIDE {}
+ ~vtkImplicitFunctionCollection() override {}
private:
diff --git a/Common/DataModel/vtkImplicitHalo.h b/Common/DataModel/vtkImplicitHalo.h
index c50920e5ef1b9c90eabc595579549ed3a86b3649..50642795a8eed6d0e69d6b7bea118f574a4d871e 100644
--- a/Common/DataModel/vtkImplicitHalo.h
+++ b/Common/DataModel/vtkImplicitHalo.h
@@ -44,20 +44,20 @@ public:
static vtkImplicitHalo *New();
vtkTypeMacro(vtkImplicitHalo,vtkImplicitFunction);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
* Evaluate the equation.
*/
using vtkImplicitFunction::EvaluateFunction;
- double EvaluateFunction(double x[3]) VTK_OVERRIDE;
+ double EvaluateFunction(double x[3]) override;
//@}
/**
* Evaluate normal. Not implemented.
*/
- void EvaluateGradient(double x[3], double g[3]) VTK_OVERRIDE;
+ void EvaluateGradient(double x[3], double g[3]) override;
//@{
/**
@@ -85,7 +85,7 @@ public:
protected:
vtkImplicitHalo();
- ~vtkImplicitHalo() VTK_OVERRIDE;
+ ~vtkImplicitHalo() override;
double Radius;
double Center[3];
diff --git a/Common/DataModel/vtkImplicitSelectionLoop.h b/Common/DataModel/vtkImplicitSelectionLoop.h
index a4fe44043b99560aa52c541fe3481d14ed1ba13d..7c20645d9b87629b279ec3d82016d5ca1f1e87ce 100644
--- a/Common/DataModel/vtkImplicitSelectionLoop.h
+++ b/Common/DataModel/vtkImplicitSelectionLoop.h
@@ -62,7 +62,7 @@ public:
* Standard VTK methods for printing and type information.
*/
vtkTypeMacro(vtkImplicitSelectionLoop,vtkImplicitFunction);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
@@ -75,13 +75,13 @@ public:
* Evaluate selection loop returning a signed distance.
*/
using vtkImplicitFunction::EvaluateFunction;
- double EvaluateFunction(double x[3]) VTK_OVERRIDE;
+ double EvaluateFunction(double x[3]) override;
//@}
/**
* Evaluate selection loop returning the gradient.
*/
- void EvaluateGradient(double x[3], double n[3]) VTK_OVERRIDE;
+ void EvaluateGradient(double x[3], double n[3]) override;
//@{
/**
@@ -115,11 +115,11 @@ public:
/**
* Overload GetMTime() because we depend on the Loop
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
protected:
vtkImplicitSelectionLoop();
- ~vtkImplicitSelectionLoop() VTK_OVERRIDE;
+ ~vtkImplicitSelectionLoop() override;
vtkPoints *Loop;
double Normal[3];
diff --git a/Common/DataModel/vtkImplicitSum.h b/Common/DataModel/vtkImplicitSum.h
index 5d6a015f5994482dcfab9e1c28359f0a5cc95b7c..4a2593ad0303662531eae30f40419eacdfb41b2e 100644
--- a/Common/DataModel/vtkImplicitSum.h
+++ b/Common/DataModel/vtkImplicitSum.h
@@ -38,26 +38,26 @@ public:
static vtkImplicitSum *New();
vtkTypeMacro(vtkImplicitSum,vtkImplicitFunction);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
* Evaluate implicit function using current functions and weights.
*/
using vtkImplicitFunction::EvaluateFunction;
- double EvaluateFunction(double x[3]) VTK_OVERRIDE;
+ double EvaluateFunction(double x[3]) override;
//@}
/**
* Evaluate gradient of the weighted sum of functions. Input functions
* should be linear.
*/
- void EvaluateGradient(double x[3], double g[3]) VTK_OVERRIDE;
+ void EvaluateGradient(double x[3], double g[3]) override;
/**
* Override modified time retrieval because of object dependencies.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
/**
* Add another implicit function to the list of functions, along with a
@@ -96,7 +96,7 @@ public:
protected:
vtkImplicitSum();
- ~vtkImplicitSum() VTK_OVERRIDE;
+ ~vtkImplicitSum() override;
vtkImplicitFunctionCollection *FunctionList;
vtkDoubleArray *Weights;
diff --git a/Common/DataModel/vtkImplicitVolume.h b/Common/DataModel/vtkImplicitVolume.h
index b53b61e119061998c723c9974d2a29b527b3d48e..d298f774c25ac8b158f474236a37c2d4a380af57 100644
--- a/Common/DataModel/vtkImplicitVolume.h
+++ b/Common/DataModel/vtkImplicitVolume.h
@@ -50,7 +50,7 @@ class VTKCOMMONDATAMODEL_EXPORT vtkImplicitVolume : public vtkImplicitFunction
{
public:
vtkTypeMacro(vtkImplicitVolume,vtkImplicitFunction);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct an vtkImplicitVolume with no initial volume; the OutValue
@@ -63,7 +63,7 @@ public:
* on the volume, and it therefore must be called before the function is
* evaluated.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
//@{
/**
@@ -71,13 +71,13 @@ public:
* at x[3].
*/
using vtkImplicitFunction::EvaluateFunction;
- double EvaluateFunction(double x[3]) VTK_OVERRIDE;
+ double EvaluateFunction(double x[3]) override;
//@}
/**
* Evaluate ImplicitVolume gradient.
*/
- void EvaluateGradient(double x[3], double n[3]) VTK_OVERRIDE;
+ void EvaluateGradient(double x[3], double n[3]) override;
//@{
/**
@@ -105,7 +105,7 @@ public:
protected:
vtkImplicitVolume();
- ~vtkImplicitVolume() VTK_OVERRIDE;
+ ~vtkImplicitVolume() override;
vtkImageData *Volume; // the structured points
double OutValue;
diff --git a/Common/DataModel/vtkImplicitWindowFunction.h b/Common/DataModel/vtkImplicitWindowFunction.h
index 00baca8a2d065529892be2ea69cbc5615a06aafc..939cb9c3ada4a88659b1488150814e45295b830c 100644
--- a/Common/DataModel/vtkImplicitWindowFunction.h
+++ b/Common/DataModel/vtkImplicitWindowFunction.h
@@ -40,7 +40,7 @@ class VTKCOMMONDATAMODEL_EXPORT vtkImplicitWindowFunction : public vtkImplicitFu
{
public:
vtkTypeMacro(vtkImplicitWindowFunction,vtkImplicitFunction);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct object with window range (0,1) and window values (0,1).
@@ -52,13 +52,13 @@ public:
* Evaluate window function.
*/
using vtkImplicitFunction::EvaluateFunction;
- double EvaluateFunction(double x[3]) VTK_OVERRIDE;
+ double EvaluateFunction(double x[3]) override;
//@}
/**
* Evaluate window function gradient. Just return implicit function gradient.
*/
- void EvaluateGradient(double x[3], double n[3]) VTK_OVERRIDE;
+ void EvaluateGradient(double x[3], double n[3]) override;
//@{
/**
@@ -90,21 +90,21 @@ public:
/**
* Override modified time retrieval because of object dependencies.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
//@{
/**
* Participate in garbage collection.
*/
- void Register(vtkObjectBase* o) VTK_OVERRIDE;
- void UnRegister(vtkObjectBase* o) VTK_OVERRIDE;
+ void Register(vtkObjectBase* o) override;
+ void UnRegister(vtkObjectBase* o) override;
//@}
protected:
vtkImplicitWindowFunction();
- ~vtkImplicitWindowFunction() VTK_OVERRIDE;
+ ~vtkImplicitWindowFunction() override;
- void ReportReferences(vtkGarbageCollector*) VTK_OVERRIDE;
+ void ReportReferences(vtkGarbageCollector*) override;
vtkImplicitFunction *ImplicitFunction;
double WindowRange[2];
diff --git a/Common/DataModel/vtkInEdgeIterator.h b/Common/DataModel/vtkInEdgeIterator.h
index 2d1ba2e86ed2b05311f987441d83c9c520c711f6..d4636b4ff88736b378c55895f0160ea6ecd4fba1 100644
--- a/Common/DataModel/vtkInEdgeIterator.h
+++ b/Common/DataModel/vtkInEdgeIterator.h
@@ -47,7 +47,7 @@ class VTKCOMMONDATAMODEL_EXPORT vtkInEdgeIterator : public vtkObject
public:
static vtkInEdgeIterator *New();
vtkTypeMacro(vtkInEdgeIterator, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Initialize the iterator with a graph and vertex.
@@ -93,7 +93,7 @@ public:
protected:
vtkInEdgeIterator();
- ~vtkInEdgeIterator() VTK_OVERRIDE;
+ ~vtkInEdgeIterator() override;
/**
* Protected method for setting the graph used
diff --git a/Common/DataModel/vtkIncrementalOctreeNode.h b/Common/DataModel/vtkIncrementalOctreeNode.h
index babab6d15b2ee5fdee0ef381ada584f8da215458..f46914abaa00fdde7510f7481a0dc3053546fda4 100644
--- a/Common/DataModel/vtkIncrementalOctreeNode.h
+++ b/Common/DataModel/vtkIncrementalOctreeNode.h
@@ -69,7 +69,7 @@ class VTKCOMMONDATAMODEL_EXPORT vtkIncrementalOctreeNode : public vtkObject
{
public:
vtkTypeMacro( vtkIncrementalOctreeNode, vtkObject );
- void PrintSelf( ostream & os, vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf( ostream & os, vtkIndent indent ) override;
static vtkIncrementalOctreeNode * New();
@@ -220,7 +220,7 @@ public:
protected:
vtkIncrementalOctreeNode();
- ~vtkIncrementalOctreeNode() VTK_OVERRIDE;
+ ~vtkIncrementalOctreeNode() override;
private:
diff --git a/Common/DataModel/vtkIncrementalOctreePointLocator.h b/Common/DataModel/vtkIncrementalOctreePointLocator.h
index e21b80df75afa72e155415837b0f9733474debf8..b1e623046edaf9b70f7836c8df57675605474117 100644
--- a/Common/DataModel/vtkIncrementalOctreePointLocator.h
+++ b/Common/DataModel/vtkIncrementalOctreePointLocator.h
@@ -62,7 +62,7 @@ class VTKCOMMONDATAMODEL_EXPORT vtkIncrementalOctreePointLocator : public vtkInc
public:
vtkTypeMacro( vtkIncrementalOctreePointLocator, vtkIncrementalPointLocator );
- void PrintSelf( ostream & os, vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf( ostream & os, vtkIndent indent ) override;
static vtkIncrementalOctreePointLocator * New();
@@ -101,22 +101,22 @@ public:
/**
* Delete the octree search structure.
*/
- void Initialize() VTK_OVERRIDE { this->FreeSearchStructure(); }
+ void Initialize() override { this->FreeSearchStructure(); }
/**
* Delete the octree search structure.
*/
- void FreeSearchStructure() VTK_OVERRIDE;
+ void FreeSearchStructure() override;
/**
* Get the spatial bounding box of the octree.
*/
- void GetBounds( double * bounds ) VTK_OVERRIDE;
+ void GetBounds( double * bounds ) override;
/**
* Get the spatial bounding box of the octree.
*/
- double * GetBounds() VTK_OVERRIDE
+ double * GetBounds() override
{ this->GetBounds( this->Bounds ); return this->Bounds; }
/**
@@ -131,13 +131,13 @@ public:
* is used when performing incremental point insertion. Note -1 indicates that
* no point is found. InitPointInsertion() should have been called in advance.
*/
- vtkIdType FindClosestInsertedPoint( const double x[3] ) VTK_OVERRIDE;
+ vtkIdType FindClosestInsertedPoint( const double x[3] ) override;
/**
* Create a polygonal representation of the octree boundary (from the root
* node to a specified level).
*/
- void GenerateRepresentation( int nodeLevel, vtkPolyData * polysData ) VTK_OVERRIDE;
+ void GenerateRepresentation( int nodeLevel, vtkPolyData * polysData ) override;
// -------------------------------------------------------------------------
// ---------------------------- Point Location ----------------------------
@@ -147,14 +147,14 @@ public:
* Load points from a dataset to construct an octree for point location.
* This function resorts to InitPointInsertion() to fulfill some of the work.
*/
- void BuildLocator() VTK_OVERRIDE;
+ void BuildLocator() override;
/**
* Given a point x, return the id of the closest point. BuildLocator() should
* have been called prior to this function. This method is thread safe if
* BuildLocator() is directly or indirectly called from a single thread first.
*/
- vtkIdType FindClosestPoint( const double x[3] ) VTK_OVERRIDE;
+ vtkIdType FindClosestPoint( const double x[3] ) override;
/**
* Given a point (x, y, z), return the id of the closest point. Note that
@@ -189,7 +189,7 @@ public:
* single thread first.
*/
vtkIdType FindClosestPointWithinRadius
- ( double radius, const double x[3], double & dist2 ) VTK_OVERRIDE;
+ ( double radius, const double x[3], double & dist2 ) override;
/**
* Given a point x and a squared radius radius2, return the id of the closest
@@ -209,7 +209,7 @@ public:
* BuildLocator() is directly or indirectly called from a single thread first.
*/
void FindPointsWithinRadius
- ( double R, const double x[3], vtkIdList * result ) VTK_OVERRIDE;
+ ( double R, const double x[3], vtkIdList * result ) override;
/**
* Find all points within a squared radius R2 relative to a given point x. The
@@ -227,7 +227,7 @@ public:
* BuildLocator() is directly or indirectly called from a single thread first.
*/
void FindClosestNPoints
- ( int N, const double x[3], vtkIdList * result ) VTK_OVERRIDE;
+ ( int N, const double x[3], vtkIdList * result ) override;
// -------------------------------------------------------------------------
// ---------------------------- Point Insertion ----------------------------
@@ -243,7 +243,7 @@ public:
* function is not thread safe.
*/
int InitPointInsertion
- ( vtkPoints * points, const double bounds[6] ) VTK_OVERRIDE;
+ ( vtkPoints * points, const double bounds[6] ) override;
/**
* Initialize the point insertion process. points is an object, storing 3D
@@ -256,21 +256,21 @@ public:
* function is not thread safe.
*/
int InitPointInsertion( vtkPoints * points, const double bounds[6],
- vtkIdType estSize ) VTK_OVERRIDE;
+ vtkIdType estSize ) override;
/**
* Determine whether or not a given point has been inserted into the octree.
* Return the id of the already inserted point if true, otherwise return -1.
* InitPointInsertion() should have been called in advance.
*/
- vtkIdType IsInsertedPoint( const double x[3] ) VTK_OVERRIDE;
+ vtkIdType IsInsertedPoint( const double x[3] ) override;
/**
* Determine whether or not a given point has been inserted into the octree.
* Return the id of the already inserted point if true, otherwise return -1.
* InitPointInsertion() should have been called in advance.
*/
- vtkIdType IsInsertedPoint( double x, double y, double z ) VTK_OVERRIDE;
+ vtkIdType IsInsertedPoint( double x, double y, double z ) override;
/**
* Insert a point to the octree unless there has been a duplciate point.
@@ -280,7 +280,7 @@ public:
* should have been called prior to this function. vtkPoints::InsertNextPoint()
* is invoked. This method is not thread safe.
*/
- int InsertUniquePoint( const double point[3], vtkIdType & pntId ) VTK_OVERRIDE;
+ int InsertUniquePoint( const double point[3], vtkIdType & pntId ) override;
/**
* Insert a given point into the octree with a specified point index ptId.
@@ -290,7 +290,7 @@ public:
* allowed (Note that in this case, this function involves a repeated leaf
* container location). vtkPoints::InsertPoint() is invoked.
*/
- void InsertPoint( vtkIdType ptId, const double x[3] ) VTK_OVERRIDE;
+ void InsertPoint( vtkIdType ptId, const double x[3] ) override;
/**
* Insert a given point into the octree and return the point index. Note that
@@ -300,7 +300,7 @@ public:
* allowed (in this case, this function invovles a repeated leaf container
* location). vtkPoints::InsertNextPoint() is invoked.
*/
- vtkIdType InsertNextPoint( const double x[3] ) VTK_OVERRIDE;
+ vtkIdType InsertNextPoint( const double x[3] ) override;
/**
* "Insert" a point to the octree without any checking. Argument insert means
@@ -316,7 +316,7 @@ public:
protected:
vtkIncrementalOctreePointLocator();
- ~vtkIncrementalOctreePointLocator() VTK_OVERRIDE;
+ ~vtkIncrementalOctreePointLocator() override;
private:
diff --git a/Common/DataModel/vtkIncrementalPointLocator.h b/Common/DataModel/vtkIncrementalPointLocator.h
index f2b9248d83580ebe3c2cac92f365ab9f1c15e698..666ff0f50307d21eb68c495eac565ff3249af0e1 100644
--- a/Common/DataModel/vtkIncrementalPointLocator.h
+++ b/Common/DataModel/vtkIncrementalPointLocator.h
@@ -53,7 +53,7 @@ class VTKCOMMONDATAMODEL_EXPORT vtkIncrementalPointLocator : public vtkAbstractP
public:
vtkTypeMacro( vtkIncrementalPointLocator, vtkAbstractPointLocator );
- void PrintSelf( ostream & os, vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf( ostream & os, vtkIndent indent ) override;
/**
* Given a point x assumed to be covered by the search structure, return the
@@ -130,7 +130,7 @@ public:
protected:
vtkIncrementalPointLocator();
- ~vtkIncrementalPointLocator() VTK_OVERRIDE;
+ ~vtkIncrementalPointLocator() override;
private:
vtkIncrementalPointLocator( const vtkIncrementalPointLocator & ) VTK_DELETE_FUNCTION;
diff --git a/Common/DataModel/vtkInformationQuadratureSchemeDefinitionVectorKey.h b/Common/DataModel/vtkInformationQuadratureSchemeDefinitionVectorKey.h
index 626ade618e369cb6eb94424bd956e0ea829ccc47..57827bc9b0d12edae127e0aed3a747dca158a843 100644
--- a/Common/DataModel/vtkInformationQuadratureSchemeDefinitionVectorKey.h
+++ b/Common/DataModel/vtkInformationQuadratureSchemeDefinitionVectorKey.h
@@ -37,7 +37,7 @@ class VTKCOMMONDATAMODEL_EXPORT vtkInformationQuadratureSchemeDefinitionVectorKe
{
public:
vtkTypeMacro(vtkInformationQuadratureSchemeDefinitionVectorKey,vtkInformationKey);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
* The name of the static instance and the class in which
@@ -47,7 +47,7 @@ public:
const char* name,
const char* location);
//
- ~vtkInformationQuadratureSchemeDefinitionVectorKey() VTK_OVERRIDE;
+ ~vtkInformationQuadratureSchemeDefinitionVectorKey() override;
//@}
/**
@@ -112,14 +112,14 @@ public:
* object to another. If there is no entry in the first information
* object for this key, the value is removed from the second.
*/
- void ShallowCopy(vtkInformation* from, vtkInformation* to) VTK_OVERRIDE;
- void DeepCopy(vtkInformation* from, vtkInformation* to) VTK_OVERRIDE;
+ void ShallowCopy(vtkInformation* from, vtkInformation* to) override;
+ void DeepCopy(vtkInformation* from, vtkInformation* to) override;
//@}
/**
* Print the key's value in an information object to a stream.
*/
- void Print(ostream& os, vtkInformation* info) VTK_OVERRIDE;
+ void Print(ostream& os, vtkInformation* info) override;
// note: I had wanted to make the following interface in vtkInformationKey
// with a defualt implementation that did nothing. but we decided that
diff --git a/Common/DataModel/vtkIterativeClosestPointTransform.h b/Common/DataModel/vtkIterativeClosestPointTransform.h
index 066f11a0a9a7ced1ccba6bb9d47bf88335c64593..70e46c6dae56f6c20ecff68878211d14045a008d 100644
--- a/Common/DataModel/vtkIterativeClosestPointTransform.h
+++ b/Common/DataModel/vtkIterativeClosestPointTransform.h
@@ -54,7 +54,7 @@ class VTKCOMMONDATAMODEL_EXPORT vtkIterativeClosestPointTransform : public vtkLi
public:
static vtkIterativeClosestPointTransform *New();
vtkTypeMacro(vtkIterativeClosestPointTransform,vtkLinearTransform);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -167,12 +167,12 @@ public:
* Invert the transformation. This is done by switching the
* source and target.
*/
- void Inverse() VTK_OVERRIDE;
+ void Inverse() override;
/**
* Make another transform of the same type.
*/
- vtkAbstractTransform *MakeTransform() VTK_OVERRIDE;
+ vtkAbstractTransform *MakeTransform() override;
protected:
@@ -197,17 +197,17 @@ protected:
/**
* Get the MTime of this object also considering the locator.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
vtkIterativeClosestPointTransform();
- ~vtkIterativeClosestPointTransform() VTK_OVERRIDE;
+ ~vtkIterativeClosestPointTransform() override;
- void InternalUpdate() VTK_OVERRIDE;
+ void InternalUpdate() override;
/**
* This method does no type checking, use DeepCopy instead.
*/
- void InternalDeepCopy(vtkAbstractTransform *transform) VTK_OVERRIDE;
+ void InternalDeepCopy(vtkAbstractTransform *transform) override;
vtkDataSet* Source;
vtkDataSet* Target;
diff --git a/Common/DataModel/vtkKdNode.h b/Common/DataModel/vtkKdNode.h
index b7fda35d952f7aa92f99d330903f126cd067c2df..4f246870981f0961577903c2d329920b5feeb511 100644
--- a/Common/DataModel/vtkKdNode.h
+++ b/Common/DataModel/vtkKdNode.h
@@ -43,7 +43,7 @@ class VTKCOMMONDATAMODEL_EXPORT vtkKdNode : public vtkObject
{
public:
vtkTypeMacro(vtkKdNode, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkKdNode *New();
@@ -280,7 +280,7 @@ public:
protected:
vtkKdNode();
- ~vtkKdNode() VTK_OVERRIDE;
+ ~vtkKdNode() override;
private:
diff --git a/Common/DataModel/vtkKdTree.h b/Common/DataModel/vtkKdTree.h
index ad7331ec2c1d338a97dcc47b7c16c43fd894ac38..2f76df9a5f96eceb40685bcfc7ebdf78855f50dc 100644
--- a/Common/DataModel/vtkKdTree.h
+++ b/Common/DataModel/vtkKdTree.h
@@ -76,7 +76,7 @@ class VTKCOMMONDATAMODEL_EXPORT vtkKdTree : public vtkLocator
{
public:
vtkTypeMacro(vtkKdTree, vtkLocator);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkKdTree *New();
@@ -191,7 +191,7 @@ public:
* Clear out all data sets and replace with single data set. For backward
* compatibility with superclass.
*/
- void SetDataSet(vtkDataSet *set) VTK_OVERRIDE;
+ void SetDataSet(vtkDataSet *set) override;
/**
* This class can compute a spatial decomposition based on the cells in a list
@@ -228,7 +228,7 @@ public:
* Return the 0'th data set. For compatibility with the superclass'
* interface.
*/
- vtkDataSet *GetDataSet() VTK_OVERRIDE { return this->GetDataSet(0); }
+ vtkDataSet *GetDataSet() override { return this->GetDataSet(0); }
//@{
/**
@@ -405,7 +405,7 @@ public:
* or data sets. Cells are assigned to k-d tree spatial regions
* based on the location of their centroids.
*/
- void BuildLocator() VTK_OVERRIDE;
+ void BuildLocator() override;
/**
* Given a list of region IDs, determine the decomposition of
@@ -568,14 +568,14 @@ public:
* Delete the k-d tree data structure. Also delete any
* cell lists that were computed with CreateCellLists().
*/
- void FreeSearchStructure() VTK_OVERRIDE;
+ void FreeSearchStructure() override;
/**
* Create a polydata representation of the boundaries of
* the k-d tree regions. If level equals GetLevel(), the
* leaf nodes are represented.
*/
- void GenerateRepresentation(int level, vtkPolyData *pd) VTK_OVERRIDE;
+ void GenerateRepresentation(int level, vtkPolyData *pd) override;
/**
* Generate a polygonal representation of a list of regions.
@@ -638,7 +638,7 @@ public:
protected:
vtkKdTree();
- ~vtkKdTree() VTK_OVERRIDE;
+ ~vtkKdTree() override;
vtkBSPIntersections *BSPCalculator;
int UserDefinedCuts;
diff --git a/Common/DataModel/vtkKdTreePointLocator.h b/Common/DataModel/vtkKdTreePointLocator.h
index c3f52deeaf484369de15ce8553d998e2e17c692a..454435cf640b52b7a2f164c0dce69ca224dfb7ad 100644
--- a/Common/DataModel/vtkKdTreePointLocator.h
+++ b/Common/DataModel/vtkKdTreePointLocator.h
@@ -37,7 +37,7 @@ class VTKCOMMONDATAMODEL_EXPORT vtkKdTreePointLocator : public vtkAbstractPointL
public:
vtkTypeMacro(vtkKdTreePointLocator,vtkAbstractPointLocator);
static vtkKdTreePointLocator* New();
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Given a position x, return the id of the point closest to it. Alternative
@@ -45,7 +45,7 @@ public:
* These methods are thread safe if BuildLocator() is directly or
* indirectly called from a single thread first.
*/
- vtkIdType FindClosestPoint(const double x[3]) VTK_OVERRIDE;
+ vtkIdType FindClosestPoint(const double x[3]) override;
/**
* Given a position x and a radius r, return the id of the point
@@ -53,7 +53,7 @@ public:
* dist2 returns the squared distance to the point.
*/
vtkIdType FindClosestPointWithinRadius(
- double radius, const double x[3], double& dist2) VTK_OVERRIDE;
+ double radius, const double x[3], double& dist2) override;
/**
* Find the closest N points to a position. This returns the closest
@@ -64,7 +64,7 @@ public:
* indirectly called from a single thread first.
*/
void FindClosestNPoints(
- int N, const double x[3], vtkIdList *result) VTK_OVERRIDE;
+ int N, const double x[3], vtkIdList *result) override;
/**
* Find all points within a specified radius R of position x.
@@ -73,21 +73,21 @@ public:
* indirectly called from a single thread first.
*/
void FindPointsWithinRadius(double R, const double x[3],
- vtkIdList *result) VTK_OVERRIDE;
+ vtkIdList *result) override;
//@{
/**
* See vtkLocator interface documentation.
* These methods are not thread safe.
*/
- void FreeSearchStructure() VTK_OVERRIDE;
- void BuildLocator() VTK_OVERRIDE;
- void GenerateRepresentation(int level, vtkPolyData *pd) VTK_OVERRIDE;
+ void FreeSearchStructure() override;
+ void BuildLocator() override;
+ void GenerateRepresentation(int level, vtkPolyData *pd) override;
//@}
protected:
vtkKdTreePointLocator();
- ~vtkKdTreePointLocator() VTK_OVERRIDE;
+ ~vtkKdTreePointLocator() override;
vtkKdTree* KdTree;
diff --git a/Common/DataModel/vtkLine.h b/Common/DataModel/vtkLine.h
index 93d6b3929add56d6414646a8953ecdec7d812de0..1303fea9802542d73a4dbee451cc44d2f4b2d119 100644
--- a/Common/DataModel/vtkLine.h
+++ b/Common/DataModel/vtkLine.h
@@ -31,33 +31,33 @@ class VTKCOMMONDATAMODEL_EXPORT vtkLine : public vtkCell
public:
static vtkLine *New();
vtkTypeMacro(vtkLine,vtkCell);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
* See the vtkCell API for descriptions of these methods.
*/
- int GetCellType() VTK_OVERRIDE {return VTK_LINE;};
- int GetCellDimension() VTK_OVERRIDE {return 1;};
- int GetNumberOfEdges() VTK_OVERRIDE {return 0;};
- int GetNumberOfFaces() VTK_OVERRIDE {return 0;};
- vtkCell *GetEdge(int) VTK_OVERRIDE {return nullptr;};
- vtkCell *GetFace(int) VTK_OVERRIDE {return nullptr;};
- int CellBoundary(int subId, double pcoords[3], vtkIdList *pts) VTK_OVERRIDE;
+ int GetCellType() override {return VTK_LINE;};
+ int GetCellDimension() override {return 1;};
+ int GetNumberOfEdges() override {return 0;};
+ int GetNumberOfFaces() override {return 0;};
+ vtkCell *GetEdge(int) override {return nullptr;};
+ vtkCell *GetFace(int) override {return nullptr;};
+ int CellBoundary(int subId, double pcoords[3], vtkIdList *pts) override;
void Contour(double value, vtkDataArray *cellScalars,
vtkIncrementalPointLocator *locator, vtkCellArray *verts,
vtkCellArray *lines, vtkCellArray *polys,
vtkPointData *inPd, vtkPointData *outPd,
- vtkCellData *inCd, vtkIdType cellId, vtkCellData *outCd) VTK_OVERRIDE;
+ vtkCellData *inCd, vtkIdType cellId, vtkCellData *outCd) override;
int EvaluatePosition(double x[3], double* closestPoint,
int& subId, double pcoords[3],
- double& dist2, double *weights) VTK_OVERRIDE;
+ double& dist2, double *weights) override;
void EvaluateLocation(int& subId, double pcoords[3], double x[3],
- double *weights) VTK_OVERRIDE;
- int Triangulate(int index, vtkIdList *ptIds, vtkPoints *pts) VTK_OVERRIDE;
+ double *weights) override;
+ int Triangulate(int index, vtkIdList *ptIds, vtkPoints *pts) override;
void Derivatives(int subId, double pcoords[3], double *values,
- int dim, double *derivs) VTK_OVERRIDE;
- double *GetParametricCoords() VTK_OVERRIDE;
+ int dim, double *derivs) override;
+ double *GetParametricCoords() override;
//@}
/**
@@ -68,19 +68,19 @@ public:
vtkIncrementalPointLocator *locator, vtkCellArray *lines,
vtkPointData *inPd, vtkPointData *outPd,
vtkCellData *inCd, vtkIdType cellId, vtkCellData *outCd,
- int insideOut) VTK_OVERRIDE;
+ int insideOut) override;
/**
* Return the center of the triangle in parametric coordinates.
*/
- int GetParametricCenter(double pcoords[3]) VTK_OVERRIDE;
+ int GetParametricCenter(double pcoords[3]) override;
/**
* Line-line intersection. Intersection has to occur within [0,1] parametric
* coordinates and with specified tolerance.
*/
int IntersectWithLine(double p1[3], double p2[3], double tol, double& t,
- double x[3], double pcoords[3], int& subId) VTK_OVERRIDE;
+ double x[3], double pcoords[3], int& subId) override;
/**
@@ -172,11 +172,11 @@ public:
* Compute the interpolation functions/derivatives
* (aka shape functions/derivatives)
*/
- void InterpolateFunctions(double pcoords[3], double weights[2]) VTK_OVERRIDE
+ void InterpolateFunctions(double pcoords[3], double weights[2]) override
{
vtkLine::InterpolationFunctions(pcoords,weights);
}
- void InterpolateDerivs(double pcoords[3], double derivs[2]) VTK_OVERRIDE
+ void InterpolateDerivs(double pcoords[3], double derivs[2]) override
{
vtkLine::InterpolationDerivs(pcoords,derivs);
}
@@ -184,7 +184,7 @@ public:
protected:
vtkLine();
- ~vtkLine() VTK_OVERRIDE {}
+ ~vtkLine() override {}
private:
vtkLine(const vtkLine&) VTK_DELETE_FUNCTION;
diff --git a/Common/DataModel/vtkLocator.h b/Common/DataModel/vtkLocator.h
index b90945161589aea9f4320d60c2c19f781d8bdc1e..4bc5cba514b9dc3ef8b99f02bdb6572031efcf9c 100644
--- a/Common/DataModel/vtkLocator.h
+++ b/Common/DataModel/vtkLocator.h
@@ -74,7 +74,7 @@ public:
* Standard type and print methods.
*/
vtkTypeMacro(vtkLocator,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -165,13 +165,13 @@ public:
/**
* Handle the PointSet <-> Locator loop.
*/
- void Register(vtkObjectBase *o) VTK_OVERRIDE;
- void UnRegister(vtkObjectBase *o) VTK_OVERRIDE;
+ void Register(vtkObjectBase *o) override;
+ void UnRegister(vtkObjectBase *o) override;
//@}
protected:
vtkLocator();
- ~vtkLocator() VTK_OVERRIDE;
+ ~vtkLocator() override;
vtkDataSet *DataSet;
int Automatic; // boolean controls automatic subdivision (or uses user spec.)
@@ -181,7 +181,7 @@ protected:
vtkTimeStamp BuildTime; // time at which locator was built
- void ReportReferences(vtkGarbageCollector*) VTK_OVERRIDE;
+ void ReportReferences(vtkGarbageCollector*) override;
private:
vtkLocator(const vtkLocator&) VTK_DELETE_FUNCTION;
diff --git a/Common/DataModel/vtkMappedUnstructuredGrid.h b/Common/DataModel/vtkMappedUnstructuredGrid.h
index b8f414d8316141ee1311472a082b90a775fcbcb1..15234c980740d206dada0d5d2085905527e7845a 100644
--- a/Common/DataModel/vtkMappedUnstructuredGrid.h
+++ b/Common/DataModel/vtkMappedUnstructuredGrid.h
@@ -157,34 +157,34 @@ public:
typedef CellIterator CellIteratorType;
// Virtuals from various base classes:
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
- void CopyStructure(vtkDataSet *pd) VTK_OVERRIDE;
- void ShallowCopy(vtkDataObject *src) VTK_OVERRIDE;
- vtkIdType GetNumberOfCells() VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
+ void CopyStructure(vtkDataSet *pd) override;
+ void ShallowCopy(vtkDataObject *src) override;
+ vtkIdType GetNumberOfCells() override;
using vtkDataSet::GetCell;
- vtkCell* GetCell(vtkIdType cellId) VTK_OVERRIDE;
- void GetCell(vtkIdType cellId, vtkGenericCell *cell) VTK_OVERRIDE;
- int GetCellType(vtkIdType cellId) VTK_OVERRIDE;
- void GetCellPoints(vtkIdType cellId, vtkIdList *ptIds) VTK_OVERRIDE;
- vtkCellIterator* NewCellIterator() VTK_OVERRIDE;
- void GetPointCells(vtkIdType ptId, vtkIdList *cellIds) VTK_OVERRIDE;
- int GetMaxCellSize() VTK_OVERRIDE;
- void GetIdsOfCellsOfType(int type, vtkIdTypeArray *array) VTK_OVERRIDE;
- int IsHomogeneous() VTK_OVERRIDE;
- void Allocate(vtkIdType numCells, int extSize = 1000) VTK_OVERRIDE;
- vtkIdType InsertNextCell(int type, vtkIdList *ptIds) VTK_OVERRIDE;
- vtkIdType InsertNextCell(int type, vtkIdType npts, vtkIdType *ptIds) VTK_OVERRIDE;
+ vtkCell* GetCell(vtkIdType cellId) override;
+ void GetCell(vtkIdType cellId, vtkGenericCell *cell) override;
+ int GetCellType(vtkIdType cellId) override;
+ void GetCellPoints(vtkIdType cellId, vtkIdList *ptIds) override;
+ vtkCellIterator* NewCellIterator() override;
+ void GetPointCells(vtkIdType ptId, vtkIdList *cellIds) override;
+ int GetMaxCellSize() override;
+ void GetIdsOfCellsOfType(int type, vtkIdTypeArray *array) override;
+ int IsHomogeneous() override;
+ void Allocate(vtkIdType numCells, int extSize = 1000) override;
+ vtkIdType InsertNextCell(int type, vtkIdList *ptIds) override;
+ vtkIdType InsertNextCell(int type, vtkIdType npts, vtkIdType *ptIds) override;
vtkIdType InsertNextCell(int type, vtkIdType npts, vtkIdType *ptIds,
- vtkIdType nfaces, vtkIdType *faces) VTK_OVERRIDE;
- void ReplaceCell(vtkIdType cellId, int npts, vtkIdType *pts) VTK_OVERRIDE;
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkIdType nfaces, vtkIdType *faces) override;
+ void ReplaceCell(vtkIdType cellId, int npts, vtkIdType *pts) override;
+ vtkMTimeType GetMTime() override;
void SetImplementation(ImplementationType *impl);
ImplementationType *GetImplementation();
protected:
vtkMappedUnstructuredGrid();
- ~vtkMappedUnstructuredGrid() VTK_OVERRIDE;
+ ~vtkMappedUnstructuredGrid() override;
// For convenience...
typedef vtkMappedUnstructuredGrid<Implementation, CellIterator> ThisType;
diff --git a/Common/DataModel/vtkMappedUnstructuredGridCellIterator.h b/Common/DataModel/vtkMappedUnstructuredGridCellIterator.h
index 3708615c98f54b54a72b8dca7c61ca807630d777..4684b12e942d2ce0908ebed29914bedb1fabe727 100644
--- a/Common/DataModel/vtkMappedUnstructuredGridCellIterator.h
+++ b/Common/DataModel/vtkMappedUnstructuredGridCellIterator.h
@@ -42,23 +42,23 @@ public:
typedef Implementation ImplementationType;
typedef vtkMappedUnstructuredGridCellIterator<ImplementationType> ThisType;
static vtkMappedUnstructuredGridCellIterator<ImplementationType> *New();
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
void SetMappedUnstructuredGrid(
vtkMappedUnstructuredGrid<ImplementationType, ThisType> *grid);
- bool IsDoneWithTraversal() VTK_OVERRIDE;
- vtkIdType GetCellId() VTK_OVERRIDE;
+ bool IsDoneWithTraversal() override;
+ vtkIdType GetCellId() override;
protected:
vtkMappedUnstructuredGridCellIterator();
- ~vtkMappedUnstructuredGridCellIterator() VTK_OVERRIDE;
+ ~vtkMappedUnstructuredGridCellIterator() override;
- void ResetToFirstCell() VTK_OVERRIDE;
- void IncrementToNextCell() VTK_OVERRIDE;
- void FetchCellType() VTK_OVERRIDE;
- void FetchPointIds() VTK_OVERRIDE;
- void FetchPoints() VTK_OVERRIDE;
+ void ResetToFirstCell() override;
+ void IncrementToNextCell() override;
+ void FetchCellType() override;
+ void FetchPointIds() override;
+ void FetchPoints() override;
private:
vtkMappedUnstructuredGridCellIterator(const vtkMappedUnstructuredGridCellIterator &) VTK_DELETE_FUNCTION;
diff --git a/Common/DataModel/vtkMeanValueCoordinatesInterpolator.h b/Common/DataModel/vtkMeanValueCoordinatesInterpolator.h
index 7d9cd183e9ad0526ab151924e56e1c0f28a36903..851b2ec817b1cd1128b02a513d66e7cd0b4a2cb7 100644
--- a/Common/DataModel/vtkMeanValueCoordinatesInterpolator.h
+++ b/Common/DataModel/vtkMeanValueCoordinatesInterpolator.h
@@ -64,7 +64,7 @@ public:
*/
static vtkMeanValueCoordinatesInterpolator *New();
vtkTypeMacro(vtkMeanValueCoordinatesInterpolator,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
@@ -89,7 +89,7 @@ public:
protected:
vtkMeanValueCoordinatesInterpolator();
- ~vtkMeanValueCoordinatesInterpolator() VTK_OVERRIDE;
+ ~vtkMeanValueCoordinatesInterpolator() override;
/**
* Internal method that sets up the processing of triangular meshes.
diff --git a/Common/DataModel/vtkMergePoints.h b/Common/DataModel/vtkMergePoints.h
index d43206e30f2176452a0d8b7f13a663c6cf61581a..e3c34108c77512456504d5effcdbe8296b07abbd 100644
--- a/Common/DataModel/vtkMergePoints.h
+++ b/Common/DataModel/vtkMergePoints.h
@@ -35,7 +35,7 @@ class VTKCOMMONDATAMODEL_EXPORT vtkMergePoints : public vtkPointLocator
public:
static vtkMergePoints *New();
vtkTypeMacro(vtkMergePoints,vtkPointLocator);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -43,8 +43,8 @@ public:
* Return id of previously inserted point if this is true, otherwise return
* -1.
*/
- vtkIdType IsInsertedPoint(const double x[3]) VTK_OVERRIDE;
- vtkIdType IsInsertedPoint(double x, double y, double z) VTK_OVERRIDE
+ vtkIdType IsInsertedPoint(const double x[3]) override;
+ vtkIdType IsInsertedPoint(double x, double y, double z) override
{return this->vtkPointLocator::IsInsertedPoint(x, y, z); };
//@}
@@ -56,11 +56,11 @@ public:
* Note this combines the functionality of IsInsertedPoint() followed
* by a call to InsertNextPoint().
*/
- int InsertUniquePoint(const double x[3], vtkIdType &ptId) VTK_OVERRIDE;
+ int InsertUniquePoint(const double x[3], vtkIdType &ptId) override;
protected:
vtkMergePoints() {}
- ~vtkMergePoints() VTK_OVERRIDE {}
+ ~vtkMergePoints() override {}
private:
vtkMergePoints(const vtkMergePoints&) VTK_DELETE_FUNCTION;
diff --git a/Common/DataModel/vtkMolecule.h b/Common/DataModel/vtkMolecule.h
index d06cce1db7d99c9555e11a82ed2ab2bed4cff7c6..260f309d40cf407235af258d626b42e74d9e3ea3 100644
--- a/Common/DataModel/vtkMolecule.h
+++ b/Common/DataModel/vtkMolecule.h
@@ -89,13 +89,13 @@ class VTKCOMMONDATAMODEL_EXPORT vtkMolecule : public vtkUndirectedGraph
public:
static vtkMolecule *New();
vtkTypeMacro(vtkMolecule,vtkUndirectedGraph);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
- void Initialize() VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
+ void Initialize() override;
/**
* Return what type of dataset this is.
*/
- int GetDataObjectType() VTK_OVERRIDE {return VTK_MOLECULE;}
+ int GetDataObjectType() override {return VTK_MOLECULE;}
/**
* Add new atom with atomic number 0 (dummy atom) at origin. Return
@@ -223,24 +223,24 @@ public:
* but instead of reporting an error for an incompatible graph,
* returns false.
*/
- bool CheckedShallowCopy(vtkGraph *g) VTK_OVERRIDE;
+ bool CheckedShallowCopy(vtkGraph *g) override;
/**
* Performs the same operation as DeepCopy(),
* but instead of reporting an error for an incompatible graph,
* returns false.
*/
- bool CheckedDeepCopy(vtkGraph *g) VTK_OVERRIDE;
+ bool CheckedDeepCopy(vtkGraph *g) override;
/**
* Shallow copies the data object into this molecule.
*/
- void ShallowCopy(vtkDataObject *obj) VTK_OVERRIDE;
+ void ShallowCopy(vtkDataObject *obj) override;
/**
* Deep copies the data object into this molecule.
*/
- void DeepCopy(vtkDataObject *obj) VTK_OVERRIDE;
+ void DeepCopy(vtkDataObject *obj) override;
/**
* Shallow copies the atoms and bonds from @a m into @a this.
@@ -346,7 +346,7 @@ public:
protected:
vtkMolecule();
- ~vtkMolecule() VTK_OVERRIDE;
+ ~vtkMolecule() override;
/**
* Copy bonds and atoms.
diff --git a/Common/DataModel/vtkMultiBlockDataSet.h b/Common/DataModel/vtkMultiBlockDataSet.h
index 86b8944019114906bc094539f6bb9206fe94dc8d..5e0101e8725c2fb3df1e549ae523351abb8beecf 100644
--- a/Common/DataModel/vtkMultiBlockDataSet.h
+++ b/Common/DataModel/vtkMultiBlockDataSet.h
@@ -47,13 +47,13 @@ class VTKCOMMONDATAMODEL_EXPORT vtkMultiBlockDataSet : public vtkDataObjectTree
public:
static vtkMultiBlockDataSet* New();
vtkTypeMacro(vtkMultiBlockDataSet, vtkDataObjectTree);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Return class name of data type (see vtkType.h for
* definitions).
*/
- int GetDataObjectType() VTK_OVERRIDE {return VTK_MULTIBLOCK_DATA_SET;}
+ int GetDataObjectType() override {return VTK_MULTIBLOCK_DATA_SET;}
/**
* Set the number of blocks. This will cause allocation if the new number of
@@ -109,18 +109,18 @@ public:
/**
* Unhiding superclass method.
*/
- vtkInformation* GetMetaData(vtkCompositeDataIterator* iter) VTK_OVERRIDE
+ vtkInformation* GetMetaData(vtkCompositeDataIterator* iter) override
{ return this->Superclass::GetMetaData(iter); }
/**
* Unhiding superclass method.
*/
- int HasMetaData(vtkCompositeDataIterator* iter) VTK_OVERRIDE
+ int HasMetaData(vtkCompositeDataIterator* iter) override
{ return this->Superclass::HasMetaData(iter); }
protected:
vtkMultiBlockDataSet();
- ~vtkMultiBlockDataSet() VTK_OVERRIDE;
+ ~vtkMultiBlockDataSet() override;
private:
vtkMultiBlockDataSet(const vtkMultiBlockDataSet&) VTK_DELETE_FUNCTION;
diff --git a/Common/DataModel/vtkMultiPieceDataSet.h b/Common/DataModel/vtkMultiPieceDataSet.h
index b64067fa297d6eb9f4fc6e76081c6813ae7cf5f1..8916385a9a727cb9ad755302a646764c762aba01 100644
--- a/Common/DataModel/vtkMultiPieceDataSet.h
+++ b/Common/DataModel/vtkMultiPieceDataSet.h
@@ -42,13 +42,13 @@ class VTKCOMMONDATAMODEL_EXPORT vtkMultiPieceDataSet : public vtkDataObjectTree
public:
static vtkMultiPieceDataSet* New();
vtkTypeMacro(vtkMultiPieceDataSet, vtkDataObjectTree);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Return class name of data type (see vtkType.h for
* definitions).
*/
- int GetDataObjectType() VTK_OVERRIDE {return VTK_MULTIPIECE_DATA_SET;}
+ int GetDataObjectType() override {return VTK_MULTIPIECE_DATA_SET;}
/**
* Set the number of pieces. This will cause allocation if the new number of
@@ -102,18 +102,18 @@ public:
/**
* Unhiding superclass method.
*/
- vtkInformation* GetMetaData(vtkCompositeDataIterator* iter) VTK_OVERRIDE
+ vtkInformation* GetMetaData(vtkCompositeDataIterator* iter) override
{ return this->Superclass::GetMetaData(iter); }
/**
* Unhiding superclass method.
*/
- int HasMetaData(vtkCompositeDataIterator* iter) VTK_OVERRIDE
+ int HasMetaData(vtkCompositeDataIterator* iter) override
{ return this->Superclass::HasMetaData(iter); }
protected:
vtkMultiPieceDataSet();
- ~vtkMultiPieceDataSet() VTK_OVERRIDE;
+ ~vtkMultiPieceDataSet() override;
private:
vtkMultiPieceDataSet(const vtkMultiPieceDataSet&) VTK_DELETE_FUNCTION;
diff --git a/Common/DataModel/vtkMutableDirectedGraph.h b/Common/DataModel/vtkMutableDirectedGraph.h
index 9657aa32f2e9a957ca6a7d912af7d69151979e07..3d6e21fdfc05581b043ae43a8bb89a303c4f24e5 100644
--- a/Common/DataModel/vtkMutableDirectedGraph.h
+++ b/Common/DataModel/vtkMutableDirectedGraph.h
@@ -47,7 +47,7 @@ class VTKCOMMONDATAMODEL_EXPORT vtkMutableDirectedGraph : public vtkDirectedGrap
public:
static vtkMutableDirectedGraph *New();
vtkTypeMacro(vtkMutableDirectedGraph, vtkDirectedGraph);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Allocates space for the specified number of vertices in the graph's
@@ -330,7 +330,7 @@ public:
protected:
vtkMutableDirectedGraph();
- ~vtkMutableDirectedGraph() VTK_OVERRIDE;
+ ~vtkMutableDirectedGraph() override;
/**
* Graph edge that is reused of \p AddGraphEdge calls.
diff --git a/Common/DataModel/vtkMutableUndirectedGraph.h b/Common/DataModel/vtkMutableUndirectedGraph.h
index 365d1746df187fd9895308c9db7b0996b5f14fdb..e76ec77bf34ec7a929c6e4506e90c33a499fe8f9 100644
--- a/Common/DataModel/vtkMutableUndirectedGraph.h
+++ b/Common/DataModel/vtkMutableUndirectedGraph.h
@@ -45,7 +45,7 @@ class VTKCOMMONDATAMODEL_EXPORT vtkMutableUndirectedGraph : public vtkUndirected
public:
static vtkMutableUndirectedGraph *New();
vtkTypeMacro(vtkMutableUndirectedGraph, vtkUndirectedGraph);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Allocates space for the specified number of vertices in the graph's
@@ -323,7 +323,7 @@ public:
protected:
vtkMutableUndirectedGraph();
- ~vtkMutableUndirectedGraph() VTK_OVERRIDE;
+ ~vtkMutableUndirectedGraph() override;
/**
* Graph edge that is reused of AddGraphEdge calls.
diff --git a/Common/DataModel/vtkNonLinearCell.h b/Common/DataModel/vtkNonLinearCell.h
index 75fffd0ac5fe2cab22a3b6a15ef58ccbd6053bd1..70ec73e4e3575720e8da0058a8c9be15a80f31fc 100644
--- a/Common/DataModel/vtkNonLinearCell.h
+++ b/Common/DataModel/vtkNonLinearCell.h
@@ -37,18 +37,18 @@ class VTKCOMMONDATAMODEL_EXPORT vtkNonLinearCell : public vtkCell
{
public:
vtkTypeMacro(vtkNonLinearCell,vtkCell);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Non-linear cells require special treatment (tessellation) when
* converting to graphics primitives (during mapping). The vtkCell
* API IsLinear() is modified to indicate this requirement.
*/
- int IsLinear() VTK_OVERRIDE {return 0;}
+ int IsLinear() override {return 0;}
protected:
vtkNonLinearCell();
- ~vtkNonLinearCell() VTK_OVERRIDE {}
+ ~vtkNonLinearCell() override {}
private:
vtkNonLinearCell(const vtkNonLinearCell&) VTK_DELETE_FUNCTION;
diff --git a/Common/DataModel/vtkNonMergingPointLocator.h b/Common/DataModel/vtkNonMergingPointLocator.h
index 0223f0e2374862371588868d39fc6edf835a2dca..63e36250bed2f296d4d08e36cd36595bffd6c4bb 100644
--- a/Common/DataModel/vtkNonMergingPointLocator.h
+++ b/Common/DataModel/vtkNonMergingPointLocator.h
@@ -45,16 +45,16 @@ public:
static vtkNonMergingPointLocator * New();
vtkTypeMacro( vtkNonMergingPointLocator, vtkPointLocator );
- void PrintSelf( ostream & os, vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf( ostream & os, vtkIndent indent ) override;
/**
* Determine whether a given point x has been inserted into the points list.
* Return the id of the already inserted point if it is true, or -1 else.
* Note this function always returns -1 since any point is always inserted.
*/
- vtkIdType IsInsertedPoint( const double [3] ) VTK_OVERRIDE
+ vtkIdType IsInsertedPoint( const double [3] ) override
{ return -1; }
- vtkIdType IsInsertedPoint( double, double, double ) VTK_OVERRIDE
+ vtkIdType IsInsertedPoint( double, double, double ) override
{ return -1; }
/**
@@ -63,11 +63,11 @@ public:
* this function always returns 1 since any point is always inserted. The
* index of the point is returned via ptId.
*/
- int InsertUniquePoint( const double x[3], vtkIdType & ptId ) VTK_OVERRIDE;
+ int InsertUniquePoint( const double x[3], vtkIdType & ptId ) override;
protected:
vtkNonMergingPointLocator() { };
- ~vtkNonMergingPointLocator() VTK_OVERRIDE { };
+ ~vtkNonMergingPointLocator() override { };
private:
vtkNonMergingPointLocator( const vtkNonMergingPointLocator & ) VTK_DELETE_FUNCTION;
diff --git a/Common/DataModel/vtkNonOverlappingAMR.h b/Common/DataModel/vtkNonOverlappingAMR.h
index a7828c76c8fa6f6f7954aec7226d17d4fe2b41a6..9067e3e8f87f643a17336cb0f0553a4cd3f1a609 100644
--- a/Common/DataModel/vtkNonOverlappingAMR.h
+++ b/Common/DataModel/vtkNonOverlappingAMR.h
@@ -34,12 +34,12 @@ class VTKCOMMONDATAMODEL_EXPORT vtkNonOverlappingAMR : public vtkUniformGridAMR
public:
static vtkNonOverlappingAMR* New();
vtkTypeMacro(vtkNonOverlappingAMR,vtkUniformGridAMR);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Returns object type (see vtkType.h for definitions).
*/
- int GetDataObjectType() VTK_OVERRIDE {return VTK_NON_OVERLAPPING_AMR; }
+ int GetDataObjectType() override {return VTK_NON_OVERLAPPING_AMR; }
/**
* Retrieve an instance of this class from an information object.
@@ -51,7 +51,7 @@ class VTKCOMMONDATAMODEL_EXPORT vtkNonOverlappingAMR : public vtkUniformGridAMR
protected:
vtkNonOverlappingAMR();
- ~vtkNonOverlappingAMR() VTK_OVERRIDE;
+ ~vtkNonOverlappingAMR() override;
private:
vtkNonOverlappingAMR(const vtkNonOverlappingAMR&) VTK_DELETE_FUNCTION;
diff --git a/Common/DataModel/vtkOctreePointLocator.h b/Common/DataModel/vtkOctreePointLocator.h
index 74d9399d1b18449b07637b94e04a7e64e46733d3..4f22be0432b099c5852b3dc7765bfa08e6f5805d 100644
--- a/Common/DataModel/vtkOctreePointLocator.h
+++ b/Common/DataModel/vtkOctreePointLocator.h
@@ -50,7 +50,7 @@ class VTKCOMMONDATAMODEL_EXPORT vtkOctreePointLocator : public vtkAbstractPointL
{
public:
vtkTypeMacro(vtkOctreePointLocator, vtkAbstractPointLocator);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkOctreePointLocator *New();
@@ -86,8 +86,8 @@ public:
* Get the spatial bounds of the entire octree space. Sets
* bounds array to xmin, xmax, ymin, ymax, zmin, zmax.
*/
- double *GetBounds() VTK_OVERRIDE;
- void GetBounds(double *bounds) VTK_OVERRIDE;
+ double *GetBounds() override;
+ void GetBounds(double *bounds) override;
//@}
//@{
@@ -117,14 +117,14 @@ public:
* or data sets. Cells are assigned to octree spatial regions
* based on the location of their centroids.
*/
- void BuildLocator() VTK_OVERRIDE;
+ void BuildLocator() override;
//@{
/**
* Return the Id of the point that is closest to the given point.
* Set the square of the distance between the two points.
*/
- vtkIdType FindClosestPoint(const double x[3]) VTK_OVERRIDE;
+ vtkIdType FindClosestPoint(const double x[3]) override;
vtkIdType FindClosestPoint(double x, double y, double z, double &dist2);
//@}
@@ -134,7 +134,7 @@ public:
* dist2 returns the squared distance to the point.
*/
vtkIdType FindClosestPointWithinRadius(
- double radius, const double x[3], double& dist2) VTK_OVERRIDE;
+ double radius, const double x[3], double& dist2) override;
//@{
/**
@@ -152,7 +152,7 @@ public:
* The result is not sorted in any specific manner.
*/
void FindPointsWithinRadius(
- double radius, const double x[3], vtkIdList *result) VTK_OVERRIDE;
+ double radius, const double x[3], vtkIdList *result) override;
/**
* Find the closest N points to a position. This returns the closest
@@ -163,7 +163,7 @@ public:
* indirectly called from a single thread first.
*/
void FindClosestNPoints(int N, const double x[3],
- vtkIdList *result) VTK_OVERRIDE;
+ vtkIdList *result) override;
/**
* Get a list of the original IDs of all points in a leaf node.
@@ -173,13 +173,13 @@ public:
/**
* Delete the octree data structure.
*/
- void FreeSearchStructure() VTK_OVERRIDE;
+ void FreeSearchStructure() override;
/**
* Create a polydata representation of the boundaries of
* the octree regions.
*/
- void GenerateRepresentation(int level, vtkPolyData *pd) VTK_OVERRIDE;
+ void GenerateRepresentation(int level, vtkPolyData *pd) override;
/**
* Fill ids with points found in area. The area is a 6-tuple containing
@@ -192,7 +192,7 @@ public:
protected:
vtkOctreePointLocator();
- ~vtkOctreePointLocator() VTK_OVERRIDE;
+ ~vtkOctreePointLocator() override;
vtkOctreePointLocatorNode *Top;
vtkOctreePointLocatorNode **LeafNodeList; // indexed by region/node ID
diff --git a/Common/DataModel/vtkOctreePointLocatorNode.h b/Common/DataModel/vtkOctreePointLocatorNode.h
index 558bd3ca3d9481a3d8122785979883002233a901..c075338d333f198f3c9d8fda0987049e3acb54b8 100644
--- a/Common/DataModel/vtkOctreePointLocatorNode.h
+++ b/Common/DataModel/vtkOctreePointLocatorNode.h
@@ -47,7 +47,7 @@ class VTKCOMMONDATAMODEL_EXPORT vtkOctreePointLocatorNode : public vtkObject
{
public:
vtkTypeMacro(vtkOctreePointLocatorNode, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkOctreePointLocatorNode *New();
@@ -252,7 +252,7 @@ public:
protected:
vtkOctreePointLocatorNode();
- ~vtkOctreePointLocatorNode() VTK_OVERRIDE;
+ ~vtkOctreePointLocatorNode() override;
private:
diff --git a/Common/DataModel/vtkOrderedTriangulator.h b/Common/DataModel/vtkOrderedTriangulator.h
index a26fa166c50c4f629ed69ddf08bcd7971f4bddb1..6bf7914a4e9c9520ad9ac770f47495af390a1bd4 100644
--- a/Common/DataModel/vtkOrderedTriangulator.h
+++ b/Common/DataModel/vtkOrderedTriangulator.h
@@ -115,7 +115,7 @@ class VTKCOMMONDATAMODEL_EXPORT vtkOrderedTriangulator : public vtkObject
{
public:
vtkTypeMacro(vtkOrderedTriangulator,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct object.
@@ -341,7 +341,7 @@ public:
protected:
vtkOrderedTriangulator();
- ~vtkOrderedTriangulator() VTK_OVERRIDE;
+ ~vtkOrderedTriangulator() override;
private:
void Initialize();
diff --git a/Common/DataModel/vtkOutEdgeIterator.h b/Common/DataModel/vtkOutEdgeIterator.h
index d368b1cc383759fea8adf64f5faf75aacfc3d54c..bfd1bfb25938bee974874aaf89fd0e445d1e83ac 100644
--- a/Common/DataModel/vtkOutEdgeIterator.h
+++ b/Common/DataModel/vtkOutEdgeIterator.h
@@ -47,7 +47,7 @@ class VTKCOMMONDATAMODEL_EXPORT vtkOutEdgeIterator : public vtkObject
public:
static vtkOutEdgeIterator *New();
vtkTypeMacro(vtkOutEdgeIterator, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Initialize the iterator with a graph and vertex.
@@ -93,7 +93,7 @@ public:
protected:
vtkOutEdgeIterator();
- ~vtkOutEdgeIterator() VTK_OVERRIDE;
+ ~vtkOutEdgeIterator() override;
/**
* Protected method for setting the graph used
diff --git a/Common/DataModel/vtkOverlappingAMR.h b/Common/DataModel/vtkOverlappingAMR.h
index 01b3d690e1b428e3bc9c494afd462fd61acff879..a61b02899479808423d9c715b1ad011ec2bac5e2 100644
--- a/Common/DataModel/vtkOverlappingAMR.h
+++ b/Common/DataModel/vtkOverlappingAMR.h
@@ -45,15 +45,15 @@ public:
/**
* Return class name of data type (see vtkType.h for definitions).
*/
- int GetDataObjectType() VTK_OVERRIDE {return VTK_OVERLAPPING_AMR;}
+ int GetDataObjectType() override {return VTK_OVERLAPPING_AMR;}
vtkTypeMacro(vtkOverlappingAMR,vtkUniformGridAMR);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Return a new iterator (the iterator has to be deleted by the user).
*/
- VTK_NEWINSTANCE vtkCompositeDataIterator* NewIterator() VTK_OVERRIDE;
+ VTK_NEWINSTANCE vtkCompositeDataIterator* NewIterator() override;
//@{
/**
@@ -170,9 +170,9 @@ public:
/**
* Get/Set the internal representation of amr meta meta data
*/
- vtkAMRInformation* GetAMRInfo() VTK_OVERRIDE
+ vtkAMRInformation* GetAMRInfo() override
{ return Superclass::GetAMRInfo();}
- void SetAMRInfo(vtkAMRInformation* info) VTK_OVERRIDE
+ void SetAMRInfo(vtkAMRInformation* info) override
{ return Superclass::SetAMRInfo(info);}
//@{
@@ -184,7 +184,7 @@ public:
void Audit();
protected:
vtkOverlappingAMR();
- ~vtkOverlappingAMR() VTK_OVERRIDE;
+ ~vtkOverlappingAMR() override;
//@}
private:
diff --git a/Common/DataModel/vtkPath.h b/Common/DataModel/vtkPath.h
index 9fb58a68823d20bbe168867d8670f60988457dcf..8b81eb492bc1b5ae912d1cb11666108085668f5b 100644
--- a/Common/DataModel/vtkPath.h
+++ b/Common/DataModel/vtkPath.h
@@ -35,12 +35,12 @@ public:
static vtkPath *New();
vtkTypeMacro(vtkPath,vtkPointSet);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Return what type of dataset this is.
*/
- int GetDataObjectType() VTK_OVERRIDE {return VTK_PATH;}
+ int GetDataObjectType() override {return VTK_PATH;}
/**
* Enumeration of recognized control point types:
@@ -84,26 +84,26 @@ public:
/**
* vtkPath doesn't use cells. These methods return trivial values.
*/
- vtkIdType GetNumberOfCells() VTK_OVERRIDE { return 0; }
+ vtkIdType GetNumberOfCells() override { return 0; }
using vtkDataSet::GetCell;
- vtkCell *GetCell(vtkIdType) VTK_OVERRIDE { return nullptr; }
- void GetCell(vtkIdType, vtkGenericCell *) VTK_OVERRIDE;
- int GetCellType(vtkIdType) VTK_OVERRIDE { return 0; }
+ vtkCell *GetCell(vtkIdType) override { return nullptr; }
+ void GetCell(vtkIdType, vtkGenericCell *) override;
+ int GetCellType(vtkIdType) override { return 0; }
/**
* vtkPath doesn't use cells, this method just clears ptIds.
*/
- void GetCellPoints(vtkIdType, vtkIdList *ptIds) VTK_OVERRIDE;
+ void GetCellPoints(vtkIdType, vtkIdList *ptIds) override;
/**
* vtkPath doesn't use cells, this method just clears cellIds.
*/
- void GetPointCells(vtkIdType ptId, vtkIdList *cellIds) VTK_OVERRIDE;
+ void GetPointCells(vtkIdType ptId, vtkIdList *cellIds) override;
/**
* Return the maximum cell size in this poly data.
*/
- int GetMaxCellSize() VTK_OVERRIDE { return 0; }
+ int GetMaxCellSize() override { return 0; }
/**
* Method allocates initial storage for points. Use this method before the
@@ -127,7 +127,7 @@ public:
protected:
vtkPath();
- ~vtkPath() VTK_OVERRIDE;
+ ~vtkPath() override;
private:
vtkPath(const vtkPath&) VTK_DELETE_FUNCTION;
diff --git a/Common/DataModel/vtkPentagonalPrism.h b/Common/DataModel/vtkPentagonalPrism.h
index 5b1e2733b982b69667e6c1abe3d76ea768cb6e93..8eb146b8c052dbfdf2c5c8acdffa13c94812e3ae 100644
--- a/Common/DataModel/vtkPentagonalPrism.h
+++ b/Common/DataModel/vtkPentagonalPrism.h
@@ -55,45 +55,45 @@ class VTKCOMMONDATAMODEL_EXPORT vtkPentagonalPrism : public vtkCell3D
public:
static vtkPentagonalPrism *New();
vtkTypeMacro(vtkPentagonalPrism,vtkCell3D);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
* See vtkCell3D API for description of these methods.
*/
- void GetEdgePoints(int edgeId, int* &pts) VTK_OVERRIDE;
- void GetFacePoints(int faceId, int* &pts) VTK_OVERRIDE;
+ void GetEdgePoints(int edgeId, int* &pts) override;
+ void GetFacePoints(int faceId, int* &pts) override;
//@}
//@{
/**
* See the vtkCell3D API for descriptions of these methods.
*/
- int GetCellType() VTK_OVERRIDE {return VTK_PENTAGONAL_PRISM;};
- int GetCellDimension() VTK_OVERRIDE {return 3;};
- int GetNumberOfEdges() VTK_OVERRIDE {return 15;};
- int GetNumberOfFaces() VTK_OVERRIDE {return 7;};
- vtkCell *GetEdge(int edgeId) VTK_OVERRIDE;
- vtkCell *GetFace(int faceId) VTK_OVERRIDE;
- int CellBoundary(int subId, double pcoords[3], vtkIdList *pts) VTK_OVERRIDE;
+ int GetCellType() override {return VTK_PENTAGONAL_PRISM;};
+ int GetCellDimension() override {return 3;};
+ int GetNumberOfEdges() override {return 15;};
+ int GetNumberOfFaces() override {return 7;};
+ vtkCell *GetEdge(int edgeId) override;
+ vtkCell *GetFace(int faceId) override;
+ int CellBoundary(int subId, double pcoords[3], vtkIdList *pts) override;
//@}
int EvaluatePosition(double x[3], double* closestPoint,
int& subId, double pcoords[3],
- double& dist2, double *weights) VTK_OVERRIDE;
+ double& dist2, double *weights) override;
void EvaluateLocation(int& subId, double pcoords[3], double x[3],
- double *weights) VTK_OVERRIDE;
+ double *weights) override;
int IntersectWithLine(double p1[3], double p2[3], double tol, double& t,
- double x[3], double pcoords[3], int& subId) VTK_OVERRIDE;
- int Triangulate(int index, vtkIdList *ptIds, vtkPoints *pts) VTK_OVERRIDE;
+ double x[3], double pcoords[3], int& subId) override;
+ int Triangulate(int index, vtkIdList *ptIds, vtkPoints *pts) override;
void Derivatives(int subId, double pcoords[3], double *values,
- int dim, double *derivs) VTK_OVERRIDE;
- double *GetParametricCoords() VTK_OVERRIDE;
+ int dim, double *derivs) override;
+ double *GetParametricCoords() override;
/**
* Return the center of the wedge in parametric coordinates.
*/
- int GetParametricCenter(double pcoords[3]) VTK_OVERRIDE;
+ int GetParametricCenter(double pcoords[3]) override;
/**
* @deprecated Replaced by vtkPentagonalPrism::InterpolateFunctions as of VTK 5.2
@@ -108,11 +108,11 @@ public:
* Compute the interpolation functions/derivatives
* (aka shape functions/derivatives)
*/
- void InterpolateFunctions(double pcoords[3], double weights[10]) VTK_OVERRIDE
+ void InterpolateFunctions(double pcoords[3], double weights[10]) override
{
vtkPentagonalPrism::InterpolationFunctions(pcoords, weights);
}
- void InterpolateDerivs(double pcoords[3], double derivs[30]) VTK_OVERRIDE
+ void InterpolateDerivs(double pcoords[3], double derivs[30]) override
{
vtkPentagonalPrism::InterpolationDerivs(pcoords, derivs);
}
@@ -136,7 +136,7 @@ public:
protected:
vtkPentagonalPrism();
- ~vtkPentagonalPrism() VTK_OVERRIDE;
+ ~vtkPentagonalPrism() override;
vtkLine *Line;
vtkQuad *Quad;
diff --git a/Common/DataModel/vtkPerlinNoise.h b/Common/DataModel/vtkPerlinNoise.h
index d56378d879ae626a1cf9b79d6121342bf01ac954..55cda82c72bbeb9a66dbb9aaa155d71a553ddb58 100644
--- a/Common/DataModel/vtkPerlinNoise.h
+++ b/Common/DataModel/vtkPerlinNoise.h
@@ -39,7 +39,7 @@ class VTKCOMMONDATAMODEL_EXPORT vtkPerlinNoise : public vtkImplicitFunction
{
public:
vtkTypeMacro(vtkPerlinNoise,vtkImplicitFunction);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Instantiate the class.
@@ -51,14 +51,14 @@ public:
* Evaluate PerlinNoise function.
*/
using vtkImplicitFunction::EvaluateFunction;
- double EvaluateFunction(double x[3]) VTK_OVERRIDE;
+ double EvaluateFunction(double x[3]) override;
//@}
/**
* Evaluate PerlinNoise gradient. Currently, the method returns a 0
* gradient.
*/
- void EvaluateGradient(double x[3], double n[3]) VTK_OVERRIDE;
+ void EvaluateGradient(double x[3], double n[3]) override;
//@{
/**
@@ -94,7 +94,7 @@ public:
protected:
vtkPerlinNoise();
- ~vtkPerlinNoise() VTK_OVERRIDE {}
+ ~vtkPerlinNoise() override {}
double Frequency[3];
double Phase[3];
diff --git a/Common/DataModel/vtkPiecewiseFunction.h b/Common/DataModel/vtkPiecewiseFunction.h
index 08844dd4bd0663489775b1df5d09ac17f2be1d28..ef13836358dc26c601fa48588091fbe4a9b3f63e 100644
--- a/Common/DataModel/vtkPiecewiseFunction.h
+++ b/Common/DataModel/vtkPiecewiseFunction.h
@@ -47,15 +47,15 @@ class VTKCOMMONDATAMODEL_EXPORT vtkPiecewiseFunction : public vtkDataObject
public:
static vtkPiecewiseFunction *New();
vtkTypeMacro(vtkPiecewiseFunction,vtkDataObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
- void DeepCopy( vtkDataObject *f ) VTK_OVERRIDE;
- void ShallowCopy( vtkDataObject *f ) VTK_OVERRIDE;
+ void DeepCopy( vtkDataObject *f ) override;
+ void ShallowCopy( vtkDataObject *f ) override;
/**
* Return what type of dataset this is.
*/
- int GetDataObjectType() VTK_OVERRIDE {return VTK_PIECEWISE_FUNCTION;};
+ int GetDataObjectType() override {return VTK_PIECEWISE_FUNCTION;};
/**
* Get the number of points used to specify the function
@@ -182,7 +182,7 @@ public:
* is alreay initialized, so there is no need to call this method which
* in turn simply calls RemoveAllPoints()
*/
- void Initialize() VTK_OVERRIDE;
+ void Initialize() override;
//@{
/**
@@ -210,7 +210,7 @@ public:
protected:
vtkPiecewiseFunction();
- ~vtkPiecewiseFunction() VTK_OVERRIDE;
+ ~vtkPiecewiseFunction() override;
// Internal method to sort the vector and update the
// Range whenever a node is added, edited or removed.
diff --git a/Common/DataModel/vtkPixel.h b/Common/DataModel/vtkPixel.h
index 7b86937a9d50a6cbde2893d04e0cd0cbd7282e72..54eddfa2cc69971a591300d116ac41cfca8c7f8d 100644
--- a/Common/DataModel/vtkPixel.h
+++ b/Common/DataModel/vtkPixel.h
@@ -36,47 +36,47 @@ class VTKCOMMONDATAMODEL_EXPORT vtkPixel : public vtkCell
public:
static vtkPixel *New();
vtkTypeMacro(vtkPixel,vtkCell);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
* See the vtkCell API for descriptions of these methods.
*/
- int GetCellType() VTK_OVERRIDE {return VTK_PIXEL;};
- int GetCellDimension() VTK_OVERRIDE {return 2;};
- int GetNumberOfEdges() VTK_OVERRIDE {return 4;};
- int GetNumberOfFaces() VTK_OVERRIDE {return 0;};
- vtkCell *GetEdge(int edgeId) VTK_OVERRIDE;
- vtkCell *GetFace(int) VTK_OVERRIDE {return nullptr;};
- int CellBoundary(int subId, double pcoords[3], vtkIdList *pts) VTK_OVERRIDE;
+ int GetCellType() override {return VTK_PIXEL;};
+ int GetCellDimension() override {return 2;};
+ int GetNumberOfEdges() override {return 4;};
+ int GetNumberOfFaces() override {return 0;};
+ vtkCell *GetEdge(int edgeId) override;
+ vtkCell *GetFace(int) override {return nullptr;};
+ int CellBoundary(int subId, double pcoords[3], vtkIdList *pts) override;
void Contour(double value, vtkDataArray *cellScalars,
vtkIncrementalPointLocator *locator, vtkCellArray *verts,
vtkCellArray *lines, vtkCellArray *polys,
vtkPointData *inPd, vtkPointData *outPd,
- vtkCellData *inCd, vtkIdType cellId, vtkCellData *outCd) VTK_OVERRIDE;
+ vtkCellData *inCd, vtkIdType cellId, vtkCellData *outCd) override;
void Clip(double value, vtkDataArray *cellScalars,
vtkIncrementalPointLocator *locator, vtkCellArray *polys,
vtkPointData *inPd, vtkPointData *outPd,
vtkCellData *inCd, vtkIdType cellId, vtkCellData *outCd,
- int insideOut) VTK_OVERRIDE;
+ int insideOut) override;
int EvaluatePosition(double x[3], double* closestPoint,
int& subId, double pcoords[3],
- double& dist2, double *weights) VTK_OVERRIDE;
+ double& dist2, double *weights) override;
void EvaluateLocation(int& subId, double pcoords[3], double x[3],
- double *weights) VTK_OVERRIDE;
+ double *weights) override;
//@}
/**
* Return the center of the triangle in parametric coordinates.
*/
- int GetParametricCenter(double pcoords[3]) VTK_OVERRIDE;
+ int GetParametricCenter(double pcoords[3]) override;
int IntersectWithLine(double p1[3], double p2[3], double tol, double& t,
- double x[3], double pcoords[3], int& subId) VTK_OVERRIDE;
- int Triangulate(int index, vtkIdList *ptIds, vtkPoints *pts) VTK_OVERRIDE;
+ double x[3], double pcoords[3], int& subId) override;
+ int Triangulate(int index, vtkIdList *ptIds, vtkPoints *pts) override;
void Derivatives(int subId, double pcoords[3], double *values,
- int dim, double *derivs) VTK_OVERRIDE;
- double *GetParametricCoords() VTK_OVERRIDE;
+ int dim, double *derivs) override;
+ double *GetParametricCoords() override;
/**
* @deprecated Replaced by vtkPixel::InterpolateFunctions as of VTK 5.2
@@ -91,11 +91,11 @@ public:
* Compute the interpolation functions/derivatives
* (aka shape functions/derivatives)
*/
- void InterpolateFunctions(double pcoords[3], double weights[4]) VTK_OVERRIDE
+ void InterpolateFunctions(double pcoords[3], double weights[4]) override
{
vtkPixel::InterpolationFunctions(pcoords,weights);
}
- void InterpolateDerivs(double pcoords[3], double derivs[8]) VTK_OVERRIDE
+ void InterpolateDerivs(double pcoords[3], double derivs[8]) override
{
vtkPixel::InterpolationDerivs(pcoords,derivs);
}
@@ -103,7 +103,7 @@ public:
protected:
vtkPixel();
- ~vtkPixel() VTK_OVERRIDE;
+ ~vtkPixel() override;
vtkLine *Line;
diff --git a/Common/DataModel/vtkPlane.h b/Common/DataModel/vtkPlane.h
index da1cbd4dd3e5afae1c08a3ca546931afc4c7bf55..4f9a4da50bb876073b6bc71fa9b9baf6ade9cd05 100644
--- a/Common/DataModel/vtkPlane.h
+++ b/Common/DataModel/vtkPlane.h
@@ -37,21 +37,21 @@ public:
static vtkPlane *New();
vtkTypeMacro(vtkPlane,vtkImplicitFunction);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
* Evaluate plane equation for point x[3].
*/
using vtkImplicitFunction::EvaluateFunction;
- void EvaluateFunction(vtkDataArray* input, vtkDataArray* output) VTK_OVERRIDE;
- double EvaluateFunction(double x[3]) VTK_OVERRIDE;
+ void EvaluateFunction(vtkDataArray* input, vtkDataArray* output) override;
+ double EvaluateFunction(double x[3]) override;
//@}
/**
* Evaluate function gradient at point x[3].
*/
- void EvaluateGradient(double x[3], double g[3]) VTK_OVERRIDE;
+ void EvaluateGradient(double x[3], double g[3]) override;
//@{
/**
@@ -140,7 +140,7 @@ public:
protected:
vtkPlane();
- ~vtkPlane() VTK_OVERRIDE {}
+ ~vtkPlane() override {}
double Normal[3];
double Origin[3];
diff --git a/Common/DataModel/vtkPlaneCollection.h b/Common/DataModel/vtkPlaneCollection.h
index 4f3a241699867138f040309798fc078deb445bc7..2ca4bc6e1003d609c86c05346ad6ac9f131b2176 100644
--- a/Common/DataModel/vtkPlaneCollection.h
+++ b/Common/DataModel/vtkPlaneCollection.h
@@ -60,7 +60,7 @@ public:
protected:
vtkPlaneCollection() {}
- ~vtkPlaneCollection() VTK_OVERRIDE {}
+ ~vtkPlaneCollection() override {}
private:
diff --git a/Common/DataModel/vtkPlanes.h b/Common/DataModel/vtkPlanes.h
index fec7cb10e3075ed623bec3078d8eac87d96f469c..18b58817618fd5d5d8c7a168d5ee63fbd227ea81 100644
--- a/Common/DataModel/vtkPlanes.h
+++ b/Common/DataModel/vtkPlanes.h
@@ -50,20 +50,20 @@ class VTKCOMMONDATAMODEL_EXPORT vtkPlanes : public vtkImplicitFunction
public:
static vtkPlanes *New();
vtkTypeMacro(vtkPlanes,vtkImplicitFunction);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
* Evaluate plane equations. Return smallest absolute value.
*/
using vtkImplicitFunction::EvaluateFunction;
- double EvaluateFunction(double x[3]) VTK_OVERRIDE;
+ double EvaluateFunction(double x[3]) override;
//@}
/**
* Evaluate planes gradient.
*/
- void EvaluateGradient(double x[3], double n[3]) VTK_OVERRIDE;
+ void EvaluateGradient(double x[3], double n[3]) override;
//@{
/**
@@ -121,7 +121,7 @@ public:
protected:
vtkPlanes();
- ~vtkPlanes() VTK_OVERRIDE;
+ ~vtkPlanes() override;
vtkPoints *Points;
vtkDataArray *Normals;
diff --git a/Common/DataModel/vtkPlanesIntersection.h b/Common/DataModel/vtkPlanesIntersection.h
index bd535fa8ca0c1c54e867062164f48f7ed0dceb25..2b223237a3d730f4ebf85ed8413e462d08e56536 100644
--- a/Common/DataModel/vtkPlanesIntersection.h
+++ b/Common/DataModel/vtkPlanesIntersection.h
@@ -54,7 +54,7 @@ class VTKCOMMONDATAMODEL_EXPORT vtkPlanesIntersection : public vtkPlanes
vtkTypeMacro(vtkPlanesIntersection, vtkPlanes);
public:
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkPlanesIntersection *New();
@@ -109,7 +109,7 @@ protected:
static int Invert3x3(double M[3][3]);
vtkPlanesIntersection();
- ~vtkPlanesIntersection() VTK_OVERRIDE;
+ ~vtkPlanesIntersection() override;
private:
diff --git a/Common/DataModel/vtkPointData.h b/Common/DataModel/vtkPointData.h
index ddc68d14601171fee63aebe3090dea8764042e2b..b929603ec95849c5432a1c1d4db68782a89c1b72 100644
--- a/Common/DataModel/vtkPointData.h
+++ b/Common/DataModel/vtkPointData.h
@@ -34,12 +34,12 @@ public:
static vtkPointData *New();
vtkTypeMacro(vtkPointData,vtkDataSetAttributes);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
void NullPoint(vtkIdType ptId);
protected:
vtkPointData() {}
- ~vtkPointData() VTK_OVERRIDE {}
+ ~vtkPointData() override {}
private:
vtkPointData(const vtkPointData&) VTK_DELETE_FUNCTION;
diff --git a/Common/DataModel/vtkPointLocator.h b/Common/DataModel/vtkPointLocator.h
index 82b20b002ce7fc2833babf08b1c1bf636fecc4b0..d89e0d0699f5d8d6f6d5deccd32318da79e5d6d8 100644
--- a/Common/DataModel/vtkPointLocator.h
+++ b/Common/DataModel/vtkPointLocator.h
@@ -61,7 +61,7 @@ public:
* Standard methods for type management and printing.
*/
vtkTypeMacro(vtkPointLocator,vtkIncrementalPointLocator);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -89,7 +89,7 @@ public:
* These methods are thread safe if BuildLocator() is directly or
* indirectly called from a single thread first.
*/
- vtkIdType FindClosestPoint(const double x[3]) VTK_OVERRIDE;
+ vtkIdType FindClosestPoint(const double x[3]) override;
//@{
/**
@@ -100,7 +100,7 @@ public:
* distance to the point.
*/
vtkIdType FindClosestPointWithinRadius(
- double radius, const double x[3], double& dist2) VTK_OVERRIDE;
+ double radius, const double x[3], double& dist2) override;
virtual vtkIdType FindClosestPointWithinRadius(
double radius, const double x[3],
double inputDataLength, double& dist2);
@@ -113,7 +113,7 @@ public:
* Not thread safe.
*/
int InitPointInsertion(vtkPoints *newPts,
- const double bounds[6]) VTK_OVERRIDE;
+ const double bounds[6]) override;
/**
* Initialize the point insertion process. The newPts is an object
@@ -122,7 +122,7 @@ public:
* Not thread safe.
*/
int InitPointInsertion(vtkPoints *newPts, const double bounds[6],
- vtkIdType estSize) VTK_OVERRIDE;
+ vtkIdType estSize) override;
/**
* Incrementally insert a point into search structure with a particular
@@ -133,7 +133,7 @@ public:
* divs are properly set. (See InitPointInsertion().)
* Not thread safe.
*/
- void InsertPoint(vtkIdType ptId, const double x[3]) VTK_OVERRIDE;
+ void InsertPoint(vtkIdType ptId, const double x[3]) override;
/**
* Incrementally insert a point into search structure. The method returns
@@ -145,7 +145,7 @@ public:
* properly set. (See InitPointInsertion().)
* Not thread safe.
*/
- vtkIdType InsertNextPoint(const double x[3]) VTK_OVERRIDE;
+ vtkIdType InsertNextPoint(const double x[3]) override;
//@{
/**
@@ -153,13 +153,13 @@ public:
* Return id of previously inserted point if this is true, otherwise return
* -1. This method is thread safe.
*/
- vtkIdType IsInsertedPoint(double x, double y, double z) VTK_OVERRIDE
+ vtkIdType IsInsertedPoint(double x, double y, double z) override
{
double xyz[3];
xyz[0] = x; xyz[1] = y; xyz[2] = z;
return this->IsInsertedPoint (xyz);
};
- vtkIdType IsInsertedPoint(const double x[3]) VTK_OVERRIDE;
+ vtkIdType IsInsertedPoint(const double x[3]) override;
//@}
/**
@@ -171,7 +171,7 @@ public:
* by a call to InsertNextPoint().
* This method is not thread safe.
*/
- int InsertUniquePoint(const double x[3], vtkIdType &ptId) VTK_OVERRIDE;
+ int InsertUniquePoint(const double x[3], vtkIdType &ptId) override;
/**
* Given a position x, return the id of the point closest to it. This method
@@ -180,7 +180,7 @@ public:
* This method is thread safe if BuildLocator() is directly or
* indirectly called from a single thread first.
*/
- vtkIdType FindClosestInsertedPoint(const double x[3]) VTK_OVERRIDE;
+ vtkIdType FindClosestInsertedPoint(const double x[3]) override;
/**
* Find the closest N points to a position. This returns the closest
@@ -191,7 +191,7 @@ public:
* indirectly called from a single thread first.
*/
void FindClosestNPoints(int N, const double x[3],
- vtkIdList *result) VTK_OVERRIDE;
+ vtkIdList *result) override;
//@{
/**
@@ -214,7 +214,7 @@ public:
* indirectly called from a single thread first.
*/
void FindPointsWithinRadius(double R, const double x[3],
- vtkIdList *result) VTK_OVERRIDE;
+ vtkIdList *result) override;
/**
* Given a position x, return the list of points in the bucket that
@@ -236,15 +236,15 @@ public:
* See vtkLocator interface documentation.
* These methods are not thread safe.
*/
- void Initialize() VTK_OVERRIDE;
- void FreeSearchStructure() VTK_OVERRIDE;
- void BuildLocator() VTK_OVERRIDE;
- void GenerateRepresentation(int level, vtkPolyData *pd) VTK_OVERRIDE;
+ void Initialize() override;
+ void FreeSearchStructure() override;
+ void BuildLocator() override;
+ void GenerateRepresentation(int level, vtkPolyData *pd) override;
//@}
protected:
vtkPointLocator();
- ~vtkPointLocator() VTK_OVERRIDE;
+ ~vtkPointLocator() override;
// place points in appropriate buckets
void GetBucketNeighbors(vtkNeighborPoints* buckets,
diff --git a/Common/DataModel/vtkPointSet.h b/Common/DataModel/vtkPointSet.h
index 02907067a2ef547a89a00c4722c878df31516094..bbfa4ef8adee4a8724d0c80d662546c725b8b92d 100644
--- a/Common/DataModel/vtkPointSet.h
+++ b/Common/DataModel/vtkPointSet.h
@@ -40,35 +40,35 @@ class VTKCOMMONDATAMODEL_EXPORT vtkPointSet : public vtkDataSet
{
public:
vtkTypeMacro(vtkPointSet,vtkDataSet);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Reset to an empty state and free any memory.
*/
- void Initialize() VTK_OVERRIDE;
+ void Initialize() override;
/**
* Copy the geometric structure of an input point set object.
*/
- void CopyStructure(vtkDataSet *pd) VTK_OVERRIDE;
+ void CopyStructure(vtkDataSet *pd) override;
//@{
/**
* See vtkDataSet for additional information.
*/
- vtkIdType GetNumberOfPoints() VTK_OVERRIDE;
- void GetPoint(vtkIdType ptId, double x[3]) VTK_OVERRIDE
+ vtkIdType GetNumberOfPoints() override;
+ void GetPoint(vtkIdType ptId, double x[3]) override
{this->Points->GetPoint(ptId,x);};
- vtkIdType FindPoint(double x[3]) VTK_OVERRIDE;
+ vtkIdType FindPoint(double x[3]) override;
vtkIdType FindPoint(double x, double y, double z) {
return this->vtkDataSet::FindPoint(x, y, z);};
vtkIdType FindCell(double x[3], vtkCell *cell, vtkIdType cellId,
double tol2, int& subId, double pcoords[3],
- double *weights) VTK_OVERRIDE;
+ double *weights) override;
vtkIdType FindCell(double x[3], vtkCell *cell,
vtkGenericCell *gencell, vtkIdType cellId,
double tol2, int& subId, double pcoords[3],
- double *weights) VTK_OVERRIDE;
+ double *weights) override;
//@}
/**
@@ -77,28 +77,28 @@ public:
* and its values are only valid as long as another method invocation is not
* performed. Prefer GetPoint() with the return value in argument.
*/
- double *GetPoint(vtkIdType ptId) VTK_OVERRIDE
+ double *GetPoint(vtkIdType ptId) override
{return this->Points->GetPoint(ptId);};
/**
* Return an iterator that traverses the cells in this data set.
*/
- vtkCellIterator* NewCellIterator() VTK_OVERRIDE;
+ vtkCellIterator* NewCellIterator() override;
/**
* Get MTime which also considers its vtkPoints MTime.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
/**
* Compute the (X, Y, Z) bounds of the data.
*/
- void ComputeBounds() VTK_OVERRIDE;
+ void ComputeBounds() override;
/**
* Reclaim any unused memory.
*/
- void Squeeze() VTK_OVERRIDE;
+ void Squeeze() override;
//@{
/**
@@ -116,22 +116,22 @@ public:
* arrays, etc. are not included in the return value). THIS METHOD
* IS THREAD SAFE.
*/
- unsigned long GetActualMemorySize() VTK_OVERRIDE;
+ unsigned long GetActualMemorySize() override;
//@{
/**
* Shallow and Deep copy.
*/
- void ShallowCopy(vtkDataObject *src) VTK_OVERRIDE;
- void DeepCopy(vtkDataObject *src) VTK_OVERRIDE;
+ void ShallowCopy(vtkDataObject *src) override;
+ void DeepCopy(vtkDataObject *src) override;
//@}
//@{
/**
* Overwritten to handle the data/locator loop
*/
- void Register(vtkObjectBase* o) VTK_OVERRIDE;
- void UnRegister(vtkObjectBase* o) VTK_OVERRIDE;
+ void Register(vtkObjectBase* o) override;
+ void UnRegister(vtkObjectBase* o) override;
//@}
//@{
@@ -144,12 +144,12 @@ public:
protected:
vtkPointSet();
- ~vtkPointSet() VTK_OVERRIDE;
+ ~vtkPointSet() override;
vtkPoints *Points;
vtkPointLocator *Locator;
- void ReportReferences(vtkGarbageCollector*) VTK_OVERRIDE;
+ void ReportReferences(vtkGarbageCollector*) override;
private:
void Cleanup();
diff --git a/Common/DataModel/vtkPointSetCellIterator.h b/Common/DataModel/vtkPointSetCellIterator.h
index 150edb5a79e6597c736a80370cca3451a001fa06..1a0f1595edd2bb963784b4cc050c639693f8c7e7 100644
--- a/Common/DataModel/vtkPointSetCellIterator.h
+++ b/Common/DataModel/vtkPointSetCellIterator.h
@@ -33,20 +33,20 @@ class VTKCOMMONDATAMODEL_EXPORT vtkPointSetCellIterator: public vtkCellIterator
public:
static vtkPointSetCellIterator *New();
vtkTypeMacro(vtkPointSetCellIterator, vtkCellIterator)
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
- bool IsDoneWithTraversal() VTK_OVERRIDE;
- vtkIdType GetCellId() VTK_OVERRIDE;
+ bool IsDoneWithTraversal() override;
+ vtkIdType GetCellId() override;
protected:
vtkPointSetCellIterator();
- ~vtkPointSetCellIterator() VTK_OVERRIDE;
+ ~vtkPointSetCellIterator() override;
- void ResetToFirstCell() VTK_OVERRIDE;
- void IncrementToNextCell() VTK_OVERRIDE;
- void FetchCellType() VTK_OVERRIDE;
- void FetchPointIds() VTK_OVERRIDE;
- void FetchPoints() VTK_OVERRIDE;
+ void ResetToFirstCell() override;
+ void IncrementToNextCell() override;
+ void FetchCellType() override;
+ void FetchPointIds() override;
+ void FetchPoints() override;
friend class vtkPointSet;
void SetPointSet(vtkPointSet *ds);
diff --git a/Common/DataModel/vtkPointsProjectedHull.h b/Common/DataModel/vtkPointsProjectedHull.h
index 339b8076fa4a558e038062c9af71c74c91699636..16ab7a8dbbfd768ecfbdd129d2d8324ec70cdde9 100644
--- a/Common/DataModel/vtkPointsProjectedHull.h
+++ b/Common/DataModel/vtkPointsProjectedHull.h
@@ -40,7 +40,7 @@ class VTKCOMMONDATAMODEL_EXPORT vtkPointsProjectedHull : public vtkPoints
vtkTypeMacro(vtkPointsProjectedHull, vtkPoints);
public:
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkPointsProjectedHull *New();
@@ -135,8 +135,8 @@ public:
int GetSizeCCWHullZ();
- void Initialize() VTK_OVERRIDE;
- void Reset() VTK_OVERRIDE {this->Initialize();}
+ void Initialize() override;
+ void Reset() override {this->Initialize();}
/**
* Forces recalculation of convex hulls, use this if
@@ -148,7 +148,7 @@ public:
protected:
vtkPointsProjectedHull();
- ~vtkPointsProjectedHull() VTK_OVERRIDE;
+ ~vtkPointsProjectedHull() override;
private:
diff --git a/Common/DataModel/vtkPolyData.h b/Common/DataModel/vtkPolyData.h
index 6126c086e3dc8f02a5ae4f5d9ab6f66b85b7d448..f23db9f3360340dcf489f6b3fe2b239cf199fe5b 100644
--- a/Common/DataModel/vtkPolyData.h
+++ b/Common/DataModel/vtkPolyData.h
@@ -82,30 +82,30 @@ public:
static vtkPolyData *New();
vtkTypeMacro(vtkPolyData,vtkPointSet);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Return what type of dataset this is.
*/
- int GetDataObjectType() VTK_OVERRIDE {return VTK_POLY_DATA;}
+ int GetDataObjectType() override {return VTK_POLY_DATA;}
/**
* Copy the geometric and topological structure of an input poly data object.
*/
- void CopyStructure(vtkDataSet *ds) VTK_OVERRIDE;
+ void CopyStructure(vtkDataSet *ds) override;
//@{
/**
* Standard vtkDataSet interface.
*/
- vtkIdType GetNumberOfCells() VTK_OVERRIDE;
+ vtkIdType GetNumberOfCells() override;
using vtkDataSet::GetCell;
- vtkCell *GetCell(vtkIdType cellId) VTK_OVERRIDE;
- void GetCell(vtkIdType cellId, vtkGenericCell *cell) VTK_OVERRIDE;
- int GetCellType(vtkIdType cellId) VTK_OVERRIDE;
- void GetCellBounds(vtkIdType cellId, double bounds[6]) VTK_OVERRIDE;
+ vtkCell *GetCell(vtkIdType cellId) override;
+ void GetCell(vtkIdType cellId, vtkGenericCell *cell) override;
+ int GetCellType(vtkIdType cellId) override;
+ void GetCellBounds(vtkIdType cellId, double bounds[6]) override;
void GetCellNeighbors(vtkIdType cellId, vtkIdList *ptIds,
- vtkIdList *cellIds) VTK_OVERRIDE;
+ vtkIdList *cellIds) override;
//@}
/**
@@ -120,18 +120,18 @@ public:
/**
* Copy a cells point ids into list provided. (Less efficient.)
*/
- void GetCellPoints(vtkIdType cellId, vtkIdList *ptIds) VTK_OVERRIDE;
+ void GetCellPoints(vtkIdType cellId, vtkIdList *ptIds) override;
/**
* Efficient method to obtain cells using a particular point. Make sure that
* routine BuildLinks() has been called.
*/
- void GetPointCells(vtkIdType ptId, vtkIdList *cellIds) VTK_OVERRIDE;
+ void GetPointCells(vtkIdType ptId, vtkIdList *cellIds) override;
/**
* Compute the (X, Y, Z) bounds of the data.
*/
- void ComputeBounds() VTK_OVERRIDE;
+ void ComputeBounds() override;
/**
* Recover extra allocated memory when creating data whose initial size
@@ -139,12 +139,12 @@ public:
* when using the CellArray::EstimateSize() method to create vertices,
* lines, polygons, or triangle strips.
*/
- void Squeeze() VTK_OVERRIDE;
+ void Squeeze() override;
/**
* Return the maximum cell size in this poly data.
*/
- int GetMaxCellSize() VTK_OVERRIDE;
+ int GetMaxCellSize() override;
/**
* Set the cell array defining vertices.
@@ -439,7 +439,7 @@ public:
/**
* Restore object to initial state. Release memory back to system.
*/
- void Initialize() VTK_OVERRIDE;
+ void Initialize() override;
//@{
/**
@@ -462,14 +462,14 @@ public:
* arrays, etc. are not included in the return value). THIS METHOD
* IS THREAD SAFE.
*/
- unsigned long GetActualMemorySize() VTK_OVERRIDE;
+ unsigned long GetActualMemorySize() override;
//@{
/**
* Shallow and Deep copy.
*/
- void ShallowCopy(vtkDataObject *src) VTK_OVERRIDE;
- void DeepCopy(vtkDataObject *src) VTK_OVERRIDE;
+ void ShallowCopy(vtkDataObject *src) override;
+ void DeepCopy(vtkDataObject *src) override;
//@}
/**
@@ -532,7 +532,7 @@ public:
protected:
vtkPolyData();
- ~vtkPolyData() VTK_OVERRIDE;
+ ~vtkPolyData() override;
// constant cell objects returned by GetCell called.
vtkVertex *Vertex;
diff --git a/Common/DataModel/vtkPolyDataCollection.h b/Common/DataModel/vtkPolyDataCollection.h
index 7ca6b36600bc46f5f0b72f64bb69a80c28f96c97..3ec8aa1ae76aeca3cc07c49f9f70ea4a9f432d0b 100644
--- a/Common/DataModel/vtkPolyDataCollection.h
+++ b/Common/DataModel/vtkPolyDataCollection.h
@@ -36,7 +36,7 @@ class VTKCOMMONDATAMODEL_EXPORT vtkPolyDataCollection : public vtkCollection
public:
static vtkPolyDataCollection *New();
vtkTypeMacro(vtkPolyDataCollection,vtkCollection);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Add a poly data to the bottom of the list.
@@ -61,7 +61,7 @@ public:
protected:
vtkPolyDataCollection() {}
- ~vtkPolyDataCollection() VTK_OVERRIDE {}
+ ~vtkPolyDataCollection() override {}
private:
// hide the standard AddItem from the user and the compiler.
diff --git a/Common/DataModel/vtkPolyLine.h b/Common/DataModel/vtkPolyLine.h
index 2e0e4338b9c6cfc8ec57c156acb5df741816cfcb..a7142d256254aa24e39dd777f5e80746f95c53be 100644
--- a/Common/DataModel/vtkPolyLine.h
+++ b/Common/DataModel/vtkPolyLine.h
@@ -38,7 +38,7 @@ class VTKCOMMONDATAMODEL_EXPORT vtkPolyLine : public vtkCell
public:
static vtkPolyLine *New();
vtkTypeMacro(vtkPolyLine,vtkCell);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -57,44 +57,44 @@ public:
/**
* See the vtkCell API for descriptions of these methods.
*/
- int GetCellType() VTK_OVERRIDE {return VTK_POLY_LINE;};
- int GetCellDimension() VTK_OVERRIDE {return 1;};
- int GetNumberOfEdges() VTK_OVERRIDE {return 0;};
- int GetNumberOfFaces() VTK_OVERRIDE {return 0;};
- vtkCell *GetEdge(int vtkNotUsed(edgeId)) VTK_OVERRIDE {return nullptr;};
- vtkCell *GetFace(int vtkNotUsed(faceId)) VTK_OVERRIDE {return nullptr;};
- int CellBoundary(int subId, double pcoords[3], vtkIdList *pts) VTK_OVERRIDE;
+ int GetCellType() override {return VTK_POLY_LINE;};
+ int GetCellDimension() override {return 1;};
+ int GetNumberOfEdges() override {return 0;};
+ int GetNumberOfFaces() override {return 0;};
+ vtkCell *GetEdge(int vtkNotUsed(edgeId)) override {return nullptr;};
+ vtkCell *GetFace(int vtkNotUsed(faceId)) override {return nullptr;};
+ int CellBoundary(int subId, double pcoords[3], vtkIdList *pts) override;
void Contour(double value, vtkDataArray *cellScalars,
vtkIncrementalPointLocator *locator, vtkCellArray *verts,
vtkCellArray *lines, vtkCellArray *polys,
vtkPointData *inPd, vtkPointData *outPd,
- vtkCellData *inCd, vtkIdType cellId, vtkCellData *outCd) VTK_OVERRIDE;
+ vtkCellData *inCd, vtkIdType cellId, vtkCellData *outCd) override;
void Clip(double value, vtkDataArray *cellScalars,
vtkIncrementalPointLocator *locator, vtkCellArray *lines,
vtkPointData *inPd, vtkPointData *outPd,
vtkCellData *inCd, vtkIdType cellId, vtkCellData *outCd,
- int insideOut) VTK_OVERRIDE;
+ int insideOut) override;
int EvaluatePosition(double x[3], double* closestPoint,
int& subId, double pcoords[3],
- double& dist2, double *weights) VTK_OVERRIDE;
+ double& dist2, double *weights) override;
void EvaluateLocation(int& subId, double pcoords[3], double x[3],
- double *weights) VTK_OVERRIDE;
+ double *weights) override;
int IntersectWithLine(double p1[3], double p2[3], double tol, double& t,
- double x[3], double pcoords[3], int& subId) VTK_OVERRIDE;
- int Triangulate(int index, vtkIdList *ptIds, vtkPoints *pts) VTK_OVERRIDE;
+ double x[3], double pcoords[3], int& subId) override;
+ int Triangulate(int index, vtkIdList *ptIds, vtkPoints *pts) override;
void Derivatives(int subId, double pcoords[3], double *values,
- int dim, double *derivs) VTK_OVERRIDE;
- int IsPrimaryCell() VTK_OVERRIDE {return 0;}
+ int dim, double *derivs) override;
+ int IsPrimaryCell() override {return 0;}
//@}
/**
* Return the center of the point cloud in parametric coordinates.
*/
- int GetParametricCenter(double pcoords[3]) VTK_OVERRIDE;
+ int GetParametricCenter(double pcoords[3]) override;
protected:
vtkPolyLine();
- ~vtkPolyLine() VTK_OVERRIDE;
+ ~vtkPolyLine() override;
vtkLine *Line;
diff --git a/Common/DataModel/vtkPolyPlane.h b/Common/DataModel/vtkPolyPlane.h
index 040ba4f9d4b09a3a6824b84843e6163bf566bb88..dd30b10fe856f6e41496c207851c35bbf5aa40bb 100644
--- a/Common/DataModel/vtkPolyPlane.h
+++ b/Common/DataModel/vtkPolyPlane.h
@@ -44,20 +44,20 @@ public:
static vtkPolyPlane *New();
vtkTypeMacro(vtkPolyPlane,vtkImplicitFunction);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
* Evaluate plane equation for point x[3].
*/
using vtkImplicitFunction::EvaluateFunction;
- double EvaluateFunction(double x[3]) VTK_OVERRIDE;
+ double EvaluateFunction(double x[3]) override;
//@}
/**
* Evaluate function gradient at point x[3].
*/
- void EvaluateGradient(double x[3], double g[3]) VTK_OVERRIDE;
+ void EvaluateGradient(double x[3], double g[3]) override;
//@{
/**
@@ -71,11 +71,11 @@ public:
/**
* Override GetMTime to include the polyline
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
protected:
vtkPolyPlane();
- ~vtkPolyPlane() VTK_OVERRIDE;
+ ~vtkPolyPlane() override;
void ComputeNormals();
diff --git a/Common/DataModel/vtkPolyVertex.h b/Common/DataModel/vtkPolyVertex.h
index 76cbf7b3869411e9bb1e5de78aa8d71873f78979..b8474db2d01923fce2bd2aa80edac435b7f76bb1 100644
--- a/Common/DataModel/vtkPolyVertex.h
+++ b/Common/DataModel/vtkPolyVertex.h
@@ -34,50 +34,50 @@ class VTKCOMMONDATAMODEL_EXPORT vtkPolyVertex : public vtkCell
public:
static vtkPolyVertex *New();
vtkTypeMacro(vtkPolyVertex,vtkCell);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
* See the vtkCell API for descriptions of these methods.
*/
- int GetCellType() VTK_OVERRIDE {return VTK_POLY_VERTEX;};
- int GetCellDimension() VTK_OVERRIDE {return 0;};
- int GetNumberOfEdges() VTK_OVERRIDE {return 0;};
- int GetNumberOfFaces() VTK_OVERRIDE {return 0;};
- vtkCell *GetEdge(int vtkNotUsed(edgeId)) VTK_OVERRIDE {return nullptr;};
- vtkCell *GetFace(int vtkNotUsed(faceId)) VTK_OVERRIDE {return nullptr;};
- int CellBoundary(int subId, double pcoords[3], vtkIdList *pts) VTK_OVERRIDE;
+ int GetCellType() override {return VTK_POLY_VERTEX;};
+ int GetCellDimension() override {return 0;};
+ int GetNumberOfEdges() override {return 0;};
+ int GetNumberOfFaces() override {return 0;};
+ vtkCell *GetEdge(int vtkNotUsed(edgeId)) override {return nullptr;};
+ vtkCell *GetFace(int vtkNotUsed(faceId)) override {return nullptr;};
+ int CellBoundary(int subId, double pcoords[3], vtkIdList *pts) override;
void Contour(double value, vtkDataArray *cellScalars,
vtkIncrementalPointLocator *locator, vtkCellArray *verts,
vtkCellArray *lines, vtkCellArray *polys,
vtkPointData *inPd, vtkPointData *outPd,
- vtkCellData *inCd, vtkIdType cellId, vtkCellData *outCd) VTK_OVERRIDE;
+ vtkCellData *inCd, vtkIdType cellId, vtkCellData *outCd) override;
void Clip(double value, vtkDataArray *cellScalars,
vtkIncrementalPointLocator *locator, vtkCellArray *verts,
vtkPointData *inPd, vtkPointData *outPd,
vtkCellData *inCd, vtkIdType cellId, vtkCellData *outCd,
- int insideOut) VTK_OVERRIDE;
+ int insideOut) override;
int EvaluatePosition(double x[3], double* closestPoint,
int& subId, double pcoords[3],
- double& dist2, double *weights) VTK_OVERRIDE;
+ double& dist2, double *weights) override;
void EvaluateLocation(int& subId, double pcoords[3], double x[3],
- double *weights) VTK_OVERRIDE;
+ double *weights) override;
int IntersectWithLine(double p1[3], double p2[3], double tol, double& t,
- double x[3], double pcoords[3], int& subId) VTK_OVERRIDE;
- int Triangulate(int index, vtkIdList *ptIds, vtkPoints *pts) VTK_OVERRIDE;
+ double x[3], double pcoords[3], int& subId) override;
+ int Triangulate(int index, vtkIdList *ptIds, vtkPoints *pts) override;
void Derivatives(int subId, double pcoords[3], double *values,
- int dim, double *derivs) VTK_OVERRIDE;
- int IsPrimaryCell() VTK_OVERRIDE {return 0;}
+ int dim, double *derivs) override;
+ int IsPrimaryCell() override {return 0;}
//@}
/**
* Return the center of the point cloud in parametric coordinates.
*/
- int GetParametricCenter(double pcoords[3]) VTK_OVERRIDE;
+ int GetParametricCenter(double pcoords[3]) override;
protected:
vtkPolyVertex();
- ~vtkPolyVertex() VTK_OVERRIDE;
+ ~vtkPolyVertex() override;
vtkVertex *Vertex;
diff --git a/Common/DataModel/vtkPolygon.h b/Common/DataModel/vtkPolygon.h
index 98186ebe87c5fe2f9ec3e1c9ac6101b80c8926f1..0e24af7842a7975bdc56b2ac12c3055ef248321e 100644
--- a/Common/DataModel/vtkPolygon.h
+++ b/Common/DataModel/vtkPolygon.h
@@ -41,40 +41,40 @@ class VTKCOMMONDATAMODEL_EXPORT vtkPolygon : public vtkCell
public:
static vtkPolygon *New();
vtkTypeMacro(vtkPolygon,vtkCell);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
* See the vtkCell API for descriptions of these methods.
*/
- int GetCellType() VTK_OVERRIDE {return VTK_POLYGON;};
- int GetCellDimension() VTK_OVERRIDE {return 2;};
- int GetNumberOfEdges() VTK_OVERRIDE {return this->GetNumberOfPoints();};
- int GetNumberOfFaces() VTK_OVERRIDE {return 0;};
- vtkCell *GetEdge(int edgeId) VTK_OVERRIDE;
- vtkCell *GetFace(int) VTK_OVERRIDE {return nullptr;};
- int CellBoundary(int subId, double pcoords[3], vtkIdList *pts) VTK_OVERRIDE;
+ int GetCellType() override {return VTK_POLYGON;};
+ int GetCellDimension() override {return 2;};
+ int GetNumberOfEdges() override {return this->GetNumberOfPoints();};
+ int GetNumberOfFaces() override {return 0;};
+ vtkCell *GetEdge(int edgeId) override;
+ vtkCell *GetFace(int) override {return nullptr;};
+ int CellBoundary(int subId, double pcoords[3], vtkIdList *pts) override;
void Contour(double value, vtkDataArray *cellScalars,
vtkIncrementalPointLocator *locator,vtkCellArray *verts,
vtkCellArray *lines, vtkCellArray *polys,
vtkPointData *inPd, vtkPointData *outPd,
- vtkCellData *inCd, vtkIdType cellId, vtkCellData *outCd) VTK_OVERRIDE;
+ vtkCellData *inCd, vtkIdType cellId, vtkCellData *outCd) override;
void Clip(double value, vtkDataArray *cellScalars,
vtkIncrementalPointLocator *locator, vtkCellArray *tris,
vtkPointData *inPd, vtkPointData *outPd,
vtkCellData *inCd, vtkIdType cellId, vtkCellData *outCd,
- int insideOut) VTK_OVERRIDE;
+ int insideOut) override;
int EvaluatePosition(double x[3], double* closestPoint,
int& subId, double pcoords[3],
- double& dist2, double *weights) VTK_OVERRIDE;
+ double& dist2, double *weights) override;
void EvaluateLocation(int& subId, double pcoords[3], double x[3],
- double *weights) VTK_OVERRIDE;
+ double *weights) override;
int IntersectWithLine(double p1[3], double p2[3], double tol, double& t,
- double x[3], double pcoords[3], int& subId) VTK_OVERRIDE;
- int Triangulate(int index, vtkIdList *ptIds, vtkPoints *pts) VTK_OVERRIDE;
+ double x[3], double pcoords[3], int& subId) override;
+ int Triangulate(int index, vtkIdList *ptIds, vtkPoints *pts) override;
void Derivatives(int subId, double pcoords[3], double *values,
- int dim, double *derivs) VTK_OVERRIDE;
- int IsPrimaryCell() VTK_OVERRIDE {return 0;}
+ int dim, double *derivs) override;
+ int IsPrimaryCell() override {return 0;}
//@}
/**
@@ -94,7 +94,7 @@ public:
* The function assumes the input point lies on the polygon plane without
* checking that.
*/
- void InterpolateFunctions(double x[3], double *sf) VTK_OVERRIDE;
+ void InterpolateFunctions(double x[3], double *sf) override;
//@{
/**
@@ -234,7 +234,7 @@ public:
protected:
vtkPolygon();
- ~vtkPolygon() VTK_OVERRIDE;
+ ~vtkPolygon() override;
// Compute the interpolation functions using Mean Value Coordinate.
void InterpolateFunctionsUsingMVC(double x[3], double *weights);
diff --git a/Common/DataModel/vtkPolyhedron.h b/Common/DataModel/vtkPolyhedron.h
index 68c52f3a92ab6bd54c0985f3921f0ece2547d07d..0dd7445b29dbd9837d13aa31fe43d19e836aa7b9 100644
--- a/Common/DataModel/vtkPolyhedron.h
+++ b/Common/DataModel/vtkPolyhedron.h
@@ -63,36 +63,36 @@ public:
*/
static vtkPolyhedron *New();
vtkTypeMacro(vtkPolyhedron,vtkCell3D);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
* See vtkCell3D API for description of these methods.
*/
- void GetEdgePoints(int vtkNotUsed(edgeId), int* &vtkNotUsed(pts)) VTK_OVERRIDE {}
- void GetFacePoints(int vtkNotUsed(faceId), int* &vtkNotUsed(pts)) VTK_OVERRIDE {}
- double *GetParametricCoords() VTK_OVERRIDE;
+ void GetEdgePoints(int vtkNotUsed(edgeId), int* &vtkNotUsed(pts)) override {}
+ void GetFacePoints(int vtkNotUsed(faceId), int* &vtkNotUsed(pts)) override {}
+ double *GetParametricCoords() override;
/**
* See the vtkCell API for descriptions of these methods.
*/
- int GetCellType() VTK_OVERRIDE {return VTK_POLYHEDRON;}
+ int GetCellType() override {return VTK_POLYHEDRON;}
/**
* This cell requires that it be initialized prior to access.
*/
- int RequiresInitialization() VTK_OVERRIDE {return 1;}
- void Initialize() VTK_OVERRIDE;
+ int RequiresInitialization() override {return 1;}
+ void Initialize() override;
//@{
/**
* A polyhedron is represented internally by a set of polygonal faces.
* These faces can be processed to explicitly determine edges.
*/
- int GetNumberOfEdges() VTK_OVERRIDE;
- vtkCell *GetEdge(int) VTK_OVERRIDE;
- int GetNumberOfFaces() VTK_OVERRIDE;
- vtkCell *GetFace(int faceId) VTK_OVERRIDE;
+ int GetNumberOfEdges() override;
+ vtkCell *GetEdge(int) override;
+ int GetNumberOfFaces() override;
+ vtkCell *GetFace(int faceId) override;
//@}
/**
@@ -104,7 +104,7 @@ public:
vtkIncrementalPointLocator *locator, vtkCellArray *verts,
vtkCellArray *lines, vtkCellArray *polys,
vtkPointData *inPd, vtkPointData *outPd,
- vtkCellData *inCd, vtkIdType cellId, vtkCellData *outCd) VTK_OVERRIDE;
+ vtkCellData *inCd, vtkIdType cellId, vtkCellData *outCd) override;
/**
* Satisfy the vtkCell API. This method clips the input polyhedron and outputs
@@ -119,7 +119,7 @@ public:
vtkIncrementalPointLocator *locator, vtkCellArray *connectivity,
vtkPointData *inPd, vtkPointData *outPd,
vtkCellData *inCd, vtkIdType cellId, vtkCellData *outCd,
- int insideOut) VTK_OVERRIDE;
+ int insideOut) override;
/**
* Satisfy the vtkCell API. The subId is ignored and zero is always
@@ -130,14 +130,14 @@ public:
*/
int EvaluatePosition(double x[3], double* closestPoint,
int& subId, double pcoords[3],
- double& dist2, double *weights) VTK_OVERRIDE;
+ double& dist2, double *weights) override;
/**
* The inverse of EvaluatePosition. Note the weights should be the MVC
* weights.
*/
void EvaluateLocation(int& subId, double pcoords[3], double x[3],
- double *weights) VTK_OVERRIDE;
+ double *weights) override;
/**
* Intersect the line (p1,p2) with a given tolerance tol to determine a
@@ -146,7 +146,7 @@ public:
* ignored). Returns the number of intersection points.
*/
int IntersectWithLine(double p1[3], double p2[3], double tol, double& t,
- double x[3], double pcoords[3], int& subId) VTK_OVERRIDE;
+ double x[3], double pcoords[3], int& subId) override;
/**
* Use vtkOrderedTriangulator to tetrahedralize the polyhedron mesh. This
@@ -163,7 +163,7 @@ public:
* tetrahedrons. The points stored in pts are ordered the same as they are
* listed in ptIds.
*/
- int Triangulate(int index, vtkIdList *ptIds, vtkPoints *pts) VTK_OVERRIDE;
+ int Triangulate(int index, vtkIdList *ptIds, vtkPoints *pts) override;
/**
* Computes derivatives at the point specified by the parameter coordinate.
@@ -173,24 +173,24 @@ public:
* derivatives on the local tetrahedron.
*/
void Derivatives(int subId, double pcoords[3], double *values,
- int dim, double *derivs) VTK_OVERRIDE;
+ int dim, double *derivs) override;
/**
* Find the boundary face closest to the point defined by the pcoords[3]
* and subId of the cell (subId can be ignored).
*/
- int CellBoundary(int subId, double pcoords[3], vtkIdList *pts) VTK_OVERRIDE;
+ int CellBoundary(int subId, double pcoords[3], vtkIdList *pts) override;
/**
* Return the center of the cell in parametric coordinates. In this cell,
* the center of the bounding box is returned.
*/
- int GetParametricCenter(double pcoords[3]) VTK_OVERRIDE;
+ int GetParametricCenter(double pcoords[3]) override;
/**
* A polyhedron is a full-fledged primary cell.
*/
- int IsPrimaryCell() VTK_OVERRIDE {return 1;}
+ int IsPrimaryCell() override {return 1;}
//@{
/**
@@ -198,8 +198,8 @@ public:
* (aka shape functions/derivatives). Here we use the MVC calculation
* process to compute the interpolation functions.
*/
- void InterpolateFunctions(double x[3], double *sf) VTK_OVERRIDE;
- void InterpolateDerivs(double x[3], double *derivs) VTK_OVERRIDE;
+ void InterpolateFunctions(double x[3], double *sf) override;
+ void InterpolateDerivs(double x[3], double *derivs) override;
//@}
//@{
@@ -211,9 +211,9 @@ public:
* begins with a leading count indicating the total number of faces in
* the list.
*/
- int RequiresExplicitFaceRepresentation() VTK_OVERRIDE {return 1;}
- void SetFaces(vtkIdType *faces) VTK_OVERRIDE;
- vtkIdType *GetFaces() VTK_OVERRIDE;
+ int RequiresExplicitFaceRepresentation() override {return 1;}
+ void SetFaces(vtkIdType *faces) override;
+ vtkIdType *GetFaces() override;
//@}
/**
@@ -239,7 +239,7 @@ public:
protected:
vtkPolyhedron();
- ~vtkPolyhedron() VTK_OVERRIDE;
+ ~vtkPolyhedron() override;
// Internal classes for supporting operations on this cell
vtkLine *Line;
diff --git a/Common/DataModel/vtkPyramid.h b/Common/DataModel/vtkPyramid.h
index 9502dec76f4b63e62d1fd500b88760d7cdf7d75c..c9c2f2b42a74669dc9573b67b0b0c53e33b4a82d 100644
--- a/Common/DataModel/vtkPyramid.h
+++ b/Common/DataModel/vtkPyramid.h
@@ -45,49 +45,49 @@ class VTKCOMMONDATAMODEL_EXPORT vtkPyramid : public vtkCell3D
public:
static vtkPyramid *New();
vtkTypeMacro(vtkPyramid,vtkCell3D);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
* See vtkCell3D API for description of these methods.
*/
- void GetEdgePoints(int edgeId, int* &pts) VTK_OVERRIDE;
- void GetFacePoints(int faceId, int* &pts) VTK_OVERRIDE;
+ void GetEdgePoints(int edgeId, int* &pts) override;
+ void GetFacePoints(int faceId, int* &pts) override;
//@}
//@{
/**
* See the vtkCell API for descriptions of these methods.
*/
- int GetCellType() VTK_OVERRIDE {return VTK_PYRAMID;}
- int GetCellDimension() VTK_OVERRIDE {return 3;}
- int GetNumberOfEdges() VTK_OVERRIDE {return 8;}
- int GetNumberOfFaces() VTK_OVERRIDE {return 5;}
- vtkCell *GetEdge(int edgeId) VTK_OVERRIDE;
- vtkCell *GetFace(int faceId) VTK_OVERRIDE;
- int CellBoundary(int subId, double pcoords[3], vtkIdList *pts) VTK_OVERRIDE;
+ int GetCellType() override {return VTK_PYRAMID;}
+ int GetCellDimension() override {return 3;}
+ int GetNumberOfEdges() override {return 8;}
+ int GetNumberOfFaces() override {return 5;}
+ vtkCell *GetEdge(int edgeId) override;
+ vtkCell *GetFace(int faceId) override;
+ int CellBoundary(int subId, double pcoords[3], vtkIdList *pts) override;
void Contour(double value, vtkDataArray *cellScalars,
vtkIncrementalPointLocator *locator, vtkCellArray *verts,
vtkCellArray *lines, vtkCellArray *polys,
vtkPointData *inPd, vtkPointData *outPd,
- vtkCellData *inCd, vtkIdType cellId, vtkCellData *outCd) VTK_OVERRIDE;
+ vtkCellData *inCd, vtkIdType cellId, vtkCellData *outCd) override;
int EvaluatePosition(double x[3], double* closestPoint,
int& subId, double pcoords[3],
- double& dist2, double *weights) VTK_OVERRIDE;
+ double& dist2, double *weights) override;
void EvaluateLocation(int& subId, double pcoords[3], double x[3],
- double *weights) VTK_OVERRIDE;
+ double *weights) override;
int IntersectWithLine(double p1[3], double p2[3], double tol, double& t,
- double x[3], double pcoords[3], int& subId) VTK_OVERRIDE;
- int Triangulate(int index, vtkIdList *ptIds, vtkPoints *pts) VTK_OVERRIDE;
+ double x[3], double pcoords[3], int& subId) override;
+ int Triangulate(int index, vtkIdList *ptIds, vtkPoints *pts) override;
void Derivatives(int subId, double pcoords[3], double *values,
- int dim, double *derivs) VTK_OVERRIDE;
- double *GetParametricCoords() VTK_OVERRIDE;
+ int dim, double *derivs) override;
+ double *GetParametricCoords() override;
//@}
/**
* Return the center of the pyramid in parametric coordinates.
*/
- int GetParametricCenter(double pcoords[3]) VTK_OVERRIDE;
+ int GetParametricCenter(double pcoords[3]) override;
/**
* @deprecated Replaced by vtkPyramid::InterpolateFunctions as of VTK 5.2
@@ -102,11 +102,11 @@ public:
* Compute the interpolation functions/derivatives
* (aka shape functions/derivatives)
*/
- void InterpolateFunctions(double pcoords[3], double weights[5]) VTK_OVERRIDE
+ void InterpolateFunctions(double pcoords[3], double weights[5]) override
{
vtkPyramid::InterpolationFunctions(pcoords,weights);
}
- void InterpolateDerivs(double pcoords[3], double derivs[15]) VTK_OVERRIDE
+ void InterpolateDerivs(double pcoords[3], double derivs[15]) override
{
vtkPyramid::InterpolationDerivs(pcoords,derivs);
}
@@ -125,7 +125,7 @@ public:
protected:
vtkPyramid();
- ~vtkPyramid() VTK_OVERRIDE;
+ ~vtkPyramid() override;
vtkLine *Line;
vtkTriangle *Triangle;
diff --git a/Common/DataModel/vtkQuad.h b/Common/DataModel/vtkQuad.h
index 073443c855640490f1cd6d484722c621267850d1..644dac64eedbd1a2f6edf1f1e3f3435c6ae72b67 100644
--- a/Common/DataModel/vtkQuad.h
+++ b/Common/DataModel/vtkQuad.h
@@ -37,41 +37,41 @@ class VTKCOMMONDATAMODEL_EXPORT vtkQuad : public vtkCell
public:
static vtkQuad *New();
vtkTypeMacro(vtkQuad,vtkCell);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
* See the vtkCell API for descriptions of these methods.
*/
- int GetCellType() VTK_OVERRIDE {return VTK_QUAD;};
- int GetCellDimension() VTK_OVERRIDE {return 2;};
- int GetNumberOfEdges() VTK_OVERRIDE {return 4;};
- int GetNumberOfFaces() VTK_OVERRIDE {return 0;};
- vtkCell *GetEdge(int edgeId) VTK_OVERRIDE;
- vtkCell *GetFace(int) VTK_OVERRIDE {return nullptr;};
- int CellBoundary(int subId, double pcoords[3], vtkIdList *pts) VTK_OVERRIDE;
+ int GetCellType() override {return VTK_QUAD;};
+ int GetCellDimension() override {return 2;};
+ int GetNumberOfEdges() override {return 4;};
+ int GetNumberOfFaces() override {return 0;};
+ vtkCell *GetEdge(int edgeId) override;
+ vtkCell *GetFace(int) override {return nullptr;};
+ int CellBoundary(int subId, double pcoords[3], vtkIdList *pts) override;
void Contour(double value, vtkDataArray *cellScalars,
vtkIncrementalPointLocator *locator, vtkCellArray *verts,
vtkCellArray *lines, vtkCellArray *polys,
vtkPointData *inPd, vtkPointData *outPd,
- vtkCellData *inCd, vtkIdType cellId, vtkCellData *outCd) VTK_OVERRIDE;
+ vtkCellData *inCd, vtkIdType cellId, vtkCellData *outCd) override;
int EvaluatePosition(double x[3], double* closestPoint,
int& subId, double pcoords[3],
- double& dist2, double *weights) VTK_OVERRIDE;
+ double& dist2, double *weights) override;
void EvaluateLocation(int& subId, double pcoords[3], double x[3],
- double *weights) VTK_OVERRIDE;
+ double *weights) override;
int IntersectWithLine(double p1[3], double p2[3], double tol, double& t,
- double x[3], double pcoords[3], int& subId) VTK_OVERRIDE;
- int Triangulate(int index, vtkIdList *ptIds, vtkPoints *pts) VTK_OVERRIDE;
+ double x[3], double pcoords[3], int& subId) override;
+ int Triangulate(int index, vtkIdList *ptIds, vtkPoints *pts) override;
void Derivatives(int subId, double pcoords[3], double *values,
- int dim, double *derivs) VTK_OVERRIDE;
- double *GetParametricCoords() VTK_OVERRIDE;
+ int dim, double *derivs) override;
+ double *GetParametricCoords() override;
//@}
/**
* Return the center of the triangle in parametric coordinates.
*/
- int GetParametricCenter(double pcoords[3]) VTK_OVERRIDE;
+ int GetParametricCenter(double pcoords[3]) override;
/**
* Clip this quad using scalar value provided. Like contouring, except
@@ -81,7 +81,7 @@ public:
vtkIncrementalPointLocator *locator, vtkCellArray *polys,
vtkPointData *inPd, vtkPointData *outPd,
vtkCellData *inCd, vtkIdType cellId, vtkCellData *outCd,
- int insideOut) VTK_OVERRIDE;
+ int insideOut) override;
/**
* @deprecated Replaced by vtkQuad::InterpolateFunctions as of VTK 5.2
@@ -96,11 +96,11 @@ public:
* Compute the interpolation functions/derivatives
* (aka shape functions/derivatives)
*/
- void InterpolateFunctions(double pcoords[3], double sf[4]) VTK_OVERRIDE
+ void InterpolateFunctions(double pcoords[3], double sf[4]) override
{
vtkQuad::InterpolationFunctions(pcoords,sf);
}
- void InterpolateDerivs(double pcoords[3], double derivs[8]) VTK_OVERRIDE
+ void InterpolateDerivs(double pcoords[3], double derivs[8]) override
{
vtkQuad::InterpolationDerivs(pcoords,derivs);
}
@@ -114,7 +114,7 @@ public:
protected:
vtkQuad();
- ~vtkQuad() VTK_OVERRIDE;
+ ~vtkQuad() override;
vtkLine *Line;
vtkTriangle *Triangle;
diff --git a/Common/DataModel/vtkQuadraticEdge.h b/Common/DataModel/vtkQuadraticEdge.h
index b750d80ab9f9653f02b6ace80c29cf435ff8b1eb..704832ea4b4a0986c17bc2e054f499ffba5c1466 100644
--- a/Common/DataModel/vtkQuadraticEdge.h
+++ b/Common/DataModel/vtkQuadraticEdge.h
@@ -42,34 +42,34 @@ class VTKCOMMONDATAMODEL_EXPORT vtkQuadraticEdge : public vtkNonLinearCell
public:
static vtkQuadraticEdge *New();
vtkTypeMacro(vtkQuadraticEdge,vtkNonLinearCell);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Implement the vtkCell API. See the vtkCell API for descriptions
* of these methods.
*/
- int GetCellType() VTK_OVERRIDE {return VTK_QUADRATIC_EDGE;};
- int GetCellDimension() VTK_OVERRIDE {return 1;}
- int GetNumberOfEdges() VTK_OVERRIDE {return 0;}
- int GetNumberOfFaces() VTK_OVERRIDE {return 0;}
- vtkCell *GetEdge(int) VTK_OVERRIDE {return nullptr;}
- vtkCell *GetFace(int) VTK_OVERRIDE {return nullptr;}
-
- int CellBoundary(int subId, double pcoords[3], vtkIdList *pts) VTK_OVERRIDE;
+ int GetCellType() override {return VTK_QUADRATIC_EDGE;};
+ int GetCellDimension() override {return 1;}
+ int GetNumberOfEdges() override {return 0;}
+ int GetNumberOfFaces() override {return 0;}
+ vtkCell *GetEdge(int) override {return nullptr;}
+ vtkCell *GetFace(int) override {return nullptr;}
+
+ int CellBoundary(int subId, double pcoords[3], vtkIdList *pts) override;
void Contour(double value, vtkDataArray *cellScalars,
vtkIncrementalPointLocator *locator, vtkCellArray *verts,
vtkCellArray *lines, vtkCellArray *polys,
vtkPointData *inPd, vtkPointData *outPd,
- vtkCellData *inCd, vtkIdType cellId, vtkCellData *outCd) VTK_OVERRIDE;
+ vtkCellData *inCd, vtkIdType cellId, vtkCellData *outCd) override;
int EvaluatePosition(double x[3], double* closestPoint,
int& subId, double pcoords[3],
- double& dist2, double *weights) VTK_OVERRIDE;
+ double& dist2, double *weights) override;
void EvaluateLocation(int& subId, double pcoords[3], double x[3],
- double *weights) VTK_OVERRIDE;
- int Triangulate(int index, vtkIdList *ptIds, vtkPoints *pts) VTK_OVERRIDE;
+ double *weights) override;
+ int Triangulate(int index, vtkIdList *ptIds, vtkPoints *pts) override;
void Derivatives(int subId, double pcoords[3], double *values,
- int dim, double *derivs) VTK_OVERRIDE;
- double *GetParametricCoords() VTK_OVERRIDE;
+ int dim, double *derivs) override;
+ double *GetParametricCoords() override;
/**
* Clip this edge using scalar value provided. Like contouring, except
@@ -79,19 +79,19 @@ public:
vtkIncrementalPointLocator *locator, vtkCellArray *lines,
vtkPointData *inPd, vtkPointData *outPd,
vtkCellData *inCd, vtkIdType cellId, vtkCellData *outCd,
- int insideOut) VTK_OVERRIDE;
+ int insideOut) override;
/**
* Line-edge intersection. Intersection has to occur within [0,1] parametric
* coordinates and with specified tolerance.
*/
int IntersectWithLine(double p1[3], double p2[3], double tol, double& t,
- double x[3], double pcoords[3], int& subId) VTK_OVERRIDE;
+ double x[3], double pcoords[3], int& subId) override;
/**
* Return the center of the quadratic tetra in parametric coordinates.
*/
- int GetParametricCenter(double pcoords[3]) VTK_OVERRIDE;
+ int GetParametricCenter(double pcoords[3]) override;
/**
* @deprecated Replaced by vtkQuadraticEdge::InterpolateFunctions as of VTK 5.2
@@ -106,11 +106,11 @@ public:
* Compute the interpolation functions/derivatives
* (aka shape functions/derivatives)
*/
- void InterpolateFunctions(double pcoords[3], double weights[3]) VTK_OVERRIDE
+ void InterpolateFunctions(double pcoords[3], double weights[3]) override
{
vtkQuadraticEdge::InterpolationFunctions(pcoords,weights);
}
- void InterpolateDerivs(double pcoords[3], double derivs[3]) VTK_OVERRIDE
+ void InterpolateDerivs(double pcoords[3], double derivs[3]) override
{
vtkQuadraticEdge::InterpolationDerivs(pcoords,derivs);
}
@@ -118,7 +118,7 @@ public:
protected:
vtkQuadraticEdge();
- ~vtkQuadraticEdge() VTK_OVERRIDE;
+ ~vtkQuadraticEdge() override;
vtkLine *Line;
vtkDoubleArray *Scalars; //used to avoid New/Delete in contouring/clipping
diff --git a/Common/DataModel/vtkQuadraticHexahedron.h b/Common/DataModel/vtkQuadraticHexahedron.h
index 9c62a305fbf178e0efc7b4a3cf10332382f2c256..31a0805f5fd97ffe1deebfae39f7641fdd333a1d 100644
--- a/Common/DataModel/vtkQuadraticHexahedron.h
+++ b/Common/DataModel/vtkQuadraticHexahedron.h
@@ -47,36 +47,36 @@ class VTKCOMMONDATAMODEL_EXPORT vtkQuadraticHexahedron : public vtkNonLinearCell
public:
static vtkQuadraticHexahedron *New();
vtkTypeMacro(vtkQuadraticHexahedron,vtkNonLinearCell);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
* Implement the vtkCell API. See the vtkCell API for descriptions
* of these methods.
*/
- int GetCellType() VTK_OVERRIDE {return VTK_QUADRATIC_HEXAHEDRON;}
- int GetCellDimension() VTK_OVERRIDE {return 3;}
- int GetNumberOfEdges() VTK_OVERRIDE {return 12;}
- int GetNumberOfFaces() VTK_OVERRIDE {return 6;}
- vtkCell *GetEdge(int) VTK_OVERRIDE;
- vtkCell *GetFace(int) VTK_OVERRIDE;
+ int GetCellType() override {return VTK_QUADRATIC_HEXAHEDRON;}
+ int GetCellDimension() override {return 3;}
+ int GetNumberOfEdges() override {return 12;}
+ int GetNumberOfFaces() override {return 6;}
+ vtkCell *GetEdge(int) override;
+ vtkCell *GetFace(int) override;
//@}
- int CellBoundary(int subId, double pcoords[3], vtkIdList *pts) VTK_OVERRIDE;
+ int CellBoundary(int subId, double pcoords[3], vtkIdList *pts) override;
void Contour(double value, vtkDataArray *cellScalars,
vtkIncrementalPointLocator *locator, vtkCellArray *verts,
vtkCellArray *lines, vtkCellArray *polys,
vtkPointData *inPd, vtkPointData *outPd,
- vtkCellData *inCd, vtkIdType cellId, vtkCellData *outCd) VTK_OVERRIDE;
+ vtkCellData *inCd, vtkIdType cellId, vtkCellData *outCd) override;
int EvaluatePosition(double x[3], double* closestPoint,
int& subId, double pcoords[3],
- double& dist2, double *weights) VTK_OVERRIDE;
+ double& dist2, double *weights) override;
void EvaluateLocation(int& subId, double pcoords[3], double x[3],
- double *weights) VTK_OVERRIDE;
- int Triangulate(int index, vtkIdList *ptIds, vtkPoints *pts) VTK_OVERRIDE;
+ double *weights) override;
+ int Triangulate(int index, vtkIdList *ptIds, vtkPoints *pts) override;
void Derivatives(int subId, double pcoords[3], double *values,
- int dim, double *derivs) VTK_OVERRIDE;
- double *GetParametricCoords() VTK_OVERRIDE;
+ int dim, double *derivs) override;
+ double *GetParametricCoords() override;
/**
* Clip this quadratic hexahedron using scalar value provided. Like
@@ -87,14 +87,14 @@ public:
vtkIncrementalPointLocator *locator, vtkCellArray *tetras,
vtkPointData *inPd, vtkPointData *outPd,
vtkCellData *inCd, vtkIdType cellId, vtkCellData *outCd,
- int insideOut) VTK_OVERRIDE;
+ int insideOut) override;
/**
* Line-edge intersection. Intersection has to occur within [0,1] parametric
* coordinates and with specified tolerance.
*/
int IntersectWithLine(double p1[3], double p2[3], double tol, double& t,
- double x[3], double pcoords[3], int& subId) VTK_OVERRIDE;
+ double x[3], double pcoords[3], int& subId) override;
/**
@@ -110,11 +110,11 @@ public:
* Compute the interpolation functions/derivatives
* (aka shape functions/derivatives)
*/
- void InterpolateFunctions(double pcoords[3], double weights[20]) VTK_OVERRIDE
+ void InterpolateFunctions(double pcoords[3], double weights[20]) override
{
vtkQuadraticHexahedron::InterpolationFunctions(pcoords,weights);
}
- void InterpolateDerivs(double pcoords[3], double derivs[60]) VTK_OVERRIDE
+ void InterpolateDerivs(double pcoords[3], double derivs[60]) override
{
vtkQuadraticHexahedron::InterpolationDerivs(pcoords,derivs);
}
@@ -137,7 +137,7 @@ public:
protected:
vtkQuadraticHexahedron();
- ~vtkQuadraticHexahedron() VTK_OVERRIDE;
+ ~vtkQuadraticHexahedron() override;
vtkQuadraticEdge *Edge;
vtkQuadraticQuad *Face;
diff --git a/Common/DataModel/vtkQuadraticLinearQuad.h b/Common/DataModel/vtkQuadraticLinearQuad.h
index 39cadf00672a2c73a1315d09487bfc4cada2735c..4cf3de5913d221119c3b8b5abbc7a60179aec851 100644
--- a/Common/DataModel/vtkQuadraticLinearQuad.h
+++ b/Common/DataModel/vtkQuadraticLinearQuad.h
@@ -49,35 +49,35 @@ class VTKCOMMONDATAMODEL_EXPORT vtkQuadraticLinearQuad : public vtkNonLinearCell
public:
static vtkQuadraticLinearQuad *New();
vtkTypeMacro(vtkQuadraticLinearQuad, vtkNonLinearCell);
- void PrintSelf(ostream & os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream & os, vtkIndent indent) override;
//@{
/**
* Implement the vtkCell API. See the vtkCell API for descriptions
* of these methods.
*/
- int GetCellType() VTK_OVERRIDE { return VTK_QUADRATIC_LINEAR_QUAD; };
- int GetCellDimension() VTK_OVERRIDE { return 2; }
- int GetNumberOfEdges() VTK_OVERRIDE { return 4; }
- int GetNumberOfFaces() VTK_OVERRIDE { return 0; }
- vtkCell *GetEdge (int) VTK_OVERRIDE;
- vtkCell *GetFace (int) VTK_OVERRIDE { return nullptr; }
+ int GetCellType() override { return VTK_QUADRATIC_LINEAR_QUAD; };
+ int GetCellDimension() override { return 2; }
+ int GetNumberOfEdges() override { return 4; }
+ int GetNumberOfFaces() override { return 0; }
+ vtkCell *GetEdge (int) override;
+ vtkCell *GetFace (int) override { return nullptr; }
//@}
- int CellBoundary (int subId, double pcoords[3], vtkIdList * pts) VTK_OVERRIDE;
+ int CellBoundary (int subId, double pcoords[3], vtkIdList * pts) override;
void Contour (double value, vtkDataArray * cellScalars,
vtkIncrementalPointLocator * locator, vtkCellArray * verts,
vtkCellArray * lines, vtkCellArray * polys,
vtkPointData * inPd, vtkPointData * outPd, vtkCellData * inCd,
- vtkIdType cellId, vtkCellData * outCd) VTK_OVERRIDE;
+ vtkIdType cellId, vtkCellData * outCd) override;
int EvaluatePosition (double x[3], double *closestPoint,
- int &subId, double pcoords[3], double &dist2, double *weights) VTK_OVERRIDE;
+ int &subId, double pcoords[3], double &dist2, double *weights) override;
void EvaluateLocation (int &subId, double pcoords[3], double x[3],
- double *weights) VTK_OVERRIDE;
- int Triangulate (int index, vtkIdList * ptIds, vtkPoints * pts) VTK_OVERRIDE;
+ double *weights) override;
+ int Triangulate (int index, vtkIdList * ptIds, vtkPoints * pts) override;
void Derivatives (int subId, double pcoords[3], double *values, int dim,
- double *derivs) VTK_OVERRIDE;
- double *GetParametricCoords () VTK_OVERRIDE;
+ double *derivs) override;
+ double *GetParametricCoords () override;
/**
* Clip this quadratic linear quad using scalar value provided. Like
@@ -87,19 +87,19 @@ public:
vtkIncrementalPointLocator * locator, vtkCellArray * polys,
vtkPointData * inPd, vtkPointData * outPd,
vtkCellData * inCd, vtkIdType cellId, vtkCellData * outCd,
- int insideOut) VTK_OVERRIDE;
+ int insideOut) override;
/**
* Line-edge intersection. Intersection has to occur within [0,1] parametric
* coordinates and with specified tolerance.
*/
int IntersectWithLine (double p1[3], double p2[3], double tol, double &t,
- double x[3], double pcoords[3], int &subId) VTK_OVERRIDE;
+ double x[3], double pcoords[3], int &subId) override;
/**
* Return the center of the pyramid in parametric coordinates.
*/
- int GetParametricCenter(double pcoords[3]) VTK_OVERRIDE;
+ int GetParametricCenter(double pcoords[3]) override;
/**
* @deprecated Replaced by vtkQuadraticLinearQuad::InterpolateFunctions as of VTK 5.2
@@ -114,11 +114,11 @@ public:
* Compute the interpolation functions/derivatives
* (aka shape functions/derivatives)
*/
- void InterpolateFunctions (double pcoords[3], double weights[6]) VTK_OVERRIDE
+ void InterpolateFunctions (double pcoords[3], double weights[6]) override
{
vtkQuadraticLinearQuad::InterpolationFunctions(pcoords,weights);
}
- void InterpolateDerivs (double pcoords[3], double derivs[12]) VTK_OVERRIDE
+ void InterpolateDerivs (double pcoords[3], double derivs[12]) override
{
vtkQuadraticLinearQuad::InterpolationDerivs(pcoords,derivs);
}
@@ -131,7 +131,7 @@ public:
protected:
vtkQuadraticLinearQuad ();
- ~vtkQuadraticLinearQuad () VTK_OVERRIDE;
+ ~vtkQuadraticLinearQuad () override;
vtkQuadraticEdge *Edge;
vtkLine *LinEdge;
diff --git a/Common/DataModel/vtkQuadraticLinearWedge.h b/Common/DataModel/vtkQuadraticLinearWedge.h
index 50cb3f9a7379154403c70b9fe91ab2c2d8e172ff..e99f2080d7b4d74a04f1aa5d286b352060ce5e52 100644
--- a/Common/DataModel/vtkQuadraticLinearWedge.h
+++ b/Common/DataModel/vtkQuadraticLinearWedge.h
@@ -54,22 +54,22 @@ class VTKCOMMONDATAMODEL_EXPORT vtkQuadraticLinearWedge : public vtkNonLinearCel
public:
static vtkQuadraticLinearWedge *New ();
vtkTypeMacro(vtkQuadraticLinearWedge,vtkNonLinearCell);
- void PrintSelf (ostream & os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf (ostream & os, vtkIndent indent) override;
//@{
/**
* Implement the vtkCell API. See the vtkCell API for descriptions
* of these methods.
*/
- int GetCellType() VTK_OVERRIDE { return VTK_QUADRATIC_LINEAR_WEDGE; }
- int GetCellDimension() VTK_OVERRIDE { return 3; }
- int GetNumberOfEdges() VTK_OVERRIDE { return 9; }
- int GetNumberOfFaces() VTK_OVERRIDE { return 5; }
- vtkCell *GetEdge (int edgeId) VTK_OVERRIDE;
- vtkCell *GetFace (int faceId) VTK_OVERRIDE;
+ int GetCellType() override { return VTK_QUADRATIC_LINEAR_WEDGE; }
+ int GetCellDimension() override { return 3; }
+ int GetNumberOfEdges() override { return 9; }
+ int GetNumberOfFaces() override { return 5; }
+ vtkCell *GetEdge (int edgeId) override;
+ vtkCell *GetFace (int faceId) override;
//@}
- int CellBoundary (int subId, double pcoords[3], vtkIdList * pts) VTK_OVERRIDE;
+ int CellBoundary (int subId, double pcoords[3], vtkIdList * pts) override;
//@{
/**
@@ -80,15 +80,15 @@ public:
vtkIncrementalPointLocator * locator, vtkCellArray * verts,
vtkCellArray * lines, vtkCellArray * polys,
vtkPointData * inPd, vtkPointData * outPd, vtkCellData * inCd,
- vtkIdType cellId, vtkCellData * outCd) VTK_OVERRIDE;
+ vtkIdType cellId, vtkCellData * outCd) override;
int EvaluatePosition (double x[3], double *closestPoint,
- int &subId, double pcoords[3], double &dist2, double *weights) VTK_OVERRIDE;
+ int &subId, double pcoords[3], double &dist2, double *weights) override;
void EvaluateLocation (int &subId, double pcoords[3], double x[3],
- double *weights) VTK_OVERRIDE;
- int Triangulate (int index, vtkIdList * ptIds, vtkPoints * pts) VTK_OVERRIDE;
+ double *weights) override;
+ int Triangulate (int index, vtkIdList * ptIds, vtkPoints * pts) override;
void Derivatives (int subId, double pcoords[3], double *values,
- int dim, double *derivs) VTK_OVERRIDE;
- double *GetParametricCoords () VTK_OVERRIDE;
+ int dim, double *derivs) override;
+ double *GetParametricCoords () override;
//@}
/**
@@ -100,19 +100,19 @@ public:
vtkIncrementalPointLocator * locator, vtkCellArray * tetras,
vtkPointData * inPd, vtkPointData * outPd,
vtkCellData * inCd, vtkIdType cellId, vtkCellData * outCd,
- int insideOut) VTK_OVERRIDE;
+ int insideOut) override;
/**
* Line-edge intersection. Intersection has to occur within [0,1] parametric
* coordinates and with specified tolerance.
*/
int IntersectWithLine (double p1[3], double p2[3], double tol, double &t,
- double x[3], double pcoords[3], int &subId) VTK_OVERRIDE;
+ double x[3], double pcoords[3], int &subId) override;
/**
* Return the center of the quadratic linear wedge in parametric coordinates.
*/
- int GetParametricCenter (double pcoords[3]) VTK_OVERRIDE;
+ int GetParametricCenter (double pcoords[3]) override;
/**
* @deprecated Replaced by vtkQuadraticLinearWedge::InterpolateFunctions as of VTK 5.2
@@ -127,11 +127,11 @@ public:
* Compute the interpolation functions/derivatives
* (aka shape functions/derivatives)
*/
- void InterpolateFunctions (double pcoords[3], double weights[15]) VTK_OVERRIDE
+ void InterpolateFunctions (double pcoords[3], double weights[15]) override
{
vtkQuadraticLinearWedge::InterpolationFunctions(pcoords,weights);
}
- void InterpolateDerivs (double pcoords[3], double derivs[45]) VTK_OVERRIDE
+ void InterpolateDerivs (double pcoords[3], double derivs[45]) override
{
vtkQuadraticLinearWedge::InterpolationDerivs(pcoords,derivs);
}
@@ -154,7 +154,7 @@ public:
protected:
vtkQuadraticLinearWedge ();
- ~vtkQuadraticLinearWedge () VTK_OVERRIDE;
+ ~vtkQuadraticLinearWedge () override;
vtkQuadraticEdge *QuadEdge;
vtkLine *Edge;
diff --git a/Common/DataModel/vtkQuadraticPolygon.h b/Common/DataModel/vtkQuadraticPolygon.h
index ce33264603f968cd689d91f2948915c78a6c9f25..3ace02bf95914082886b685cdd095e44ef2937f0 100644
--- a/Common/DataModel/vtkQuadraticPolygon.h
+++ b/Common/DataModel/vtkQuadraticPolygon.h
@@ -45,19 +45,19 @@ class VTKCOMMONDATAMODEL_EXPORT vtkQuadraticPolygon : public vtkNonLinearCell
public:
static vtkQuadraticPolygon *New();
vtkTypeMacro(vtkQuadraticPolygon, vtkNonLinearCell);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Implement the vtkCell API. See the vtkCell API for descriptions
* of these methods.
*/
- int GetCellType() VTK_OVERRIDE { return VTK_QUADRATIC_POLYGON; }
- int GetCellDimension() VTK_OVERRIDE { return 2;}
- int GetNumberOfEdges() VTK_OVERRIDE { return this->GetNumberOfPoints() / 2; }
- int GetNumberOfFaces() VTK_OVERRIDE { return 0; }
- vtkCell *GetEdge(int) VTK_OVERRIDE;
- vtkCell *GetFace(int) VTK_OVERRIDE { return nullptr; }
- int IsPrimaryCell() VTK_OVERRIDE { return 0; }
+ int GetCellType() override { return VTK_QUADRATIC_POLYGON; }
+ int GetCellDimension() override { return 2;}
+ int GetNumberOfEdges() override { return this->GetNumberOfPoints() / 2; }
+ int GetNumberOfFaces() override { return 0; }
+ vtkCell *GetEdge(int) override;
+ vtkCell *GetFace(int) override { return nullptr; }
+ int IsPrimaryCell() override { return 0; }
//@{
/**
@@ -66,25 +66,25 @@ public:
* is transform into a vtkPolygon (with 2*n edges and 2*n points)
* and the vtkPolygon methods are called.
*/
- int CellBoundary(int subId, double pcoords[3], vtkIdList *pts) VTK_OVERRIDE;
+ int CellBoundary(int subId, double pcoords[3], vtkIdList *pts) override;
void Contour(double value, vtkDataArray *cellScalars,
vtkIncrementalPointLocator *locator, vtkCellArray *verts,
vtkCellArray *lines, vtkCellArray *polys,
vtkPointData *inPd, vtkPointData *outPd,
- vtkCellData *inCd, vtkIdType cellId, vtkCellData *outCd) VTK_OVERRIDE;
+ vtkCellData *inCd, vtkIdType cellId, vtkCellData *outCd) override;
void Clip(double value, vtkDataArray *cellScalars,
vtkIncrementalPointLocator *locator, vtkCellArray *polys,
vtkPointData *inPd, vtkPointData *outPd,
vtkCellData *inCd, vtkIdType cellId, vtkCellData *outCd,
- int insideOut) VTK_OVERRIDE;
+ int insideOut) override;
int EvaluatePosition(double x[3], double* closestPoint,
int& subId, double pcoords[3],
- double& dist2, double *weights) VTK_OVERRIDE;
+ double& dist2, double *weights) override;
void EvaluateLocation(int& subId, double pcoords[3], double x[3],
- double *weights) VTK_OVERRIDE;
+ double *weights) override;
int IntersectWithLine(double p1[3], double p2[3], double tol, double& t,
- double x[3], double pcoords[3], int& subId) VTK_OVERRIDE;
- void InterpolateFunctions(double x[3], double *weights) VTK_OVERRIDE;
+ double x[3], double pcoords[3], int& subId) override;
+ void InterpolateFunctions(double x[3], double *weights) override;
static void ComputeCentroid(vtkIdTypeArray *ids, vtkPoints *pts,
double centroid[3]);
int ParameterizePolygon(double p0[3], double p10[3], double &l10,
@@ -92,7 +92,7 @@ public:
static int PointInPolygon(double x[3], int numPts, double *pts,
double bounds[6], double n[3]);
int Triangulate(vtkIdList *outTris);
- int Triangulate(int index, vtkIdList *ptIds, vtkPoints *pts) VTK_OVERRIDE;
+ int Triangulate(int index, vtkIdList *ptIds, vtkPoints *pts) override;
int NonDegenerateTriangulate(vtkIdList *outTris);
static double DistanceToPolygon(double x[3], int numPts, double *pts,
double bounds[6], double closest[3]);
@@ -106,7 +106,7 @@ public:
// Not implemented
void Derivatives(int subId, double pcoords[3], double *values,
- int dim, double *derivs) VTK_OVERRIDE;
+ int dim, double *derivs) override;
//@{
/**
@@ -121,7 +121,7 @@ public:
protected:
vtkQuadraticPolygon();
- ~vtkQuadraticPolygon() VTK_OVERRIDE;
+ ~vtkQuadraticPolygon() override;
// variables used by instances of this class
vtkPolygon *Polygon;
diff --git a/Common/DataModel/vtkQuadraticPyramid.h b/Common/DataModel/vtkQuadraticPyramid.h
index ad4bb46c682eb3e8ec8af3fcfe2fe31e3118f66a..e51da213efb6e43d22f6f79949b7f0f1dc1fa847 100644
--- a/Common/DataModel/vtkQuadraticPyramid.h
+++ b/Common/DataModel/vtkQuadraticPyramid.h
@@ -54,36 +54,36 @@ class VTKCOMMONDATAMODEL_EXPORT vtkQuadraticPyramid : public vtkNonLinearCell
public:
static vtkQuadraticPyramid *New();
vtkTypeMacro(vtkQuadraticPyramid,vtkNonLinearCell);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
* Implement the vtkCell API. See the vtkCell API for descriptions
* of these methods.
*/
- int GetCellType() VTK_OVERRIDE {return VTK_QUADRATIC_PYRAMID;};
- int GetCellDimension() VTK_OVERRIDE {return 3;}
- int GetNumberOfEdges() VTK_OVERRIDE {return 8;}
- int GetNumberOfFaces() VTK_OVERRIDE {return 5;}
- vtkCell *GetEdge(int edgeId) VTK_OVERRIDE;
- vtkCell *GetFace(int faceId) VTK_OVERRIDE;
+ int GetCellType() override {return VTK_QUADRATIC_PYRAMID;};
+ int GetCellDimension() override {return 3;}
+ int GetNumberOfEdges() override {return 8;}
+ int GetNumberOfFaces() override {return 5;}
+ vtkCell *GetEdge(int edgeId) override;
+ vtkCell *GetFace(int faceId) override;
//@}
- int CellBoundary(int subId, double pcoords[3], vtkIdList *pts) VTK_OVERRIDE;
+ int CellBoundary(int subId, double pcoords[3], vtkIdList *pts) override;
void Contour(double value, vtkDataArray *cellScalars,
vtkIncrementalPointLocator *locator, vtkCellArray *verts,
vtkCellArray *lines, vtkCellArray *polys,
vtkPointData *inPd, vtkPointData *outPd,
- vtkCellData *inCd, vtkIdType cellId, vtkCellData *outCd) VTK_OVERRIDE;
+ vtkCellData *inCd, vtkIdType cellId, vtkCellData *outCd) override;
int EvaluatePosition(double x[3], double* closestPoint,
int& subId, double pcoords[3],
- double& dist2, double *weights) VTK_OVERRIDE;
+ double& dist2, double *weights) override;
void EvaluateLocation(int& subId, double pcoords[3], double x[3],
- double *weights) VTK_OVERRIDE;
- int Triangulate(int index, vtkIdList *ptIds, vtkPoints *pts) VTK_OVERRIDE;
+ double *weights) override;
+ int Triangulate(int index, vtkIdList *ptIds, vtkPoints *pts) override;
void Derivatives(int subId, double pcoords[3], double *values,
- int dim, double *derivs) VTK_OVERRIDE;
- double *GetParametricCoords() VTK_OVERRIDE;
+ int dim, double *derivs) override;
+ double *GetParametricCoords() override;
/**
* Clip this quadratic triangle using scalar value provided. Like
@@ -94,20 +94,20 @@ public:
vtkIncrementalPointLocator *locator, vtkCellArray *tets,
vtkPointData *inPd, vtkPointData *outPd,
vtkCellData *inCd, vtkIdType cellId, vtkCellData *outCd,
- int insideOut) VTK_OVERRIDE;
+ int insideOut) override;
/**
* Line-edge intersection. Intersection has to occur within [0,1] parametric
* coordinates and with specified tolerance.
*/
int IntersectWithLine(double p1[3], double p2[3], double tol, double& t,
- double x[3], double pcoords[3], int& subId) VTK_OVERRIDE;
+ double x[3], double pcoords[3], int& subId) override;
/**
* Return the center of the quadratic pyramid in parametric coordinates.
*/
- int GetParametricCenter(double pcoords[3]) VTK_OVERRIDE;
+ int GetParametricCenter(double pcoords[3]) override;
/**
* @deprecated Replaced by vtkQuadraticPyramid::InterpolateFunctions as of VTK 5.2
@@ -122,11 +122,11 @@ public:
* Compute the interpolation functions/derivatives
* (aka shape functions/derivatives)
*/
- void InterpolateFunctions(double pcoords[3], double weights[13]) VTK_OVERRIDE
+ void InterpolateFunctions(double pcoords[3], double weights[13]) override
{
vtkQuadraticPyramid::InterpolationFunctions(pcoords,weights);
}
- void InterpolateDerivs(double pcoords[3], double derivs[39]) VTK_OVERRIDE
+ void InterpolateDerivs(double pcoords[3], double derivs[39]) override
{
vtkQuadraticPyramid::InterpolationDerivs(pcoords,derivs);
}
@@ -149,7 +149,7 @@ public:
protected:
vtkQuadraticPyramid();
- ~vtkQuadraticPyramid() VTK_OVERRIDE;
+ ~vtkQuadraticPyramid() override;
vtkQuadraticEdge *Edge;
vtkQuadraticTriangle *TriangleFace;
diff --git a/Common/DataModel/vtkQuadraticQuad.h b/Common/DataModel/vtkQuadraticQuad.h
index 42412997951aa9750decf675429f906e41720645..18123482a86082af0cb251ff2da6723fe96b2a6e 100644
--- a/Common/DataModel/vtkQuadraticQuad.h
+++ b/Common/DataModel/vtkQuadraticQuad.h
@@ -45,36 +45,36 @@ class VTKCOMMONDATAMODEL_EXPORT vtkQuadraticQuad : public vtkNonLinearCell
public:
static vtkQuadraticQuad *New();
vtkTypeMacro(vtkQuadraticQuad,vtkNonLinearCell);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
* Implement the vtkCell API. See the vtkCell API for descriptions
* of these methods.
*/
- int GetCellType() VTK_OVERRIDE {return VTK_QUADRATIC_QUAD;};
- int GetCellDimension() VTK_OVERRIDE {return 2;}
- int GetNumberOfEdges() VTK_OVERRIDE {return 4;}
- int GetNumberOfFaces() VTK_OVERRIDE {return 0;}
- vtkCell *GetEdge(int) VTK_OVERRIDE;
- vtkCell *GetFace(int) VTK_OVERRIDE {return nullptr;}
+ int GetCellType() override {return VTK_QUADRATIC_QUAD;};
+ int GetCellDimension() override {return 2;}
+ int GetNumberOfEdges() override {return 4;}
+ int GetNumberOfFaces() override {return 0;}
+ vtkCell *GetEdge(int) override;
+ vtkCell *GetFace(int) override {return nullptr;}
//@}
- int CellBoundary(int subId, double pcoords[3], vtkIdList *pts) VTK_OVERRIDE;
+ int CellBoundary(int subId, double pcoords[3], vtkIdList *pts) override;
void Contour(double value, vtkDataArray *cellScalars,
vtkIncrementalPointLocator *locator, vtkCellArray *verts,
vtkCellArray *lines, vtkCellArray *polys,
vtkPointData *inPd, vtkPointData *outPd,
- vtkCellData *inCd, vtkIdType cellId, vtkCellData *outCd) VTK_OVERRIDE;
+ vtkCellData *inCd, vtkIdType cellId, vtkCellData *outCd) override;
int EvaluatePosition(double x[3], double* closestPoint,
int& subId, double pcoords[3],
- double& dist2, double *weights) VTK_OVERRIDE;
+ double& dist2, double *weights) override;
void EvaluateLocation(int& subId, double pcoords[3], double x[3],
- double *weights) VTK_OVERRIDE;
- int Triangulate(int index, vtkIdList *ptIds, vtkPoints *pts) VTK_OVERRIDE;
+ double *weights) override;
+ int Triangulate(int index, vtkIdList *ptIds, vtkPoints *pts) override;
void Derivatives(int subId, double pcoords[3], double *values,
- int dim, double *derivs) VTK_OVERRIDE;
- double *GetParametricCoords() VTK_OVERRIDE;
+ int dim, double *derivs) override;
+ double *GetParametricCoords() override;
/**
* Clip this quadratic quad using scalar value provided. Like contouring,
@@ -84,20 +84,20 @@ public:
vtkIncrementalPointLocator *locator, vtkCellArray *polys,
vtkPointData *inPd, vtkPointData *outPd,
vtkCellData *inCd, vtkIdType cellId, vtkCellData *outCd,
- int insideOut) VTK_OVERRIDE;
+ int insideOut) override;
/**
* Line-edge intersection. Intersection has to occur within [0,1] parametric
* coordinates and with specified tolerance.
*/
int IntersectWithLine(double p1[3], double p2[3], double tol, double& t,
- double x[3], double pcoords[3], int& subId) VTK_OVERRIDE;
+ double x[3], double pcoords[3], int& subId) override;
/**
* Return the center of the pyramid in parametric coordinates.
*/
- int GetParametricCenter(double pcoords[3]) VTK_OVERRIDE;
+ int GetParametricCenter(double pcoords[3]) override;
/**
* @deprecated Replaced by vtkQuadraticQuad::InterpolateFunctions as of VTK 5.2
@@ -112,11 +112,11 @@ public:
* Compute the interpolation functions/derivatives
* (aka shape functions/derivatives)
*/
- void InterpolateFunctions(double pcoords[3], double weights[8]) VTK_OVERRIDE
+ void InterpolateFunctions(double pcoords[3], double weights[8]) override
{
vtkQuadraticQuad::InterpolationFunctions(pcoords,weights);
}
- void InterpolateDerivs(double pcoords[3], double derivs[16]) VTK_OVERRIDE
+ void InterpolateDerivs(double pcoords[3], double derivs[16]) override
{
vtkQuadraticQuad::InterpolationDerivs(pcoords,derivs);
}
@@ -124,7 +124,7 @@ public:
protected:
vtkQuadraticQuad();
- ~vtkQuadraticQuad() VTK_OVERRIDE;
+ ~vtkQuadraticQuad() override;
vtkQuadraticEdge *Edge;
vtkQuad *Quad;
diff --git a/Common/DataModel/vtkQuadraticTetra.h b/Common/DataModel/vtkQuadraticTetra.h
index ec40b685f5e0098ea74f3eb3cad58e1b23415044..7ff8fa22ea234ecdad4b0510de6aebb2946f3833 100644
--- a/Common/DataModel/vtkQuadraticTetra.h
+++ b/Common/DataModel/vtkQuadraticTetra.h
@@ -50,36 +50,36 @@ class VTKCOMMONDATAMODEL_EXPORT vtkQuadraticTetra : public vtkNonLinearCell
public:
static vtkQuadraticTetra *New();
vtkTypeMacro(vtkQuadraticTetra,vtkNonLinearCell);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
* Implement the vtkCell API. See the vtkCell API for descriptions
* of these methods.
*/
- int GetCellType() VTK_OVERRIDE {return VTK_QUADRATIC_TETRA;}
- int GetCellDimension() VTK_OVERRIDE {return 3;}
- int GetNumberOfEdges() VTK_OVERRIDE {return 6;}
- int GetNumberOfFaces() VTK_OVERRIDE {return 4;}
- vtkCell *GetEdge(int) VTK_OVERRIDE;
- vtkCell *GetFace(int) VTK_OVERRIDE;
+ int GetCellType() override {return VTK_QUADRATIC_TETRA;}
+ int GetCellDimension() override {return 3;}
+ int GetNumberOfEdges() override {return 6;}
+ int GetNumberOfFaces() override {return 4;}
+ vtkCell *GetEdge(int) override;
+ vtkCell *GetFace(int) override;
//@}
- int CellBoundary(int subId, double pcoords[3], vtkIdList *pts) VTK_OVERRIDE;
+ int CellBoundary(int subId, double pcoords[3], vtkIdList *pts) override;
void Contour(double value, vtkDataArray *cellScalars,
vtkIncrementalPointLocator *locator, vtkCellArray *verts,
vtkCellArray *lines, vtkCellArray *polys,
vtkPointData *inPd, vtkPointData *outPd,
- vtkCellData *inCd, vtkIdType cellId, vtkCellData *outCd) VTK_OVERRIDE;
+ vtkCellData *inCd, vtkIdType cellId, vtkCellData *outCd) override;
int EvaluatePosition(double x[3], double* closestPoint,
int& subId, double pcoords[3],
- double& dist2, double *weights) VTK_OVERRIDE;
+ double& dist2, double *weights) override;
void EvaluateLocation(int& subId, double pcoords[3], double x[3],
- double *weights) VTK_OVERRIDE;
- int Triangulate(int index, vtkIdList *ptIds, vtkPoints *pts) VTK_OVERRIDE;
+ double *weights) override;
+ int Triangulate(int index, vtkIdList *ptIds, vtkPoints *pts) override;
void Derivatives(int subId, double pcoords[3], double *values,
- int dim, double *derivs) VTK_OVERRIDE;
- double *GetParametricCoords() VTK_OVERRIDE;
+ int dim, double *derivs) override;
+ double *GetParametricCoords() override;
/**
* Clip this edge using scalar value provided. Like contouring, except
@@ -89,26 +89,26 @@ public:
vtkIncrementalPointLocator *locator, vtkCellArray *tetras,
vtkPointData *inPd, vtkPointData *outPd,
vtkCellData *inCd, vtkIdType cellId, vtkCellData *outCd,
- int insideOut) VTK_OVERRIDE;
+ int insideOut) override;
/**
* Line-edge intersection. Intersection has to occur within [0,1] parametric
* coordinates and with specified tolerance.
*/
int IntersectWithLine(double p1[3], double p2[3], double tol, double& t,
- double x[3], double pcoords[3], int& subId) VTK_OVERRIDE;
+ double x[3], double pcoords[3], int& subId) override;
/**
* Return the center of the quadratic tetra in parametric coordinates.
*/
- int GetParametricCenter(double pcoords[3]) VTK_OVERRIDE;
+ int GetParametricCenter(double pcoords[3]) override;
/**
* Return the distance of the parametric coordinate provided to the
* cell. If inside the cell, a distance of zero is returned.
*/
- double GetParametricDistance(double pcoords[3]) VTK_OVERRIDE;
+ double GetParametricDistance(double pcoords[3]) override;
/**
* @deprecated Replaced by vtkQuadraticTetra::InterpolateFunctions as of VTK 5.2
@@ -123,11 +123,11 @@ public:
* Compute the interpolation functions/derivatives
* (aka shape functions/derivatives)
*/
- void InterpolateFunctions(double pcoords[3], double weights[10]) VTK_OVERRIDE
+ void InterpolateFunctions(double pcoords[3], double weights[10]) override
{
vtkQuadraticTetra::InterpolationFunctions(pcoords,weights);
}
- void InterpolateDerivs(double pcoords[3], double derivs[30]) VTK_OVERRIDE
+ void InterpolateDerivs(double pcoords[3], double derivs[30]) override
{
vtkQuadraticTetra::InterpolationDerivs(pcoords,derivs);
}
@@ -150,7 +150,7 @@ public:
protected:
vtkQuadraticTetra();
- ~vtkQuadraticTetra() VTK_OVERRIDE;
+ ~vtkQuadraticTetra() override;
vtkQuadraticEdge *Edge;
vtkQuadraticTriangle *Face;
diff --git a/Common/DataModel/vtkQuadraticTriangle.h b/Common/DataModel/vtkQuadraticTriangle.h
index 4271105573197203908cd4cc7bd7142971a86c55..c7944c322deb1fa8a2d47750a72fb37d3c4e4148 100644
--- a/Common/DataModel/vtkQuadraticTriangle.h
+++ b/Common/DataModel/vtkQuadraticTriangle.h
@@ -45,36 +45,36 @@ class VTKCOMMONDATAMODEL_EXPORT vtkQuadraticTriangle : public vtkNonLinearCell
public:
static vtkQuadraticTriangle *New();
vtkTypeMacro(vtkQuadraticTriangle,vtkNonLinearCell);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
* Implement the vtkCell API. See the vtkCell API for descriptions
* of these methods.
*/
- int GetCellType() VTK_OVERRIDE {return VTK_QUADRATIC_TRIANGLE;};
- int GetCellDimension() VTK_OVERRIDE {return 2;}
- int GetNumberOfEdges() VTK_OVERRIDE {return 3;}
- int GetNumberOfFaces() VTK_OVERRIDE {return 0;}
- vtkCell *GetEdge(int edgeId) VTK_OVERRIDE;
- vtkCell *GetFace(int) VTK_OVERRIDE {return nullptr;}
+ int GetCellType() override {return VTK_QUADRATIC_TRIANGLE;};
+ int GetCellDimension() override {return 2;}
+ int GetNumberOfEdges() override {return 3;}
+ int GetNumberOfFaces() override {return 0;}
+ vtkCell *GetEdge(int edgeId) override;
+ vtkCell *GetFace(int) override {return nullptr;}
//@}
- int CellBoundary(int subId, double pcoords[3], vtkIdList *pts) VTK_OVERRIDE;
+ int CellBoundary(int subId, double pcoords[3], vtkIdList *pts) override;
void Contour(double value, vtkDataArray *cellScalars,
vtkIncrementalPointLocator *locator, vtkCellArray *verts,
vtkCellArray *lines, vtkCellArray *polys,
vtkPointData *inPd, vtkPointData *outPd,
- vtkCellData *inCd, vtkIdType cellId, vtkCellData *outCd) VTK_OVERRIDE;
+ vtkCellData *inCd, vtkIdType cellId, vtkCellData *outCd) override;
int EvaluatePosition(double x[3], double* closestPoint,
int& subId, double pcoords[3],
- double& dist2, double *weights) VTK_OVERRIDE;
+ double& dist2, double *weights) override;
void EvaluateLocation(int& subId, double pcoords[3], double x[3],
- double *weights) VTK_OVERRIDE;
- int Triangulate(int index, vtkIdList *ptIds, vtkPoints *pts) VTK_OVERRIDE;
+ double *weights) override;
+ int Triangulate(int index, vtkIdList *ptIds, vtkPoints *pts) override;
void Derivatives(int subId, double pcoords[3], double *values,
- int dim, double *derivs) VTK_OVERRIDE;
- double *GetParametricCoords() VTK_OVERRIDE;
+ int dim, double *derivs) override;
+ double *GetParametricCoords() override;
/**
* Clip this quadratic triangle using scalar value provided. Like
@@ -85,26 +85,26 @@ public:
vtkIncrementalPointLocator *locator, vtkCellArray *polys,
vtkPointData *inPd, vtkPointData *outPd,
vtkCellData *inCd, vtkIdType cellId, vtkCellData *outCd,
- int insideOut) VTK_OVERRIDE;
+ int insideOut) override;
/**
* Line-edge intersection. Intersection has to occur within [0,1] parametric
* coordinates and with specified tolerance.
*/
int IntersectWithLine(double p1[3], double p2[3], double tol, double& t,
- double x[3], double pcoords[3], int& subId) VTK_OVERRIDE;
+ double x[3], double pcoords[3], int& subId) override;
/**
* Return the center of the quadratic triangle in parametric coordinates.
*/
- int GetParametricCenter(double pcoords[3]) VTK_OVERRIDE;
+ int GetParametricCenter(double pcoords[3]) override;
/**
* Return the distance of the parametric coordinate provided to the
* cell. If inside the cell, a distance of zero is returned.
*/
- double GetParametricDistance(double pcoords[3]) VTK_OVERRIDE;
+ double GetParametricDistance(double pcoords[3]) override;
/**
* @deprecated Replaced by vtkQuadraticTriangle::InterpolateFunctions as of VTK 5.2
@@ -119,11 +119,11 @@ public:
* Compute the interpolation functions/derivatives
* (aka shape functions/derivatives)
*/
- void InterpolateFunctions(double pcoords[3], double weights[6]) VTK_OVERRIDE
+ void InterpolateFunctions(double pcoords[3], double weights[6]) override
{
vtkQuadraticTriangle::InterpolationFunctions(pcoords,weights);
}
- void InterpolateDerivs(double pcoords[3], double derivs[12]) VTK_OVERRIDE
+ void InterpolateDerivs(double pcoords[3], double derivs[12]) override
{
vtkQuadraticTriangle::InterpolationDerivs(pcoords,derivs);
}
@@ -131,7 +131,7 @@ public:
protected:
vtkQuadraticTriangle();
- ~vtkQuadraticTriangle() VTK_OVERRIDE;
+ ~vtkQuadraticTriangle() override;
vtkQuadraticEdge *Edge;
vtkTriangle *Face;
diff --git a/Common/DataModel/vtkQuadraticWedge.h b/Common/DataModel/vtkQuadraticWedge.h
index d51833a65c8cd795b960db2fbd6fec824fab126e..3cee6df28a8e1057ccef93ae43e3f1b411ab325a 100644
--- a/Common/DataModel/vtkQuadraticWedge.h
+++ b/Common/DataModel/vtkQuadraticWedge.h
@@ -50,36 +50,36 @@ class VTKCOMMONDATAMODEL_EXPORT vtkQuadraticWedge : public vtkNonLinearCell
public:
static vtkQuadraticWedge *New();
vtkTypeMacro(vtkQuadraticWedge,vtkNonLinearCell);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
* Implement the vtkCell API. See the vtkCell API for descriptions
* of these methods.
*/
- int GetCellType() VTK_OVERRIDE {return VTK_QUADRATIC_WEDGE;}
- int GetCellDimension() VTK_OVERRIDE {return 3;}
- int GetNumberOfEdges() VTK_OVERRIDE {return 9;}
- int GetNumberOfFaces() VTK_OVERRIDE {return 5;}
- vtkCell *GetEdge(int edgeId) VTK_OVERRIDE;
- vtkCell *GetFace(int faceId) VTK_OVERRIDE;
+ int GetCellType() override {return VTK_QUADRATIC_WEDGE;}
+ int GetCellDimension() override {return 3;}
+ int GetNumberOfEdges() override {return 9;}
+ int GetNumberOfFaces() override {return 5;}
+ vtkCell *GetEdge(int edgeId) override;
+ vtkCell *GetFace(int faceId) override;
//@}
- int CellBoundary(int subId, double pcoords[3], vtkIdList *pts) VTK_OVERRIDE;
+ int CellBoundary(int subId, double pcoords[3], vtkIdList *pts) override;
void Contour(double value, vtkDataArray *cellScalars,
vtkIncrementalPointLocator *locator, vtkCellArray *verts,
vtkCellArray *lines, vtkCellArray *polys,
vtkPointData *inPd, vtkPointData *outPd,
- vtkCellData *inCd, vtkIdType cellId, vtkCellData *outCd) VTK_OVERRIDE;
+ vtkCellData *inCd, vtkIdType cellId, vtkCellData *outCd) override;
int EvaluatePosition(double x[3], double* closestPoint,
int& subId, double pcoords[3],
- double& dist2, double *weights) VTK_OVERRIDE;
+ double& dist2, double *weights) override;
void EvaluateLocation(int& subId, double pcoords[3], double x[3],
- double *weights) VTK_OVERRIDE;
- int Triangulate(int index, vtkIdList *ptIds, vtkPoints *pts) VTK_OVERRIDE;
+ double *weights) override;
+ int Triangulate(int index, vtkIdList *ptIds, vtkPoints *pts) override;
void Derivatives(int subId, double pcoords[3], double *values,
- int dim, double *derivs) VTK_OVERRIDE;
- double *GetParametricCoords() VTK_OVERRIDE;
+ int dim, double *derivs) override;
+ double *GetParametricCoords() override;
/**
* Clip this quadratic hexahedron using scalar value provided. Like
@@ -90,20 +90,20 @@ public:
vtkIncrementalPointLocator *locator, vtkCellArray *tetras,
vtkPointData *inPd, vtkPointData *outPd,
vtkCellData *inCd, vtkIdType cellId, vtkCellData *outCd,
- int insideOut) VTK_OVERRIDE;
+ int insideOut) override;
/**
* Line-edge intersection. Intersection has to occur within [0,1] parametric
* coordinates and with specified tolerance.
*/
int IntersectWithLine(double p1[3], double p2[3], double tol, double& t,
- double x[3], double pcoords[3], int& subId) VTK_OVERRIDE;
+ double x[3], double pcoords[3], int& subId) override;
/**
* Return the center of the quadratic wedge in parametric coordinates.
*/
- int GetParametricCenter(double pcoords[3]) VTK_OVERRIDE;
+ int GetParametricCenter(double pcoords[3]) override;
/**
* @deprecated Replaced by vtkQuadraticWedge::InterpolateFunctions as of VTK 5.2
@@ -118,11 +118,11 @@ public:
* Compute the interpolation functions/derivatives
* (aka shape functions/derivatives)
*/
- void InterpolateFunctions(double pcoords[3], double weights[15]) VTK_OVERRIDE
+ void InterpolateFunctions(double pcoords[3], double weights[15]) override
{
vtkQuadraticWedge::InterpolationFunctions(pcoords,weights);
}
- void InterpolateDerivs(double pcoords[3], double derivs[45]) VTK_OVERRIDE
+ void InterpolateDerivs(double pcoords[3], double derivs[45]) override
{
vtkQuadraticWedge::InterpolationDerivs(pcoords,derivs);
}
@@ -145,7 +145,7 @@ public:
protected:
vtkQuadraticWedge();
- ~vtkQuadraticWedge() VTK_OVERRIDE;
+ ~vtkQuadraticWedge() override;
vtkQuadraticEdge *Edge;
vtkQuadraticTriangle *TriangleFace;
diff --git a/Common/DataModel/vtkQuadratureSchemeDefinition.h b/Common/DataModel/vtkQuadratureSchemeDefinition.h
index 2d6e998ffe2e2a69cb5f916a0ddaf0425bfb4ae0..66bd8c079e94f912f2ecd989698b5ee459ea87ab 100644
--- a/Common/DataModel/vtkQuadratureSchemeDefinition.h
+++ b/Common/DataModel/vtkQuadratureSchemeDefinition.h
@@ -47,7 +47,7 @@ class VTKCOMMONDATAMODEL_EXPORT vtkQuadratureSchemeDefinition : public vtkObject
public:
// vtk stuff
vtkTypeMacro(vtkQuadratureSchemeDefinition,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkInformationQuadratureSchemeDefinitionVectorKey* DICTIONARY();
static vtkInformationStringKey* QUADRATURE_OFFSET_ARRAY_NAME();
@@ -134,7 +134,7 @@ public:
protected:
vtkQuadratureSchemeDefinition();
- ~vtkQuadratureSchemeDefinition() VTK_OVERRIDE;
+ ~vtkQuadratureSchemeDefinition() override;
private:
/**
* Allocate/De-allocate resources that will be used by the definition.
diff --git a/Common/DataModel/vtkQuadric.h b/Common/DataModel/vtkQuadric.h
index 0c42a4fb6e2462ac8cc1611ffb7ce83888c3b6e9..c17709e834f59db0c83c3dd3f75df47b3babd108 100644
--- a/Common/DataModel/vtkQuadric.h
+++ b/Common/DataModel/vtkQuadric.h
@@ -31,7 +31,7 @@ class VTKCOMMONDATAMODEL_EXPORT vtkQuadric : public vtkImplicitFunction
{
public:
vtkTypeMacro(vtkQuadric,vtkImplicitFunction);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct quadric with all coefficients = 1.
@@ -43,13 +43,13 @@ public:
* Evaluate quadric equation.
*/
using vtkImplicitFunction::EvaluateFunction;
- double EvaluateFunction(double x[3]) VTK_OVERRIDE;
+ double EvaluateFunction(double x[3]) override;
//@}
/**
* Evaluate the gradient to the quadric equation.
*/
- void EvaluateGradient(double x[3], double g[3]) VTK_OVERRIDE;
+ void EvaluateGradient(double x[3], double g[3]) override;
//@{
/**
@@ -63,7 +63,7 @@ public:
protected:
vtkQuadric();
- ~vtkQuadric() VTK_OVERRIDE {}
+ ~vtkQuadric() override {}
double Coefficients[10];
diff --git a/Common/DataModel/vtkRectilinearGrid.h b/Common/DataModel/vtkRectilinearGrid.h
index d27e5457353f76485ef5c708627964170087dafd..1f8063264f0dc758d235bc41f7a0e3540c4a69cd 100644
--- a/Common/DataModel/vtkRectilinearGrid.h
+++ b/Common/DataModel/vtkRectilinearGrid.h
@@ -53,56 +53,56 @@ public:
static vtkRectilinearGrid *New();
vtkTypeMacro(vtkRectilinearGrid,vtkDataSet);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Return what type of dataset this is.
*/
- int GetDataObjectType() VTK_OVERRIDE {return VTK_RECTILINEAR_GRID;};
+ int GetDataObjectType() override {return VTK_RECTILINEAR_GRID;};
/**
* Copy the geometric and topological structure of an input rectilinear grid
* object.
*/
- void CopyStructure(vtkDataSet *ds) VTK_OVERRIDE;
+ void CopyStructure(vtkDataSet *ds) override;
/**
* Restore object to initial state. Release memory back to system.
*/
- void Initialize() VTK_OVERRIDE;
+ void Initialize() override;
//@{
/**
* Standard vtkDataSet API methods. See vtkDataSet for more information.
*/
- vtkIdType GetNumberOfCells() VTK_OVERRIDE;
- vtkIdType GetNumberOfPoints() VTK_OVERRIDE;
- double *GetPoint(vtkIdType ptId) VTK_OVERRIDE;
- void GetPoint(vtkIdType id, double x[3]) VTK_OVERRIDE;
- vtkCell *GetCell(vtkIdType cellId) VTK_OVERRIDE;
- vtkCell *GetCell(int i, int j, int k) VTK_OVERRIDE;
- void GetCell(vtkIdType cellId, vtkGenericCell *cell) VTK_OVERRIDE;
- void GetCellBounds(vtkIdType cellId, double bounds[6]) VTK_OVERRIDE;
+ vtkIdType GetNumberOfCells() override;
+ vtkIdType GetNumberOfPoints() override;
+ double *GetPoint(vtkIdType ptId) override;
+ void GetPoint(vtkIdType id, double x[3]) override;
+ vtkCell *GetCell(vtkIdType cellId) override;
+ vtkCell *GetCell(int i, int j, int k) override;
+ void GetCell(vtkIdType cellId, vtkGenericCell *cell) override;
+ void GetCellBounds(vtkIdType cellId, double bounds[6]) override;
vtkIdType FindPoint(double x, double y, double z) { return this->vtkDataSet::FindPoint(x, y, z);};
- vtkIdType FindPoint(double x[3]) VTK_OVERRIDE;
+ vtkIdType FindPoint(double x[3]) override;
vtkIdType FindCell(double x[3], vtkCell *cell, vtkIdType cellId, double tol2,
- int& subId, double pcoords[3], double *weights) VTK_OVERRIDE;
+ int& subId, double pcoords[3], double *weights) override;
vtkIdType FindCell(double x[3], vtkCell *cell, vtkGenericCell *gencell,
vtkIdType cellId, double tol2, int& subId,
- double pcoords[3], double *weights) VTK_OVERRIDE;
+ double pcoords[3], double *weights) override;
vtkCell *FindAndGetCell(double x[3], vtkCell *cell, vtkIdType cellId,
double tol2, int& subId, double pcoords[3],
- double *weights) VTK_OVERRIDE;
- int GetCellType(vtkIdType cellId) VTK_OVERRIDE;
- void GetCellPoints(vtkIdType cellId, vtkIdList *ptIds) VTK_OVERRIDE
+ double *weights) override;
+ int GetCellType(vtkIdType cellId) override;
+ void GetCellPoints(vtkIdType cellId, vtkIdList *ptIds) override
{vtkStructuredData::GetCellPoints(cellId,ptIds,this->DataDescription,
this->Dimensions);}
- void GetPointCells(vtkIdType ptId, vtkIdList *cellIds) VTK_OVERRIDE
+ void GetPointCells(vtkIdType ptId, vtkIdList *cellIds) override
{vtkStructuredData::GetPointCells(ptId,cellIds,this->Dimensions);}
- void ComputeBounds() VTK_OVERRIDE;
- int GetMaxCellSize() VTK_OVERRIDE {return 8;}; //voxel is the largest
+ void ComputeBounds() override;
+ int GetMaxCellSize() override {return 8;}; //voxel is the largest
void GetCellNeighbors(vtkIdType cellId, vtkIdList *ptIds,
- vtkIdList *cellIds) VTK_OVERRIDE;
+ vtkIdList *cellIds) override;
//@}
/**
@@ -200,27 +200,27 @@ public:
* arrays, etc. are not included in the return value). THIS METHOD
* IS THREAD SAFE.
*/
- unsigned long GetActualMemorySize() VTK_OVERRIDE;
+ unsigned long GetActualMemorySize() override;
//@{
/**
* Shallow and Deep copy.
*/
- void ShallowCopy(vtkDataObject *src) VTK_OVERRIDE;
- void DeepCopy(vtkDataObject *src) VTK_OVERRIDE;
+ void ShallowCopy(vtkDataObject *src) override;
+ void DeepCopy(vtkDataObject *src) override;
//@}
/**
* Structured extent. The extent type is a 3D extent
*/
- int GetExtentType() VTK_OVERRIDE { return VTK_3D_EXTENT; };
+ int GetExtentType() override { return VTK_3D_EXTENT; };
/**
* Reallocates and copies to set the Extent to the UpdateExtent.
* This is used internally when the exact extent is requested,
* and the source generated more than the update extent.
*/
- void Crop(const int* updateExtent) VTK_OVERRIDE;
+ void Crop(const int* updateExtent) override;
//@{
/**
@@ -232,7 +232,7 @@ public:
protected:
vtkRectilinearGrid();
- ~vtkRectilinearGrid() VTK_OVERRIDE;
+ ~vtkRectilinearGrid() override;
// for the GetCell method
vtkVertex *Vertex;
diff --git a/Common/DataModel/vtkReebGraph.h b/Common/DataModel/vtkReebGraph.h
index c21c24b255c4f21c4f7d935da1179523e43b0a8e..66a5072dd782ed00ba10763fe4b914009e66b182 100644
--- a/Common/DataModel/vtkReebGraph.h
+++ b/Common/DataModel/vtkReebGraph.h
@@ -136,7 +136,7 @@ public:
static vtkReebGraph *New();
vtkTypeMacro(vtkReebGraph, vtkMutableDirectedGraph);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
void PrintNodeData(ostream& os, vtkIndent indent);
/**
@@ -145,7 +145,7 @@ public:
* VTK_RECTILINEAR_GRID (see vtkSetGet.h for definitions).
* THIS METHOD IS THREAD SAFE
*/
- int GetDataObjectType() VTK_OVERRIDE {return VTK_REEB_GRAPH;}
+ int GetDataObjectType() override {return VTK_REEB_GRAPH;}
enum
@@ -306,7 +306,7 @@ public:
// Descrition:
// Implements deep copy
- void DeepCopy(vtkDataObject *src) VTK_OVERRIDE;
+ void DeepCopy(vtkDataObject *src) override;
/**
* Simplify the Reeb graph given a threshold 'simplificationThreshold'
@@ -361,7 +361,7 @@ public:
protected:
vtkReebGraph();
- ~vtkReebGraph() VTK_OVERRIDE;
+ ~vtkReebGraph() override;
class Implementation;
Implementation* Storage;
diff --git a/Common/DataModel/vtkReebGraphSimplificationMetric.h b/Common/DataModel/vtkReebGraphSimplificationMetric.h
index 21b747093bb08a88609dc6f6f266687c07def6dc..2acaabda0f0224baad30132cd52d53383860c094 100644
--- a/Common/DataModel/vtkReebGraphSimplificationMetric.h
+++ b/Common/DataModel/vtkReebGraphSimplificationMetric.h
@@ -59,7 +59,7 @@ class VTKCOMMONDATAMODEL_EXPORT vtkReebGraphSimplificationMetric :
public:
static vtkReebGraphSimplificationMetric* New();
vtkTypeMacro(vtkReebGraphSimplificationMetric, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -96,7 +96,7 @@ public:
protected:
vtkReebGraphSimplificationMetric();
- ~vtkReebGraphSimplificationMetric() VTK_OVERRIDE;
+ ~vtkReebGraphSimplificationMetric() override;
double LowerBound, UpperBound;
diff --git a/Common/DataModel/vtkSelection.h b/Common/DataModel/vtkSelection.h
index 93758cfc96b222951b61386addac42220ac2f271..1d7cf9e4520dc8475e5d0cbf07835f7aaea52e00 100644
--- a/Common/DataModel/vtkSelection.h
+++ b/Common/DataModel/vtkSelection.h
@@ -38,18 +38,18 @@ class VTKCOMMONDATAMODEL_EXPORT vtkSelection : public vtkDataObject
{
public:
vtkTypeMacro(vtkSelection,vtkDataObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkSelection* New();
/**
* Restore data object to initial state,
*/
- void Initialize() VTK_OVERRIDE;
+ void Initialize() override;
/**
* Returns VTK_SELECTION enumeration value.
*/
- int GetDataObjectType() VTK_OVERRIDE {return VTK_SELECTION;}
+ int GetDataObjectType() override {return VTK_SELECTION;}
/**
* Returns the number of nodes in this selection.
@@ -80,14 +80,14 @@ public:
/**
* Copy selection nodes of the input.
*/
- void DeepCopy(vtkDataObject* src) VTK_OVERRIDE;
+ void DeepCopy(vtkDataObject* src) override;
/**
* Copy selection nodes of the input.
* This is a shallow copy: selection lists and pointers in the
* properties are passed by reference.
*/
- void ShallowCopy(vtkDataObject* src) VTK_OVERRIDE;
+ void ShallowCopy(vtkDataObject* src) override;
/**
* Union this selection with the specified selection.
@@ -118,7 +118,7 @@ public:
/**
* Return the MTime taking into account changes to the properties
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
/**
* Dumps the contents of the selection, giving basic information only.
@@ -137,7 +137,7 @@ public:
protected:
vtkSelection();
- ~vtkSelection() VTK_OVERRIDE;
+ ~vtkSelection() override;
private:
vtkSelection(const vtkSelection&) VTK_DELETE_FUNCTION;
diff --git a/Common/DataModel/vtkSelectionNode.h b/Common/DataModel/vtkSelectionNode.h
index 96ad07c73a7de1bb1a5357de02c46f6eff2661cd..9b4a31362b25c4d072e684dc24075f10fb56ec0d 100644
--- a/Common/DataModel/vtkSelectionNode.h
+++ b/Common/DataModel/vtkSelectionNode.h
@@ -62,7 +62,7 @@ class VTKCOMMONDATAMODEL_EXPORT vtkSelectionNode : public vtkObject
{
public:
vtkTypeMacro(vtkSelectionNode,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkSelectionNode* New();
/**
@@ -108,7 +108,7 @@ public:
/**
* Return the MTime taking into account changes to the properties
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
// vtkSelectionNode specific keys follow:
/**
@@ -291,7 +291,7 @@ public:
protected:
vtkSelectionNode();
- ~vtkSelectionNode() VTK_OVERRIDE;
+ ~vtkSelectionNode() override;
vtkInformation* Properties;
vtkDataSetAttributes* SelectionData;
diff --git a/Common/DataModel/vtkSimpleCellTessellator.h b/Common/DataModel/vtkSimpleCellTessellator.h
index 6b5826bae4db6924d58c10efd668cf9ec7532946..22416fdaa0c1c578cd8dc5de0ea36aa844742b5d 100644
--- a/Common/DataModel/vtkSimpleCellTessellator.h
+++ b/Common/DataModel/vtkSimpleCellTessellator.h
@@ -70,7 +70,7 @@ class VTKCOMMONDATAMODEL_EXPORT vtkSimpleCellTessellator : public vtkGenericCell
public:
static vtkSimpleCellTessellator *New();
vtkTypeMacro(vtkSimpleCellTessellator,vtkGenericCellTessellator);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -97,7 +97,7 @@ public:
vtkIdType index,
vtkDoubleArray *points,
vtkCellArray *cellArray,
- vtkPointData *internalPd) VTK_OVERRIDE;
+ vtkPointData *internalPd) override;
/**
* Tessellate a 3D `cell'. The result is a set of smaller linear
@@ -113,7 +113,7 @@ public:
vtkGenericAttributeCollection *att,
vtkDoubleArray *points,
vtkCellArray *cellArray,
- vtkPointData *internalPd ) VTK_OVERRIDE;
+ vtkPointData *internalPd ) override;
/**
* Triangulate a 2D `cell'. The result is a set of smaller linear triangles
@@ -129,7 +129,7 @@ public:
vtkGenericAttributeCollection *att,
vtkDoubleArray *points,
vtkCellArray *cellArray,
- vtkPointData *internalPd) VTK_OVERRIDE;
+ vtkPointData *internalPd) override;
/**
* Reset the output for repeated use of this class.
@@ -140,7 +140,7 @@ public:
/**
* Initialize the tessellator with a data set `ds'.
*/
- void Initialize(vtkGenericDataSet *ds) VTK_OVERRIDE;
+ void Initialize(vtkGenericDataSet *ds) override;
/**
* Return the number of fixed subdivisions. It is used to prevent from
@@ -204,7 +204,7 @@ public:
protected:
vtkSimpleCellTessellator();
- ~vtkSimpleCellTessellator() VTK_OVERRIDE;
+ ~vtkSimpleCellTessellator() override;
/**
* Extract point `pointId' from the edge table to the output point and output
diff --git a/Common/DataModel/vtkSmoothErrorMetric.h b/Common/DataModel/vtkSmoothErrorMetric.h
index f327b05f87bb6b144a5ebfe4c1ebb0dee5e18cac..a8f6c562ff56d0788114dd2e2e22f8d4c6dbf187 100644
--- a/Common/DataModel/vtkSmoothErrorMetric.h
+++ b/Common/DataModel/vtkSmoothErrorMetric.h
@@ -50,7 +50,7 @@ public:
* Standard VTK type and error macros.
*/
vtkTypeMacro(vtkSmoothErrorMetric,vtkGenericSubdivisionErrorMetric);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
@@ -86,7 +86,7 @@ public:
* =GetAttributeCollection()->GetNumberOfPointCenteredComponents()+6
*/
int RequiresEdgeSubdivision(double *leftPoint, double *midPoint,
- double *rightPoint, double alpha) VTK_OVERRIDE;
+ double *rightPoint, double alpha) override;
/**
* Return the error at the mid-point. It will return an error relative to
@@ -102,11 +102,11 @@ public:
* \post positive_result: result>=0
*/
double GetError(double *leftPoint, double *midPoint, double *rightPoint,
- double alpha) VTK_OVERRIDE;
+ double alpha) override;
protected:
vtkSmoothErrorMetric();
- ~vtkSmoothErrorMetric() VTK_OVERRIDE;
+ ~vtkSmoothErrorMetric() override;
double AngleTolerance;
double CosTolerance;
diff --git a/Common/DataModel/vtkSortFieldData.h b/Common/DataModel/vtkSortFieldData.h
index eea10de08b861c7c4292ff1f80ef22a878f3e901..16396531443693ef0e6b621bf4576d68389b5535 100644
--- a/Common/DataModel/vtkSortFieldData.h
+++ b/Common/DataModel/vtkSortFieldData.h
@@ -60,7 +60,7 @@ public:
*/
static vtkSortFieldData *New();
vtkTypeMacro(vtkSortFieldData, vtkSortDataArray);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
@@ -107,7 +107,7 @@ public:
protected:
vtkSortFieldData();
- ~vtkSortFieldData() VTK_OVERRIDE;
+ ~vtkSortFieldData() override;
private:
vtkSortFieldData(const vtkSortFieldData &) VTK_DELETE_FUNCTION;
diff --git a/Common/DataModel/vtkSphere.h b/Common/DataModel/vtkSphere.h
index 8a177dd9e156bbd19d03d3ea0007921adf3416cd..1d77c56b2c829f3901f4dcf8957b12e67caa9a29 100644
--- a/Common/DataModel/vtkSphere.h
+++ b/Common/DataModel/vtkSphere.h
@@ -32,7 +32,7 @@ class VTKCOMMONDATAMODEL_EXPORT vtkSphere : public vtkImplicitFunction
{
public:
vtkTypeMacro(vtkSphere,vtkImplicitFunction);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct sphere with center at (0,0,0) and radius=0.5.
@@ -44,13 +44,13 @@ public:
* Evaluate sphere equation ((x-x0)^2 + (y-y0)^2 + (z-z0)^2) - R^2.
*/
using vtkImplicitFunction::EvaluateFunction;
- double EvaluateFunction(double x[3]) VTK_OVERRIDE;
+ double EvaluateFunction(double x[3]) override;
//@}
/**
* Evaluate sphere gradient.
*/
- void EvaluateGradient(double x[3], double n[3]) VTK_OVERRIDE;
+ void EvaluateGradient(double x[3], double n[3]) override;
//@{
/**
@@ -100,7 +100,7 @@ public:
protected:
vtkSphere();
- ~vtkSphere() VTK_OVERRIDE {}
+ ~vtkSphere() override {}
double Radius;
double Center[3];
diff --git a/Common/DataModel/vtkSpline.h b/Common/DataModel/vtkSpline.h
index e0eef5ef6b06d8e87f2cf89d32b272df39cc4a7e..809eb8e95cc86df6a11af033b6fb5ff17934da2e 100644
--- a/Common/DataModel/vtkSpline.h
+++ b/Common/DataModel/vtkSpline.h
@@ -63,7 +63,7 @@ class VTKCOMMONDATAMODEL_EXPORT vtkSpline : public vtkObject
{
public:
vtkTypeMacro(vtkSpline,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -166,7 +166,7 @@ public:
/**
* Return the MTime also considering the Piecewise function.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
/**
* Deep copy of spline data.
@@ -175,7 +175,7 @@ public:
protected:
vtkSpline();
- ~vtkSpline() VTK_OVERRIDE;
+ ~vtkSpline() override;
vtkMTimeType ComputeTime;
int ClampValue;
diff --git a/Common/DataModel/vtkStaticCellLinks.h b/Common/DataModel/vtkStaticCellLinks.h
index 0c52c7cf8fc6909d128c66447b4d0eca8313b0b8..6e3ddbd7bd5d34ec18aab731899d7acf37af1d9d 100644
--- a/Common/DataModel/vtkStaticCellLinks.h
+++ b/Common/DataModel/vtkStaticCellLinks.h
@@ -61,13 +61,13 @@ public:
*/
static vtkStaticCellLinks *New();
vtkTypeMacro(vtkStaticCellLinks,vtkAbstractCellLinks);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
* Build the link list array. Satisfy the superclass API.
*/
- void BuildLinks(vtkDataSet *ds) VTK_OVERRIDE
+ void BuildLinks(vtkDataSet *ds) override
{this->Impl->BuildLinks(ds);}
/**
@@ -97,7 +97,7 @@ public:
protected:
vtkStaticCellLinks();
- ~vtkStaticCellLinks() VTK_OVERRIDE;
+ ~vtkStaticCellLinks() override;
vtkStaticCellLinksTemplate<vtkIdType> *Impl;
diff --git a/Common/DataModel/vtkStaticCellLocator.h b/Common/DataModel/vtkStaticCellLocator.h
index 9549cc601267701bd55a3da961f3b681a893bbe8..c5d13807c603a865749c93b2c967569d1d85928c 100644
--- a/Common/DataModel/vtkStaticCellLocator.h
+++ b/Common/DataModel/vtkStaticCellLocator.h
@@ -60,7 +60,7 @@ public:
*/
static vtkStaticCellLocator *New();
vtkTypeMacro(vtkStaticCellLocator,vtkAbstractCellLocator);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -79,12 +79,12 @@ public:
* or -1 if not.
*/
vtkIdType FindCell(double pos[3], double vtkNotUsed, vtkGenericCell *cell,
- double pcoords[3], double* weights ) VTK_OVERRIDE;
+ double pcoords[3], double* weights ) override;
/**
* Reimplemented from vtkAbstractCellLocator to support bad compilers.
*/
- vtkIdType FindCell(double x[3]) VTK_OVERRIDE
+ vtkIdType FindCell(double x[3]) override
{ return this->Superclass::FindCell(x); }
/**
@@ -92,7 +92,7 @@ public:
* user must provide the vtkIdList to populate. This method returns data
* only after the locator has been built.
*/
- void FindCellsWithinBounds(double *bbox, vtkIdList *cells) VTK_OVERRIDE;
+ void FindCellsWithinBounds(double *bbox, vtkIdList *cells) override;
/**
* Return intersection point (if any) AND the cell which was intersected by
@@ -101,13 +101,13 @@ public:
int IntersectWithLine(double a0[3], double a1[3], double tol,
double& t, double x[3], double pcoords[3],
int &subId, vtkIdType &cellId,
- vtkGenericCell *cell) VTK_OVERRIDE;
+ vtkGenericCell *cell) override;
/**
* Reimplemented from vtkAbstractCellLocator to support bad compilers.
*/
int IntersectWithLine(double p1[3], double p2[3], double tol,
- double& t, double x[3], double pcoords[3], int &subId) VTK_OVERRIDE
+ double& t, double x[3], double pcoords[3], int &subId) override
{
return this->Superclass::IntersectWithLine(p1, p2, tol, t, x, pcoords, subId);
}
@@ -117,7 +117,7 @@ public:
*/
int IntersectWithLine(double p1[3], double p2[3], double tol,
double &t, double x[3], double pcoords[3],
- int &subId, vtkIdType &cellId) VTK_OVERRIDE
+ int &subId, vtkIdType &cellId) override
{
return this->Superclass::IntersectWithLine(p1, p2, tol, t, x, pcoords, subId, cellId);
}
@@ -126,7 +126,7 @@ public:
* Reimplemented from vtkAbstractCellLocator to support bad compilers.
*/
int IntersectWithLine(const double p1[3], const double p2[3],
- vtkPoints *points, vtkIdList *cellIds) VTK_OVERRIDE
+ vtkPoints *points, vtkIdList *cellIds) override
{
return this->Superclass::IntersectWithLine(p1, p2, points, cellIds);
}
@@ -135,9 +135,9 @@ public:
/**
* Satisfy vtkLocator abstract interface.
*/
- void GenerateRepresentation(int level, vtkPolyData *pd) VTK_OVERRIDE;
- void FreeSearchStructure() VTK_OVERRIDE;
- void BuildLocator() VTK_OVERRIDE;
+ void GenerateRepresentation(int level, vtkPolyData *pd) override;
+ void FreeSearchStructure() override;
+ void BuildLocator() override;
//@}
//@{
@@ -170,7 +170,7 @@ public:
protected:
vtkStaticCellLocator();
- ~vtkStaticCellLocator() VTK_OVERRIDE;
+ ~vtkStaticCellLocator() override;
double Bounds[6]; // Bounding box of the whole dataset
int Divisions[3]; // Number of sub-divisions in x-y-z directions
diff --git a/Common/DataModel/vtkStaticPointLocator.cxx b/Common/DataModel/vtkStaticPointLocator.cxx
index 70441e1528fc17b8a5ca2b290390b4ee4f645d65..132c0b59869ece5e099cd3c4043be86071b93a18 100644
--- a/Common/DataModel/vtkStaticPointLocator.cxx
+++ b/Common/DataModel/vtkStaticPointLocator.cxx
@@ -445,7 +445,7 @@ public:
}
// Release allocated memory
- ~BucketList() VTK_OVERRIDE
+ ~BucketList() override
{
delete [] this->Map;
delete [] this->Offsets;
@@ -614,7 +614,7 @@ public:
};
// Build the map and other structures to support locator operations
- void BuildLocator() VTK_OVERRIDE
+ void BuildLocator() override
{
// Place each point in a bucket
//
diff --git a/Common/DataModel/vtkStaticPointLocator.h b/Common/DataModel/vtkStaticPointLocator.h
index 9d42ceac5bec7069eb553f9b24721ff30994b99c..ad0feca126f984a5e3cc79174fc0cbdac5e64589 100644
--- a/Common/DataModel/vtkStaticPointLocator.h
+++ b/Common/DataModel/vtkStaticPointLocator.h
@@ -72,7 +72,7 @@ public:
* Standard type and print methods.
*/
vtkTypeMacro(vtkStaticPointLocator,vtkAbstractPointLocator);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -108,7 +108,7 @@ public:
* values. These methods are thread safe if BuildLocator() is directly or
* indirectly called from a single thread first.
*/
- vtkIdType FindClosestPoint(const double x[3]) VTK_OVERRIDE;
+ vtkIdType FindClosestPoint(const double x[3]) override;
//@{
/**
@@ -120,7 +120,7 @@ public:
* function in which order the points are processed (i.e., indeterminate).
*/
vtkIdType FindClosestPointWithinRadius(
- double radius, const double x[3], double& dist2) VTK_OVERRIDE;
+ double radius, const double x[3], double& dist2) override;
virtual vtkIdType FindClosestPointWithinRadius(double radius, const double x[3],
double inputDataLength,
double& dist2);
@@ -134,7 +134,7 @@ public:
* thread safe if BuildLocator() is directly or indirectly called from a
* single thread first.
*/
- void FindClosestNPoints(int N, const double x[3], vtkIdList *result) VTK_OVERRIDE;
+ void FindClosestNPoints(int N, const double x[3], vtkIdList *result) override;
/**
* Find all points within a specified radius R of position x.
@@ -143,16 +143,16 @@ public:
* indirectly called from a single thread first.
*/
void FindPointsWithinRadius(double R, const double x[3],
- vtkIdList *result) VTK_OVERRIDE;
+ vtkIdList *result) override;
//@{
/**
* See vtkLocator and vtkAbstractPointLocator interface documentation.
* These methods are not thread safe.
*/
- void Initialize() VTK_OVERRIDE;
- void FreeSearchStructure() VTK_OVERRIDE;
- void BuildLocator() VTK_OVERRIDE;
+ void Initialize() override;
+ void FreeSearchStructure() override;
+ void BuildLocator() override;
//@}
/**
@@ -160,7 +160,7 @@ public:
* Note that the level parameter has no effect on this method as there is no
* hierarchy built (i.e., uniform binning). Typically this is used for debugging.
*/
- void GenerateRepresentation(int level, vtkPolyData *pd) VTK_OVERRIDE;
+ void GenerateRepresentation(int level, vtkPolyData *pd) override;
/**
* Given a bucket number bNum between 0 <= bNum < this->GetNumberOfBuckets(),
@@ -205,7 +205,7 @@ public:
protected:
vtkStaticPointLocator();
- ~vtkStaticPointLocator() VTK_OVERRIDE;
+ ~vtkStaticPointLocator() override;
int NumberOfPointsPerBucket; // Used with AutomaticOn to control subdivide
int Divisions[3]; // Number of sub-divisions in x-y-z directions
diff --git a/Common/DataModel/vtkStructuredData.h b/Common/DataModel/vtkStructuredData.h
index 30dc9650cc138094345de77f6bf8026a9377ca72..7bfda4bb109d32da656a2b51706b81cf0a0f2254 100644
--- a/Common/DataModel/vtkStructuredData.h
+++ b/Common/DataModel/vtkStructuredData.h
@@ -235,7 +235,7 @@ public:
protected:
vtkStructuredData() {}
- ~vtkStructuredData() VTK_OVERRIDE {}
+ ~vtkStructuredData() override {}
/**
* Computes the linear index for the given i-j-k structured of a grid with
diff --git a/Common/DataModel/vtkStructuredExtent.h b/Common/DataModel/vtkStructuredExtent.h
index 14c5c7f76acd6b29bb9eee82669300c35e8c41eb..9658277a45032606cfee7a6d6d93482dfdb146f6 100644
--- a/Common/DataModel/vtkStructuredExtent.h
+++ b/Common/DataModel/vtkStructuredExtent.h
@@ -34,7 +34,7 @@ class VTKCOMMONDATAMODEL_EXPORT vtkStructuredExtent : public vtkObject
public:
static vtkStructuredExtent* New();
vtkTypeMacro(vtkStructuredExtent, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Clamps \c ext to fit in \c wholeExt.
@@ -77,7 +77,7 @@ public:
protected:
vtkStructuredExtent();
- ~vtkStructuredExtent() VTK_OVERRIDE;
+ ~vtkStructuredExtent() override;
private:
vtkStructuredExtent(const vtkStructuredExtent&) VTK_DELETE_FUNCTION;
diff --git a/Common/DataModel/vtkStructuredGrid.h b/Common/DataModel/vtkStructuredGrid.h
index fbc688d53e9752be6bf0b7ea363ded7f2e1ccdf3..1f3658f6791a7b1eadaa028539c10b56142f6758 100644
--- a/Common/DataModel/vtkStructuredGrid.h
+++ b/Common/DataModel/vtkStructuredGrid.h
@@ -60,43 +60,43 @@ public:
static vtkStructuredGrid *New();
vtkTypeMacro(vtkStructuredGrid,vtkPointSet);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Return what type of dataset this is.
*/
- int GetDataObjectType() VTK_OVERRIDE {return VTK_STRUCTURED_GRID;}
+ int GetDataObjectType() override {return VTK_STRUCTURED_GRID;}
/**
* Copy the geometric and topological structure of an input poly data object.
*/
- void CopyStructure(vtkDataSet *ds) VTK_OVERRIDE;
+ void CopyStructure(vtkDataSet *ds) override;
//@{
/**
* Standard vtkDataSet API methods. See vtkDataSet for more information.
*/
- vtkIdType GetNumberOfPoints() VTK_OVERRIDE
+ vtkIdType GetNumberOfPoints() override
{return vtkPointSet::GetNumberOfPoints();}
- double *GetPoint(vtkIdType ptId) VTK_OVERRIDE
+ double *GetPoint(vtkIdType ptId) override
{return this->vtkPointSet::GetPoint(ptId);}
- void GetPoint(vtkIdType ptId, double p[3]) VTK_OVERRIDE
+ void GetPoint(vtkIdType ptId, double p[3]) override
{this->vtkPointSet::GetPoint(ptId,p);}
- vtkCell *GetCell(vtkIdType cellId) VTK_OVERRIDE;
- vtkCell *GetCell(int i, int j, int k) VTK_OVERRIDE;
- void GetCell(vtkIdType cellId, vtkGenericCell *cell) VTK_OVERRIDE;
- void GetCellBounds(vtkIdType cellId, double bounds[6]) VTK_OVERRIDE;
- int GetCellType(vtkIdType cellId) VTK_OVERRIDE;
- vtkIdType GetNumberOfCells() VTK_OVERRIDE;
- void GetCellPoints(vtkIdType cellId, vtkIdList *ptIds) VTK_OVERRIDE;
- void GetPointCells(vtkIdType ptId, vtkIdList *cellIds) VTK_OVERRIDE
+ vtkCell *GetCell(vtkIdType cellId) override;
+ vtkCell *GetCell(int i, int j, int k) override;
+ void GetCell(vtkIdType cellId, vtkGenericCell *cell) override;
+ void GetCellBounds(vtkIdType cellId, double bounds[6]) override;
+ int GetCellType(vtkIdType cellId) override;
+ vtkIdType GetNumberOfCells() override;
+ void GetCellPoints(vtkIdType cellId, vtkIdList *ptIds) override;
+ void GetPointCells(vtkIdType ptId, vtkIdList *cellIds) override
{
vtkStructuredData::GetPointCells(ptId,cellIds,this->GetDimensions());
}
- void Initialize() VTK_OVERRIDE;
- int GetMaxCellSize() VTK_OVERRIDE {return 8;}; //hexahedron is the largest
+ void Initialize() override;
+ int GetMaxCellSize() override {return 8;}; //hexahedron is the largest
void GetCellNeighbors(vtkIdType cellId, vtkIdList *ptIds,
- vtkIdList *cellIds) VTK_OVERRIDE;
+ vtkIdList *cellIds) override;
void GetCellNeighbors(vtkIdType cellId, vtkIdList *ptIds,
vtkIdList *cellIds, int *seedLoc);
//@}
@@ -141,20 +141,20 @@ public:
* arrays, etc. are not included in the return value). THIS METHOD
* IS THREAD SAFE.
*/
- unsigned long GetActualMemorySize() VTK_OVERRIDE;
+ unsigned long GetActualMemorySize() override;
//@{
/**
* Shallow and Deep copy.
*/
- void ShallowCopy(vtkDataObject *src) VTK_OVERRIDE;
- void DeepCopy(vtkDataObject *src) VTK_OVERRIDE;
+ void ShallowCopy(vtkDataObject *src) override;
+ void DeepCopy(vtkDataObject *src) override;
//@}
/**
* The extent type is a 3D extent
*/
- int GetExtentType() VTK_OVERRIDE { return VTK_3D_EXTENT; }
+ int GetExtentType() override { return VTK_3D_EXTENT; }
//@{
/**
@@ -196,12 +196,12 @@ public:
* Returns 1 if there is any visibility constraint on the points,
* 0 otherwise.
*/
- bool HasAnyBlankPoints() VTK_OVERRIDE;
+ bool HasAnyBlankPoints() override;
/**
* Returns 1 if there is any visibility constraint on the cells,
* 0 otherwise.
*/
- bool HasAnyBlankCells() VTK_OVERRIDE;
+ bool HasAnyBlankCells() override;
/**
* Given the node dimensions of this grid instance, this method computes the
@@ -216,7 +216,7 @@ public:
* This is used internally when the exact extent is requested,
* and the source generated more than the update extent.
*/
- void Crop(const int* updateExtent) VTK_OVERRIDE;
+ void Crop(const int* updateExtent) override;
//@{
/**
@@ -239,7 +239,7 @@ public:
protected:
vtkStructuredGrid();
- ~vtkStructuredGrid() VTK_OVERRIDE;
+ ~vtkStructuredGrid() override;
// for the GetCell method
vtkVertex *Vertex;
@@ -257,7 +257,7 @@ protected:
* Compute the range of the scalars and cache it into ScalarRange
* only if the cache became invalid (ScalarRangeComputeTime).
*/
- void ComputeScalarRange() VTK_OVERRIDE;
+ void ComputeScalarRange() override;
private:
/**
diff --git a/Common/DataModel/vtkStructuredPoints.h b/Common/DataModel/vtkStructuredPoints.h
index 307994521c1b486016b4fbbfa387db248f3b9e5e..7483e19bb4fd2a8d26248c2b33a504749500c056 100644
--- a/Common/DataModel/vtkStructuredPoints.h
+++ b/Common/DataModel/vtkStructuredPoints.h
@@ -42,11 +42,11 @@ public:
/**
* To simplify filter superclasses,
*/
- int GetDataObjectType() VTK_OVERRIDE {return VTK_STRUCTURED_POINTS;}
+ int GetDataObjectType() override {return VTK_STRUCTURED_POINTS;}
protected:
vtkStructuredPoints();
- ~vtkStructuredPoints() VTK_OVERRIDE {}
+ ~vtkStructuredPoints() override {}
private:
vtkStructuredPoints(const vtkStructuredPoints&) VTK_DELETE_FUNCTION;
void operator=(const vtkStructuredPoints&) VTK_DELETE_FUNCTION;
diff --git a/Common/DataModel/vtkStructuredPointsCollection.h b/Common/DataModel/vtkStructuredPointsCollection.h
index 44e948682f81326b62ad90391cdd51c02bd23e60..ec1ad777a85ad6c56d3127b42041f13a548b2237 100644
--- a/Common/DataModel/vtkStructuredPointsCollection.h
+++ b/Common/DataModel/vtkStructuredPointsCollection.h
@@ -33,7 +33,7 @@ class VTKCOMMONDATAMODEL_EXPORT vtkStructuredPointsCollection : public vtkCollec
public:
static vtkStructuredPointsCollection *New();
vtkTypeMacro(vtkStructuredPointsCollection,vtkCollection);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Add a pointer to a vtkStructuredPoints to the bottom of the list.
@@ -61,7 +61,7 @@ public:
protected:
vtkStructuredPointsCollection() {}
- ~vtkStructuredPointsCollection() VTK_OVERRIDE {}
+ ~vtkStructuredPointsCollection() override {}
diff --git a/Common/DataModel/vtkSuperquadric.h b/Common/DataModel/vtkSuperquadric.h
index 92fc1af2f7b7bbb7dcf29c5b01a8d640bd1e9be6..a2a2d1428062ef57f9ce5f0b88eb0cc4db96394b 100644
--- a/Common/DataModel/vtkSuperquadric.h
+++ b/Common/DataModel/vtkSuperquadric.h
@@ -57,12 +57,12 @@ public:
static vtkSuperquadric *New();
vtkTypeMacro(vtkSuperquadric,vtkImplicitFunction);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
// ImplicitFunction interface
using vtkImplicitFunction::EvaluateFunction;
- double EvaluateFunction(double x[3]) VTK_OVERRIDE;
- void EvaluateGradient(double x[3], double g[3]) VTK_OVERRIDE;
+ double EvaluateFunction(double x[3]) override;
+ void EvaluateGradient(double x[3], double g[3]) override;
//@{
/**
@@ -126,7 +126,7 @@ public:
protected:
vtkSuperquadric();
- ~vtkSuperquadric() VTK_OVERRIDE {}
+ ~vtkSuperquadric() override {}
int Toroidal;
double Thickness;
diff --git a/Common/DataModel/vtkTable.h b/Common/DataModel/vtkTable.h
index d3360385222b34fa7d0015f89ee3d5d24c790fa0..c8df79497d0546436a54400bdc6cf141628495ce 100644
--- a/Common/DataModel/vtkTable.h
+++ b/Common/DataModel/vtkTable.h
@@ -64,7 +64,7 @@ class VTKCOMMONDATAMODEL_EXPORT vtkTable : public vtkDataObject
public:
static vtkTable* New();
vtkTypeMacro(vtkTable, vtkDataObject);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
/**
* Dump table contents. If rowLimit is -1 then the full table
@@ -77,7 +77,7 @@ public:
/**
* Return what type of dataset this is.
*/
- int GetDataObjectType() VTK_OVERRIDE {return VTK_TABLE;}
+ int GetDataObjectType() override {return VTK_TABLE;}
/**
* Return the actual size of the data in kibibytes (1024 bytes). This number
@@ -86,7 +86,7 @@ public:
* memory required to represent the data (e.g., extra space in
* arrays, etc. are not included in the return value).
*/
- unsigned long GetActualMemorySize() VTK_OVERRIDE;
+ unsigned long GetActualMemorySize() override;
//@{
/**
@@ -210,7 +210,7 @@ public:
/**
* Initialize to an empty table.
*/
- void Initialize() VTK_OVERRIDE;
+ void Initialize() override;
//@{
/**
@@ -224,8 +224,8 @@ public:
/**
* Shallow/deep copy the data from src into this object.
*/
- void ShallowCopy(vtkDataObject* src) VTK_OVERRIDE;
- void DeepCopy(vtkDataObject* src) VTK_OVERRIDE;
+ void ShallowCopy(vtkDataObject* src) override;
+ void DeepCopy(vtkDataObject* src) override;
//@}
/**
@@ -234,16 +234,16 @@ public:
* in addition to the case of FIELD, which will return the field data
* for any vtkDataObject subclass.
*/
- vtkFieldData* GetAttributesAsFieldData(int type) VTK_OVERRIDE;
+ vtkFieldData* GetAttributesAsFieldData(int type) override;
/**
* Get the number of elements for a specific attribute type (ROW, etc.).
*/
- vtkIdType GetNumberOfElements(int type) VTK_OVERRIDE;
+ vtkIdType GetNumberOfElements(int type) override;
protected:
vtkTable();
- ~vtkTable() VTK_OVERRIDE;
+ ~vtkTable() override;
/**
* Holds the column data of the table.
diff --git a/Common/DataModel/vtkTetra.h b/Common/DataModel/vtkTetra.h
index 3112bc3521f803a045de483eada9380357832e14..4923dbb9d42fa2e61b00b02780758ce4945448f6 100644
--- a/Common/DataModel/vtkTetra.h
+++ b/Common/DataModel/vtkTetra.h
@@ -43,46 +43,46 @@ class VTKCOMMONDATAMODEL_EXPORT vtkTetra : public vtkCell3D
public:
static vtkTetra *New();
vtkTypeMacro(vtkTetra,vtkCell3D);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
* See vtkCell3D API for description of these methods.
*/
- void GetEdgePoints(int edgeId, int* &pts) VTK_OVERRIDE;
- void GetFacePoints(int faceId, int* &pts) VTK_OVERRIDE;
+ void GetEdgePoints(int edgeId, int* &pts) override;
+ void GetFacePoints(int faceId, int* &pts) override;
//@}
//@{
/**
* See the vtkCell API for descriptions of these methods.
*/
- int GetCellType() VTK_OVERRIDE {return VTK_TETRA;}
- int GetNumberOfEdges() VTK_OVERRIDE {return 6;}
- int GetNumberOfFaces() VTK_OVERRIDE {return 4;}
- vtkCell *GetEdge(int edgeId) VTK_OVERRIDE;
- vtkCell *GetFace(int faceId) VTK_OVERRIDE;
+ int GetCellType() override {return VTK_TETRA;}
+ int GetNumberOfEdges() override {return 6;}
+ int GetNumberOfFaces() override {return 4;}
+ vtkCell *GetEdge(int edgeId) override;
+ vtkCell *GetFace(int faceId) override;
void Contour(double value, vtkDataArray *cellScalars,
vtkIncrementalPointLocator *locator, vtkCellArray *verts,
vtkCellArray *lines, vtkCellArray *polys,
vtkPointData *inPd, vtkPointData *outPd,
- vtkCellData *inCd, vtkIdType cellId, vtkCellData *outCd) VTK_OVERRIDE;
+ vtkCellData *inCd, vtkIdType cellId, vtkCellData *outCd) override;
void Clip(double value, vtkDataArray *cellScalars,
vtkIncrementalPointLocator *locator, vtkCellArray *connectivity,
vtkPointData *inPd, vtkPointData *outPd,
vtkCellData *inCd, vtkIdType cellId, vtkCellData *outCd,
- int insideOut) VTK_OVERRIDE;
+ int insideOut) override;
int EvaluatePosition(double x[3], double* closestPoint,
int& subId, double pcoords[3],
- double& dist2, double *weights) VTK_OVERRIDE;
+ double& dist2, double *weights) override;
void EvaluateLocation(int& subId, double pcoords[3], double x[3],
- double *weights) VTK_OVERRIDE;
+ double *weights) override;
int IntersectWithLine(double p1[3], double p2[3], double tol, double& t,
- double x[3], double pcoords[3], int& subId) VTK_OVERRIDE;
- int Triangulate(int index, vtkIdList *ptIds, vtkPoints *pts) VTK_OVERRIDE;
+ double x[3], double pcoords[3], int& subId) override;
+ int Triangulate(int index, vtkIdList *ptIds, vtkPoints *pts) override;
void Derivatives(int subId, double pcoords[3], double *values,
- int dim, double *derivs) VTK_OVERRIDE;
- double *GetParametricCoords() VTK_OVERRIDE;
+ int dim, double *derivs) override;
+ double *GetParametricCoords() override;
//@}
/**
@@ -90,18 +90,18 @@ public:
* are closest parametrically to the point specified. This may include faces,
* edges, or vertices.
*/
- int CellBoundary(int subId, double pcoords[3], vtkIdList *pts) VTK_OVERRIDE;
+ int CellBoundary(int subId, double pcoords[3], vtkIdList *pts) override;
/**
* Return the center of the tetrahedron in parametric coordinates.
*/
- int GetParametricCenter(double pcoords[3]) VTK_OVERRIDE;
+ int GetParametricCenter(double pcoords[3]) override;
/**
* Return the distance of the parametric coordinate provided to the
* cell. If inside the cell, a distance of zero is returned.
*/
- double GetParametricDistance(double pcoords[3]) VTK_OVERRIDE;
+ double GetParametricDistance(double pcoords[3]) override;
/**
* Compute the center of the tetrahedron,
@@ -167,11 +167,11 @@ public:
* Compute the interpolation functions/derivatives
* (aka shape functions/derivatives)
*/
- void InterpolateFunctions(double pcoords[3], double weights[4]) VTK_OVERRIDE
+ void InterpolateFunctions(double pcoords[3], double weights[4]) override
{
vtkTetra::InterpolationFunctions(pcoords,weights);
}
- void InterpolateDerivs(double pcoords[3], double derivs[12]) VTK_OVERRIDE
+ void InterpolateDerivs(double pcoords[3], double derivs[12]) override
{
vtkTetra::InterpolationDerivs(pcoords,derivs);
}
@@ -188,7 +188,7 @@ public:
protected:
vtkTetra();
- ~vtkTetra() VTK_OVERRIDE;
+ ~vtkTetra() override;
vtkLine *Line;
vtkTriangle *Triangle;
diff --git a/Common/DataModel/vtkTree.h b/Common/DataModel/vtkTree.h
index c4e2eca279dd4da05422786392cd3252f1c44158..3ef3a7f2d1b4ddac1b1e0b2a74f3f2a4dc378d1a 100644
--- a/Common/DataModel/vtkTree.h
+++ b/Common/DataModel/vtkTree.h
@@ -56,12 +56,12 @@ class VTKCOMMONDATAMODEL_EXPORT vtkTree : public vtkDirectedAcyclicGraph
public:
static vtkTree *New();
vtkTypeMacro(vtkTree, vtkDirectedAcyclicGraph);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Return what type of dataset this is.
*/
- int GetDataObjectType() VTK_OVERRIDE {return VTK_TREE;}
+ int GetDataObjectType() override {return VTK_TREE;}
//@{
/**
@@ -129,13 +129,13 @@ public:
protected:
vtkTree();
- ~vtkTree() VTK_OVERRIDE;
+ ~vtkTree() override;
/**
* Check the storage, and accept it if it is a valid
* tree.
*/
- bool IsStructureValid(vtkGraph *g) VTK_OVERRIDE;
+ bool IsStructureValid(vtkGraph *g) override;
/**
* The root of the tree.
diff --git a/Common/DataModel/vtkTreeBFSIterator.h b/Common/DataModel/vtkTreeBFSIterator.h
index e0d30aedad1d034dd00eefed0ca758db40d4ae70..84225be1e14e4501e542910aa80d4035e1b0aaa3 100644
--- a/Common/DataModel/vtkTreeBFSIterator.h
+++ b/Common/DataModel/vtkTreeBFSIterator.h
@@ -42,14 +42,14 @@ class VTKCOMMONDATAMODEL_EXPORT vtkTreeBFSIterator : public vtkTreeIterator
public:
static vtkTreeBFSIterator* New();
vtkTypeMacro(vtkTreeBFSIterator, vtkTreeIterator);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkTreeBFSIterator();
- ~vtkTreeBFSIterator() VTK_OVERRIDE;
+ ~vtkTreeBFSIterator() override;
- void Initialize() VTK_OVERRIDE;
- vtkIdType NextInternal() VTK_OVERRIDE;
+ void Initialize() override;
+ vtkIdType NextInternal() override;
vtkTreeBFSIteratorInternals* Internals;
vtkIntArray* Color;
diff --git a/Common/DataModel/vtkTreeDFSIterator.h b/Common/DataModel/vtkTreeDFSIterator.h
index e8455c5fcb7753ebf58b52876cebe5acac4a662c..6a65c81ac58194bbe065e1fb269764e09c25134a 100644
--- a/Common/DataModel/vtkTreeDFSIterator.h
+++ b/Common/DataModel/vtkTreeDFSIterator.h
@@ -49,7 +49,7 @@ class VTKCOMMONDATAMODEL_EXPORT vtkTreeDFSIterator : public vtkTreeIterator
public:
static vtkTreeDFSIterator* New();
vtkTypeMacro(vtkTreeDFSIterator, vtkTreeIterator);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
enum ModeType
{
@@ -72,10 +72,10 @@ public:
protected:
vtkTreeDFSIterator();
- ~vtkTreeDFSIterator() VTK_OVERRIDE;
+ ~vtkTreeDFSIterator() override;
- void Initialize() VTK_OVERRIDE;
- vtkIdType NextInternal() VTK_OVERRIDE;
+ void Initialize() override;
+ vtkIdType NextInternal() override;
int Mode;
vtkIdType CurRoot;
diff --git a/Common/DataModel/vtkTreeIterator.h b/Common/DataModel/vtkTreeIterator.h
index ab03b2e6e4560f80f29b5b3f8f3a430620222572..4529c170bac6c434664ee4016fb5c84bbd1ea281 100644
--- a/Common/DataModel/vtkTreeIterator.h
+++ b/Common/DataModel/vtkTreeIterator.h
@@ -40,7 +40,7 @@ class VTKCOMMONDATAMODEL_EXPORT vtkTreeIterator : public vtkObject
{
public:
vtkTypeMacro(vtkTreeIterator, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -77,7 +77,7 @@ public:
protected:
vtkTreeIterator();
- ~vtkTreeIterator() VTK_OVERRIDE;
+ ~vtkTreeIterator() override;
virtual void Initialize() = 0;
virtual vtkIdType NextInternal() = 0;
diff --git a/Common/DataModel/vtkTriQuadraticHexahedron.h b/Common/DataModel/vtkTriQuadraticHexahedron.h
index 71c8a84cbfdadb26f93b81631d408d6cd3505230..bd7d2dab7f38a53d42c9597bd9543d5fb820e088 100644
--- a/Common/DataModel/vtkTriQuadraticHexahedron.h
+++ b/Common/DataModel/vtkTriQuadraticHexahedron.h
@@ -84,35 +84,35 @@ class VTKCOMMONDATAMODEL_EXPORT vtkTriQuadraticHexahedron : public vtkNonLinearC
public:
static vtkTriQuadraticHexahedron *New ();
vtkTypeMacro(vtkTriQuadraticHexahedron,vtkNonLinearCell);
- void PrintSelf (ostream & os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf (ostream & os, vtkIndent indent) override;
//@{
/**
* Implement the vtkCell API. See the vtkCell API for descriptions
* of these methods.
*/
- int GetCellType() VTK_OVERRIDE { return VTK_TRIQUADRATIC_HEXAHEDRON; }
- int GetCellDimension() VTK_OVERRIDE { return 3; }
- int GetNumberOfEdges() VTK_OVERRIDE { return 12; }
- int GetNumberOfFaces() VTK_OVERRIDE { return 6; }
- vtkCell *GetEdge (int) VTK_OVERRIDE;
- vtkCell *GetFace (int) VTK_OVERRIDE;
+ int GetCellType() override { return VTK_TRIQUADRATIC_HEXAHEDRON; }
+ int GetCellDimension() override { return 3; }
+ int GetNumberOfEdges() override { return 12; }
+ int GetNumberOfFaces() override { return 6; }
+ vtkCell *GetEdge (int) override;
+ vtkCell *GetFace (int) override;
//@}
- int CellBoundary (int subId, double pcoords[3], vtkIdList * pts) VTK_OVERRIDE;
+ int CellBoundary (int subId, double pcoords[3], vtkIdList * pts) override;
void Contour (double value, vtkDataArray * cellScalars,
vtkIncrementalPointLocator * locator, vtkCellArray * verts,
vtkCellArray * lines, vtkCellArray * polys,
vtkPointData * inPd, vtkPointData * outPd, vtkCellData * inCd,
- vtkIdType cellId, vtkCellData * outCd) VTK_OVERRIDE;
+ vtkIdType cellId, vtkCellData * outCd) override;
int EvaluatePosition (double x[3], double *closestPoint,
- int &subId, double pcoords[3], double &dist2, double *weights) VTK_OVERRIDE;
+ int &subId, double pcoords[3], double &dist2, double *weights) override;
void EvaluateLocation (int &subId, double pcoords[3],
- double x[3], double *weights) VTK_OVERRIDE;
- int Triangulate (int index, vtkIdList * ptIds, vtkPoints * pts) VTK_OVERRIDE;
+ double x[3], double *weights) override;
+ int Triangulate (int index, vtkIdList * ptIds, vtkPoints * pts) override;
void Derivatives (int subId, double pcoords[3], double *values,
- int dim, double *derivs) VTK_OVERRIDE;
- double *GetParametricCoords () VTK_OVERRIDE;
+ int dim, double *derivs) override;
+ double *GetParametricCoords () override;
/**
* Clip this triquadratic hexahedron using scalar value provided. Like
@@ -123,14 +123,14 @@ public:
vtkIncrementalPointLocator * locator, vtkCellArray * tetras,
vtkPointData * inPd, vtkPointData * outPd,
vtkCellData * inCd, vtkIdType cellId, vtkCellData * outCd,
- int insideOut) VTK_OVERRIDE;
+ int insideOut) override;
/**
* Line-edge intersection. Intersection has to occur within [0,1] parametric
* coordinates and with specified tolerance.
*/
int IntersectWithLine (double p1[3], double p2[3], double tol, double &t,
- double x[3], double pcoords[3], int &subId) VTK_OVERRIDE;
+ double x[3], double pcoords[3], int &subId) override;
/**
* @deprecated Replaced by vtkTriQuadraticHexahedron::InterpolateFunctions as of VTK 5.2
@@ -145,11 +145,11 @@ public:
* Compute the interpolation functions/derivatives
* (aka shape functions/derivatives)
*/
- void InterpolateFunctions (double pcoords[3], double weights[27]) VTK_OVERRIDE
+ void InterpolateFunctions (double pcoords[3], double weights[27]) override
{
vtkTriQuadraticHexahedron::InterpolationFunctions(pcoords,weights);
}
- void InterpolateDerivs (double pcoords[3], double derivs[81]) VTK_OVERRIDE
+ void InterpolateDerivs (double pcoords[3], double derivs[81]) override
{
vtkTriQuadraticHexahedron::InterpolationDerivs(pcoords,derivs);
}
@@ -172,7 +172,7 @@ public:
protected:
vtkTriQuadraticHexahedron ();
- ~vtkTriQuadraticHexahedron () VTK_OVERRIDE;
+ ~vtkTriQuadraticHexahedron () override;
vtkQuadraticEdge *Edge;
vtkBiQuadraticQuad *Face;
diff --git a/Common/DataModel/vtkTriangle.h b/Common/DataModel/vtkTriangle.h
index 2adcca3bf7735f41f01d759393a2f7ce76598fd0..1b36ac13e728872c2d6106b10d2eff408597cc69 100644
--- a/Common/DataModel/vtkTriangle.h
+++ b/Common/DataModel/vtkTriangle.h
@@ -37,38 +37,38 @@ class VTKCOMMONDATAMODEL_EXPORT vtkTriangle : public vtkCell
public:
static vtkTriangle *New();
vtkTypeMacro(vtkTriangle,vtkCell);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Get the edge specified by edgeId (range 0 to 2) and return that edge's
* coordinates.
*/
- vtkCell *GetEdge(int edgeId) VTK_OVERRIDE;
+ vtkCell *GetEdge(int edgeId) override;
//@{
/**
* See the vtkCell API for descriptions of these methods.
*/
- int GetCellType() VTK_OVERRIDE {return VTK_TRIANGLE;};
- int GetCellDimension() VTK_OVERRIDE {return 2;};
- int GetNumberOfEdges() VTK_OVERRIDE {return 3;};
- int GetNumberOfFaces() VTK_OVERRIDE {return 0;};
- vtkCell *GetFace(int) VTK_OVERRIDE {return nullptr;};
- int CellBoundary(int subId, double pcoords[3], vtkIdList *pts) VTK_OVERRIDE;
+ int GetCellType() override {return VTK_TRIANGLE;};
+ int GetCellDimension() override {return 2;};
+ int GetNumberOfEdges() override {return 3;};
+ int GetNumberOfFaces() override {return 0;};
+ vtkCell *GetFace(int) override {return nullptr;};
+ int CellBoundary(int subId, double pcoords[3], vtkIdList *pts) override;
void Contour(double value, vtkDataArray *cellScalars,
vtkIncrementalPointLocator *locator, vtkCellArray *verts,
vtkCellArray *lines, vtkCellArray *polys,
vtkPointData *inPd, vtkPointData *outPd,
- vtkCellData *inCd, vtkIdType cellId, vtkCellData *outCd) VTK_OVERRIDE;
+ vtkCellData *inCd, vtkIdType cellId, vtkCellData *outCd) override;
int EvaluatePosition(double x[3], double* closestPoint,
int& subId, double pcoords[3],
- double& dist2, double *weights) VTK_OVERRIDE;
+ double& dist2, double *weights) override;
void EvaluateLocation(int& subId, double pcoords[3], double x[3],
- double *weights) VTK_OVERRIDE;
- int Triangulate(int index, vtkIdList *ptIds, vtkPoints *pts) VTK_OVERRIDE;
+ double *weights) override;
+ int Triangulate(int index, vtkIdList *ptIds, vtkPoints *pts) override;
void Derivatives(int subId, double pcoords[3], double *values,
- int dim, double *derivs) VTK_OVERRIDE;
- double *GetParametricCoords() VTK_OVERRIDE;
+ int dim, double *derivs) override;
+ double *GetParametricCoords() override;
//@}
/**
@@ -84,7 +84,7 @@ public:
vtkIncrementalPointLocator *locator, vtkCellArray *polys,
vtkPointData *inPd, vtkPointData *outPd,
vtkCellData *inCd, vtkIdType cellId, vtkCellData *outCd,
- int insideOut) VTK_OVERRIDE;
+ int insideOut) override;
/**
* @deprecated Replaced by vtkTriangle::InterpolateFunctions as of VTK 5.2
@@ -99,11 +99,11 @@ public:
* Compute the interpolation functions/derivatives
* (aka shape functions/derivatives)
*/
- void InterpolateFunctions(double pcoords[3], double sf[3]) VTK_OVERRIDE
+ void InterpolateFunctions(double pcoords[3], double sf[3]) override
{
vtkTriangle::InterpolationFunctions(pcoords,sf);
}
- void InterpolateDerivs(double pcoords[3], double derivs[6]) VTK_OVERRIDE
+ void InterpolateDerivs(double pcoords[3], double derivs[6]) override
{
vtkTriangle::InterpolationDerivs(pcoords,derivs);
}
@@ -119,18 +119,18 @@ public:
* performed using tol as the tolerance.
*/
int IntersectWithLine(double p1[3], double p2[3], double tol, double& t,
- double x[3], double pcoords[3], int& subId) VTK_OVERRIDE;
+ double x[3], double pcoords[3], int& subId) override;
/**
* Return the center of the triangle in parametric coordinates.
*/
- int GetParametricCenter(double pcoords[3]) VTK_OVERRIDE;
+ int GetParametricCenter(double pcoords[3]) override;
/**
* Return the distance of the parametric coordinate provided to the
* cell. If inside the cell, a distance of zero is returned.
*/
- double GetParametricDistance(double pcoords[3]) VTK_OVERRIDE;
+ double GetParametricDistance(double pcoords[3]) override;
/**
* Compute the center of the triangle.
@@ -229,7 +229,7 @@ public:
protected:
vtkTriangle();
- ~vtkTriangle() VTK_OVERRIDE;
+ ~vtkTriangle() override;
vtkLine *Line;
diff --git a/Common/DataModel/vtkTriangleStrip.h b/Common/DataModel/vtkTriangleStrip.h
index f8012c63fb3c8289d4a9b1ad631840b10590e9af..c0de6993e849c4eab3f985eb448e1d35a735be8c 100644
--- a/Common/DataModel/vtkTriangleStrip.h
+++ b/Common/DataModel/vtkTriangleStrip.h
@@ -39,47 +39,47 @@ class VTKCOMMONDATAMODEL_EXPORT vtkTriangleStrip : public vtkCell
public:
static vtkTriangleStrip *New();
vtkTypeMacro(vtkTriangleStrip,vtkCell);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
* See the vtkCell API for descriptions of these methods.
*/
- int GetCellType() VTK_OVERRIDE {return VTK_TRIANGLE_STRIP;};
- int GetCellDimension() VTK_OVERRIDE {return 2;};
- int GetNumberOfEdges() VTK_OVERRIDE {return this->GetNumberOfPoints();};
- int GetNumberOfFaces() VTK_OVERRIDE {return 0;};
- vtkCell *GetEdge(int edgeId) VTK_OVERRIDE;
- vtkCell *GetFace(int vtkNotUsed(faceId)) VTK_OVERRIDE {return nullptr;};
- int CellBoundary(int subId, double pcoords[3], vtkIdList *pts) VTK_OVERRIDE;
+ int GetCellType() override {return VTK_TRIANGLE_STRIP;};
+ int GetCellDimension() override {return 2;};
+ int GetNumberOfEdges() override {return this->GetNumberOfPoints();};
+ int GetNumberOfFaces() override {return 0;};
+ vtkCell *GetEdge(int edgeId) override;
+ vtkCell *GetFace(int vtkNotUsed(faceId)) override {return nullptr;};
+ int CellBoundary(int subId, double pcoords[3], vtkIdList *pts) override;
void Contour(double value, vtkDataArray *cellScalars,
vtkIncrementalPointLocator *locator, vtkCellArray *verts,
vtkCellArray *lines, vtkCellArray *polys,
vtkPointData *inPd, vtkPointData *outPd,
- vtkCellData *inCd, vtkIdType cellId, vtkCellData *outCd) VTK_OVERRIDE;
+ vtkCellData *inCd, vtkIdType cellId, vtkCellData *outCd) override;
void Clip(double value, vtkDataArray *cellScalars,
vtkIncrementalPointLocator *locator, vtkCellArray *polys,
vtkPointData *inPd, vtkPointData *outPd,
vtkCellData *inCd, vtkIdType cellId, vtkCellData *outCd,
- int insideOut) VTK_OVERRIDE;
+ int insideOut) override;
//@}
int EvaluatePosition(double x[3], double* closestPoint,
int& subId, double pcoords[3],
- double& dist2, double *weights) VTK_OVERRIDE;
+ double& dist2, double *weights) override;
void EvaluateLocation(int& subId, double pcoords[3], double x[3],
- double *weights) VTK_OVERRIDE;
+ double *weights) override;
int IntersectWithLine(double p1[3], double p2[3], double tol, double& t,
- double x[3], double pcoords[3], int& subId) VTK_OVERRIDE;
- int Triangulate(int index, vtkIdList *ptIds, vtkPoints *pts) VTK_OVERRIDE;
+ double x[3], double pcoords[3], int& subId) override;
+ int Triangulate(int index, vtkIdList *ptIds, vtkPoints *pts) override;
void Derivatives(int subId, double pcoords[3], double *values,
- int dim, double *derivs) VTK_OVERRIDE;
- int IsPrimaryCell() VTK_OVERRIDE {return 0;}
+ int dim, double *derivs) override;
+ int IsPrimaryCell() override {return 0;}
/**
* Return the center of the point cloud in parametric coordinates.
*/
- int GetParametricCenter(double pcoords[3]) VTK_OVERRIDE;
+ int GetParametricCenter(double pcoords[3]) override;
/**
* Given a triangle strip, decompose it into a list of (triangle)
@@ -89,7 +89,7 @@ public:
protected:
vtkTriangleStrip();
- ~vtkTriangleStrip() VTK_OVERRIDE;
+ ~vtkTriangleStrip() override;
vtkLine *Line;
vtkTriangle *Triangle;
diff --git a/Common/DataModel/vtkUndirectedGraph.h b/Common/DataModel/vtkUndirectedGraph.h
index c6eafec62f5ee654e363d6c3e025a34c787285f3..08a0903c7e5d43385f44d54e5391be437baae6f9 100644
--- a/Common/DataModel/vtkUndirectedGraph.h
+++ b/Common/DataModel/vtkUndirectedGraph.h
@@ -50,23 +50,23 @@ class VTKCOMMONDATAMODEL_EXPORT vtkUndirectedGraph : public vtkGraph
public:
static vtkUndirectedGraph *New();
vtkTypeMacro(vtkUndirectedGraph, vtkGraph);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Return what type of dataset this is.
*/
- int GetDataObjectType() VTK_OVERRIDE {return VTK_UNDIRECTED_GRAPH;}
+ int GetDataObjectType() override {return VTK_UNDIRECTED_GRAPH;}
/**
* Returns the full degree of the vertex.
*/
- vtkIdType GetInDegree(vtkIdType v) VTK_OVERRIDE;
+ vtkIdType GetInDegree(vtkIdType v) override;
/**
* Random-access method for retrieving the in edges of a vertex.
* For an undirected graph, this is the same as the out edges.
*/
- vtkInEdgeType GetInEdge(vtkIdType v, vtkIdType i) VTK_OVERRIDE;
+ vtkInEdgeType GetInEdge(vtkIdType v, vtkIdType i) override;
/**
* Random-access method for retrieving incoming edges to vertex v.
@@ -74,7 +74,7 @@ public:
* target of the edge. This method is provided for wrappers,
* GetInEdge(vtkIdType, vtkIdType) is preferred.
*/
- void GetInEdge(vtkIdType v, vtkIdType i, vtkGraphEdge* e) VTK_OVERRIDE
+ void GetInEdge(vtkIdType v, vtkIdType i, vtkGraphEdge* e) override
{ this->Superclass::GetInEdge(v, i, e); }
//@{
@@ -89,7 +89,7 @@ public:
* Initialize the iterator to get the incoming edges to a vertex.
* For an undirected graph, this is all incident edges.
*/
- void GetInEdges(vtkIdType v, vtkInEdgeIterator *it) VTK_OVERRIDE
+ void GetInEdges(vtkIdType v, vtkInEdgeIterator *it) override
{ Superclass::GetInEdges(v, it); }
/**
@@ -97,17 +97,17 @@ public:
* undirected graph. This is public to allow
* the ToDirected/UndirectedGraph to work.
*/
- bool IsStructureValid(vtkGraph *g) VTK_OVERRIDE;
+ bool IsStructureValid(vtkGraph *g) override;
protected:
vtkUndirectedGraph();
- ~vtkUndirectedGraph() VTK_OVERRIDE;
+ ~vtkUndirectedGraph() override;
/**
* For iterators, returns the same edge list as GetOutEdges().
*/
void GetInEdges(vtkIdType v, const vtkInEdgeType *& edges,
- vtkIdType & nedges) VTK_OVERRIDE;
+ vtkIdType & nedges) override;
private:
vtkUndirectedGraph(const vtkUndirectedGraph&) VTK_DELETE_FUNCTION;
diff --git a/Common/DataModel/vtkUniformGrid.h b/Common/DataModel/vtkUniformGrid.h
index eed4b28cf44b26cb3b7b854fd06d7107fe45115b..bf96308f7973f0c87af1c1ca01fe85fd39d917de 100644
--- a/Common/DataModel/vtkUniformGrid.h
+++ b/Common/DataModel/vtkUniformGrid.h
@@ -40,46 +40,46 @@ public:
*/
static vtkUniformGrid *New();
vtkTypeMacro(vtkUniformGrid,vtkImageData);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
* Copy the geometric and topological structure of an input image data
* object.
*/
- void CopyStructure(vtkDataSet *ds) VTK_OVERRIDE;
+ void CopyStructure(vtkDataSet *ds) override;
/**
* Return what type of dataset this is.
*/
- int GetDataObjectType() VTK_OVERRIDE {return VTK_UNIFORM_GRID;};
+ int GetDataObjectType() override {return VTK_UNIFORM_GRID;};
//@{
/**
* Standard vtkDataSet API methods. See vtkDataSet for more information.
*/
- vtkCell *GetCell(int i, int j, int k) VTK_OVERRIDE;
- vtkCell *GetCell(vtkIdType cellId) VTK_OVERRIDE;
- void GetCell(vtkIdType cellId, vtkGenericCell *cell) VTK_OVERRIDE;
+ vtkCell *GetCell(int i, int j, int k) override;
+ vtkCell *GetCell(vtkIdType cellId) override;
+ void GetCell(vtkIdType cellId, vtkGenericCell *cell) override;
vtkIdType FindCell(
double x[3], vtkCell *cell, vtkIdType cellId, double tol2,
- int& subId, double pcoords[3], double *weights) VTK_OVERRIDE;
+ int& subId, double pcoords[3], double *weights) override;
vtkIdType FindCell(
double x[3], vtkCell *cell, vtkGenericCell *gencell,
vtkIdType cellId, double tol2, int& subId,
- double pcoords[3], double *weights) VTK_OVERRIDE;
+ double pcoords[3], double *weights) override;
vtkCell *FindAndGetCell(
double x[3], vtkCell *cell, vtkIdType cellId,
double tol2, int& subId, double pcoords[3],
- double *weights) VTK_OVERRIDE;
- int GetCellType(vtkIdType cellId) VTK_OVERRIDE;
- void GetCellPoints(vtkIdType cellId, vtkIdList *ptIds) VTK_OVERRIDE
+ double *weights) override;
+ int GetCellType(vtkIdType cellId) override;
+ void GetCellPoints(vtkIdType cellId, vtkIdList *ptIds) override
{vtkStructuredData::GetCellPoints(cellId,ptIds,this->GetDataDescription(),
this->GetDimensions());}
- void GetPointCells(vtkIdType ptId, vtkIdList *cellIds) VTK_OVERRIDE
+ void GetPointCells(vtkIdType ptId, vtkIdList *cellIds) override
{vtkStructuredData::GetPointCells(ptId,cellIds,this->GetDimensions());}
- void Initialize() VTK_OVERRIDE;
- int GetMaxCellSize() VTK_OVERRIDE {return 8;}; //voxel is the largest
+ void Initialize() override;
+ int GetMaxCellSize() override {return 8;}; //voxel is the largest
//@}
/**
@@ -151,12 +151,12 @@ public:
* Returns 1 if there is any visibility constraint on the cells,
* 0 otherwise.
*/
- bool HasAnyBlankCells() VTK_OVERRIDE;
+ bool HasAnyBlankCells() override;
/**
* Returns 1 if there is any visibility constraint on the points,
* 0 otherwise.
*/
- bool HasAnyBlankPoints() VTK_OVERRIDE;
+ bool HasAnyBlankPoints() override;
/**
* Return non-zero value if specified point is visible.
@@ -184,7 +184,7 @@ public:
protected:
vtkUniformGrid();
- ~vtkUniformGrid() VTK_OVERRIDE;
+ ~vtkUniformGrid() override;
/**
* Returns the cell dimensions for this vtkUniformGrid instance.
@@ -194,7 +194,7 @@ protected:
/**
* Override this method because of blanking.
*/
- void ComputeScalarRange() VTK_OVERRIDE;
+ void ComputeScalarRange() override;
vtkEmptyCell* GetEmptyCell();
diff --git a/Common/DataModel/vtkUniformGridAMR.h b/Common/DataModel/vtkUniformGridAMR.h
index 477153cc8eefc7a54b24c709028b14cfe58bd0cd..873284eb871498183ea39740f4afe7516f8ae4b4 100644
--- a/Common/DataModel/vtkUniformGridAMR.h
+++ b/Common/DataModel/vtkUniformGridAMR.h
@@ -38,18 +38,18 @@ public:
// Description:
// Return a new iterator (the iterator has to be deleted by the user).
- VTK_NEWINSTANCE vtkCompositeDataIterator* NewIterator() VTK_OVERRIDE;
+ VTK_NEWINSTANCE vtkCompositeDataIterator* NewIterator() override;
// Description:
// Return class name of data type (see vtkType.h for definitions).
- int GetDataObjectType() VTK_OVERRIDE {return VTK_UNIFORM_GRID_AMR;}
+ int GetDataObjectType() override {return VTK_UNIFORM_GRID_AMR;}
// Description: // Print internal states
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
// Description:
// Restore data object to initial
- void Initialize() VTK_OVERRIDE;
+ void Initialize() override;
// Description:
// Initialize the AMR.
@@ -83,7 +83,7 @@ public:
// Description:
// Unhiding superclass method.
void SetDataSet(vtkCompositeDataIterator* iter,
- vtkDataObject* dataObj) VTK_OVERRIDE;
+ vtkDataObject* dataObj) override;
// Description:
// At the passed in level, set grid as the idx'th block at that level.
@@ -92,7 +92,7 @@ public:
// Description:
// Return the data set pointed to by iter
- vtkDataObject* GetDataSet(vtkCompositeDataIterator* iter) VTK_OVERRIDE;
+ vtkDataObject* GetDataSet(vtkCompositeDataIterator* iter) override;
// Description:
// Get the data set using the index pair
@@ -111,9 +111,9 @@ public:
// Description:
// Override ShallowCopy/DeepCopy and CopyStructure
- void ShallowCopy(vtkDataObject *src) VTK_OVERRIDE;
- void DeepCopy(vtkDataObject *src) VTK_OVERRIDE;
- void CopyStructure(vtkCompositeDataSet *src) VTK_OVERRIDE;
+ void ShallowCopy(vtkDataObject *src) override;
+ void DeepCopy(vtkDataObject *src) override;
+ void CopyStructure(vtkCompositeDataSet *src) override;
// Retrieve an instance of this class from an information object.
static vtkUniformGridAMR* GetData(vtkInformation* info);
@@ -121,7 +121,7 @@ public:
protected:
vtkUniformGridAMR();
- ~vtkUniformGridAMR() VTK_OVERRIDE;
+ ~vtkUniformGridAMR() override;
// Description:
// Get/Set the meta AMR meta data
diff --git a/Common/DataModel/vtkUniformGridAMRDataIterator.cxx b/Common/DataModel/vtkUniformGridAMRDataIterator.cxx
index 12f5b7758c44fd08e68cd1683f6492f35a7fc555..0df6e28ba013d16158cf70988ea96748f2bdf4bb 100644
--- a/Common/DataModel/vtkUniformGridAMRDataIterator.cxx
+++ b/Common/DataModel/vtkUniformGridAMRDataIterator.cxx
@@ -53,7 +53,7 @@ public:
virtual unsigned int GetFlatIndex() { return this->Index;}
protected:
AMRIndexIterator(): Level(0), Index(0) {}
- ~AMRIndexIterator() VTK_OVERRIDE{};
+ ~AMRIndexIterator() override{};
unsigned int Level;
int Index;
unsigned int NumLevels;
@@ -90,12 +90,12 @@ public:
this->Next();
}
protected:
- void AdvanceIndex() VTK_OVERRIDE
+ void AdvanceIndex() override
{
this->InternalIdx++;
Superclass::Index = static_cast<size_t>(this->InternalIdx) < this->DataBlocks->size()? (*this->DataBlocks)[this->InternalIdx].Index : 0;
}
- bool IsDone() VTK_OVERRIDE { return static_cast<size_t>(this->InternalIdx) >= this->DataBlocks->size();}
+ bool IsDone() override { return static_cast<size_t>(this->InternalIdx) >= this->DataBlocks->size();}
const vtkAMRDataInternals::BlockList* DataBlocks;
int InternalIdx;
private:
diff --git a/Common/DataModel/vtkUniformGridAMRDataIterator.h b/Common/DataModel/vtkUniformGridAMRDataIterator.h
index a2230d787145481ca0d0cb942f4623cb3a57c1a0..a20f63991343b8dcba12362dd8d31ee8a9db3f8d 100644
--- a/Common/DataModel/vtkUniformGridAMRDataIterator.h
+++ b/Common/DataModel/vtkUniformGridAMRDataIterator.h
@@ -38,7 +38,7 @@ class VTKCOMMONDATAMODEL_EXPORT vtkUniformGridAMRDataIterator :
public:
static vtkUniformGridAMRDataIterator* New();
vtkTypeMacro(vtkUniformGridAMRDataIterator, vtkCompositeDataIterator);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Returns the meta-data associated with the current item.
@@ -46,21 +46,21 @@ public:
* allocated by the iterator and will be changed as soon as GoToNextItem is
* called.
*/
- vtkInformation* GetCurrentMetaData() VTK_OVERRIDE;
+ vtkInformation* GetCurrentMetaData() override;
- int HasCurrentMetaData() VTK_OVERRIDE { return 1;}
+ int HasCurrentMetaData() override { return 1;}
/**
* Returns the current item. Valid only when IsDoneWithTraversal() returns 0.
*/
- vtkDataObject* GetCurrentDataObject() VTK_OVERRIDE;
+ vtkDataObject* GetCurrentDataObject() override;
/**
* Flat index is an index obtained by traversing the tree in preorder.
* This can be used to uniquely identify nodes in the tree.
* Not valid if IsDoneWithTraversal() returns true.
*/
- unsigned int GetCurrentFlatIndex() VTK_OVERRIDE;
+ unsigned int GetCurrentFlatIndex() override;
/**
* Returns the level for the current dataset.
@@ -76,12 +76,12 @@ public:
/**
* Move the iterator to the beginning of the collection.
*/
- void GoToFirstItem() VTK_OVERRIDE;
+ void GoToFirstItem() override;
/**
* Move the iterator to the next item in the collection.
*/
- void GoToNextItem() VTK_OVERRIDE;
+ void GoToNextItem() override;
/**
* Test whether the iterator is finished with the traversal.
@@ -89,11 +89,11 @@ public:
* It is safe to call any of the GetCurrent...() methods only when
* IsDoneWithTraversal() returns 0.
*/
- int IsDoneWithTraversal() VTK_OVERRIDE;
+ int IsDoneWithTraversal() override;
protected:
vtkUniformGridAMRDataIterator();
- ~vtkUniformGridAMRDataIterator() VTK_OVERRIDE;
+ ~vtkUniformGridAMRDataIterator() override;
vtkSmartPointer<AMRIndexIterator> Iter;
private:
vtkUniformGridAMRDataIterator(const vtkUniformGridAMRDataIterator&) VTK_DELETE_FUNCTION;
diff --git a/Common/DataModel/vtkUnstructuredGrid.h b/Common/DataModel/vtkUnstructuredGrid.h
index ab70870cb34e2fca6d045b323d905d19da9029c9..0967249505cc70e8c9d5b89409fc80f771146377 100644
--- a/Common/DataModel/vtkUnstructuredGrid.h
+++ b/Common/DataModel/vtkUnstructuredGrid.h
@@ -79,12 +79,12 @@ public:
static vtkUnstructuredGrid *New();
vtkTypeMacro(vtkUnstructuredGrid, vtkUnstructuredGridBase)
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Standard vtkDataSet API methods. See vtkDataSet for more information.
*/
- int GetDataObjectType() VTK_OVERRIDE {return VTK_UNSTRUCTURED_GRID;};
+ int GetDataObjectType() override {return VTK_UNSTRUCTURED_GRID;};
/**
* Method allocates initial storage for the cell connectivity. Use this
@@ -92,7 +92,7 @@ public:
* doubled when the inserting a cell exceeds the current capacity.
* extSize is no longer used.
*/
- void Allocate(vtkIdType numCells=1000, int extSize=1000) VTK_OVERRIDE;
+ void Allocate(vtkIdType numCells=1000, int extSize=1000) override;
/**
* Insert/create cell in object by type and list of point ids defining
@@ -104,7 +104,7 @@ public:
* (numFace0Pts, id1, id2, id3, numFace1Pts,id1, id2, id3, ...)
* Make sure you have called Allocate() before calling this method
*/
- vtkIdType InsertNextCell(int type, vtkIdType npts, vtkIdType *ptIds) VTK_OVERRIDE;
+ vtkIdType InsertNextCell(int type, vtkIdType npts, vtkIdType *ptIds) override;
/**
* Insert/create cell in object by a list of point ids defining
@@ -115,7 +115,7 @@ public:
* (numCellFaces, numFace0Pts, id1, id2, id3, numFace1Pts,id1, id2, id3, ...)
* Make sure you have called Allocate() before calling this method
*/
- vtkIdType InsertNextCell(int type, vtkIdList *ptIds) VTK_OVERRIDE;
+ vtkIdType InsertNextCell(int type, vtkIdList *ptIds) override;
// Desciption:
// Insert/create a polyhedron cell. npts is the number of unique points in
@@ -125,30 +125,30 @@ public:
// All point Ids are global.
// Make sure you have called Allocate() before calling this method
vtkIdType InsertNextCell(int type, vtkIdType npts, vtkIdType *ptIds,
- vtkIdType nfaces, vtkIdType *faces) VTK_OVERRIDE;
+ vtkIdType nfaces, vtkIdType *faces) override;
//@{
/**
* Standard vtkDataSet methods; see vtkDataSet.h for documentation.
*/
void Reset();
- void CopyStructure(vtkDataSet *ds) VTK_OVERRIDE;
- vtkIdType GetNumberOfCells() VTK_OVERRIDE;
+ void CopyStructure(vtkDataSet *ds) override;
+ vtkIdType GetNumberOfCells() override;
using vtkDataSet::GetCell;
- vtkCell *GetCell(vtkIdType cellId) VTK_OVERRIDE;
- void GetCell(vtkIdType cellId, vtkGenericCell *cell) VTK_OVERRIDE;
- void GetCellBounds(vtkIdType cellId, double bounds[6]) VTK_OVERRIDE;
- void GetCellPoints(vtkIdType cellId, vtkIdList *ptIds) VTK_OVERRIDE;
- void GetPointCells(vtkIdType ptId, vtkIdList *cellIds) VTK_OVERRIDE;
- vtkCellIterator* NewCellIterator() VTK_OVERRIDE;
+ vtkCell *GetCell(vtkIdType cellId) override;
+ void GetCell(vtkIdType cellId, vtkGenericCell *cell) override;
+ void GetCellBounds(vtkIdType cellId, double bounds[6]) override;
+ void GetCellPoints(vtkIdType cellId, vtkIdList *ptIds) override;
+ void GetPointCells(vtkIdType ptId, vtkIdList *cellIds) override;
+ vtkCellIterator* NewCellIterator() override;
//@}
- int GetCellType(vtkIdType cellId) VTK_OVERRIDE;
+ int GetCellType(vtkIdType cellId) override;
vtkUnsignedCharArray* GetCellTypesArray() { return this->Types; }
vtkIdTypeArray* GetCellLocationsArray() { return this->Locations; }
- void Squeeze() VTK_OVERRIDE;
- void Initialize() VTK_OVERRIDE;
- int GetMaxCellSize() VTK_OVERRIDE;
+ void Squeeze() override;
+ void Initialize() override;
+ int GetMaxCellSize() override;
void BuildLinks();
vtkCellLinks *GetCellLinks() {return this->Links;};
virtual void GetCellPoints(vtkIdType cellId, vtkIdType& npts,
@@ -196,7 +196,7 @@ public:
//@}
vtkCellArray *GetCells() {return this->Connectivity;};
- void ReplaceCell(vtkIdType cellId, int npts, vtkIdType *pts) VTK_OVERRIDE;
+ void ReplaceCell(vtkIdType cellId, int npts, vtkIdType *pts) override;
vtkIdType InsertNextLinkedCell(int type, int npts, vtkIdType *pts);
void RemoveReferenceToCell(vtkIdType ptId, vtkIdType cellId);
void AddReferenceToCell(vtkIdType ptId, vtkIdType cellId);
@@ -209,7 +209,7 @@ public:
* THE DATASET IS NOT MODIFIED
*/
void GetCellNeighbors(vtkIdType cellId, vtkIdList *ptIds,
- vtkIdList *cellIds) VTK_OVERRIDE;
+ vtkIdList *cellIds) override;
//@{
/**
@@ -232,14 +232,14 @@ public:
* arrays, etc. are not included in the return value). THIS METHOD
* IS THREAD SAFE.
*/
- unsigned long GetActualMemorySize() VTK_OVERRIDE;
+ unsigned long GetActualMemorySize() override;
//@{
/**
* Shallow and Deep copy.
*/
- void ShallowCopy(vtkDataObject *src) VTK_OVERRIDE;
- void DeepCopy(vtkDataObject *src) VTK_OVERRIDE;
+ void ShallowCopy(vtkDataObject *src) override;
+ void DeepCopy(vtkDataObject *src) override;
//@}
/**
@@ -247,12 +247,12 @@ public:
* method traverses all cells and, for a particular cell type,
* inserts the cell Id into the container.
*/
- void GetIdsOfCellsOfType(int type, vtkIdTypeArray *array) VTK_OVERRIDE;
+ void GetIdsOfCellsOfType(int type, vtkIdTypeArray *array) override;
/**
* Traverse cells and determine if cells are all of the same type.
*/
- int IsHomogeneous() VTK_OVERRIDE;
+ int IsHomogeneous() override;
/**
* This method will remove any cell that is marked as ghost
@@ -362,7 +362,7 @@ public:
protected:
vtkUnstructuredGrid();
- ~vtkUnstructuredGrid() VTK_OVERRIDE;
+ ~vtkUnstructuredGrid() override;
// used by GetCell method
vtkVertex *Vertex;
diff --git a/Common/DataModel/vtkUnstructuredGridBase.h b/Common/DataModel/vtkUnstructuredGridBase.h
index f021855706d85ca2d768e18673a34cd67f7c8bf6..e6cad94a4de4b01efb0402dababf9abe5e3e6f15 100644
--- a/Common/DataModel/vtkUnstructuredGridBase.h
+++ b/Common/DataModel/vtkUnstructuredGridBase.h
@@ -35,12 +35,12 @@ class VTKCOMMONDATAMODEL_EXPORT vtkUnstructuredGridBase : public vtkPointSet
{
public:
vtkAbstractTypeMacro(vtkUnstructuredGridBase,vtkPointSet)
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE
+ void PrintSelf(ostream &os, vtkIndent indent) override
{
this->Superclass::PrintSelf(os, indent);
}
- int GetDataObjectType() VTK_OVERRIDE { return VTK_UNSTRUCTURED_GRID_BASE; }
+ int GetDataObjectType() override { return VTK_UNSTRUCTURED_GRID_BASE; }
/**
* Allocate memory for the number of cells indicated. extSize is not used.
@@ -50,7 +50,7 @@ public:
/**
* Shallow and Deep copy.
*/
- void DeepCopy(vtkDataObject *src) VTK_OVERRIDE;
+ void DeepCopy(vtkDataObject *src) override;
/**
* Insert/create cell in object by type and list of point ids defining
@@ -113,7 +113,7 @@ public:
protected:
vtkUnstructuredGridBase();
- ~vtkUnstructuredGridBase() VTK_OVERRIDE;
+ ~vtkUnstructuredGridBase() override;
private:
vtkUnstructuredGridBase(const vtkUnstructuredGridBase&) VTK_DELETE_FUNCTION;
diff --git a/Common/DataModel/vtkUnstructuredGridCellIterator.h b/Common/DataModel/vtkUnstructuredGridCellIterator.h
index 59104ebfb44b009208e2e5875daf0584d64318be..ec20434d5b07cef3ba6d8a63b2a84e5af81704b8 100644
--- a/Common/DataModel/vtkUnstructuredGridCellIterator.h
+++ b/Common/DataModel/vtkUnstructuredGridCellIterator.h
@@ -36,21 +36,21 @@ class VTKCOMMONDATAMODEL_EXPORT vtkUnstructuredGridCellIterator :
public:
static vtkUnstructuredGridCellIterator *New();
vtkTypeMacro(vtkUnstructuredGridCellIterator, vtkCellIterator)
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
- bool IsDoneWithTraversal() VTK_OVERRIDE;
- vtkIdType GetCellId() VTK_OVERRIDE;
+ bool IsDoneWithTraversal() override;
+ vtkIdType GetCellId() override;
protected:
vtkUnstructuredGridCellIterator();
- ~vtkUnstructuredGridCellIterator() VTK_OVERRIDE;
-
- void ResetToFirstCell() VTK_OVERRIDE;
- void IncrementToNextCell() VTK_OVERRIDE;
- void FetchCellType() VTK_OVERRIDE;
- void FetchPointIds() VTK_OVERRIDE;
- void FetchPoints() VTK_OVERRIDE;
- void FetchFaces() VTK_OVERRIDE;
+ ~vtkUnstructuredGridCellIterator() override;
+
+ void ResetToFirstCell() override;
+ void IncrementToNextCell() override;
+ void FetchCellType() override;
+ void FetchPointIds() override;
+ void FetchPoints() override;
+ void FetchFaces() override;
friend class vtkUnstructuredGrid;
void SetUnstructuredGrid(vtkUnstructuredGrid *ug);
diff --git a/Common/DataModel/vtkVertex.h b/Common/DataModel/vtkVertex.h
index c152e414d0085b0b6e2140ab32ff85ef4458fbff..e604d4d6b29648e21aea962a8f1261dba17ba574 100644
--- a/Common/DataModel/vtkVertex.h
+++ b/Common/DataModel/vtkVertex.h
@@ -32,7 +32,7 @@ class VTKCOMMONDATAMODEL_EXPORT vtkVertex : public vtkCell
public:
static vtkVertex *New();
vtkTypeMacro(vtkVertex,vtkCell);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Make a new vtkVertex object with the same information as this object.
@@ -42,23 +42,23 @@ public:
/**
* See the vtkCell API for descriptions of these methods.
*/
- int GetCellType() VTK_OVERRIDE {return VTK_VERTEX;};
- int GetCellDimension() VTK_OVERRIDE {return 0;};
- int GetNumberOfEdges() VTK_OVERRIDE {return 0;};
- int GetNumberOfFaces() VTK_OVERRIDE {return 0;};
- vtkCell *GetEdge(int) VTK_OVERRIDE {return nullptr;};
- vtkCell *GetFace(int) VTK_OVERRIDE {return nullptr;};
+ int GetCellType() override {return VTK_VERTEX;};
+ int GetCellDimension() override {return 0;};
+ int GetNumberOfEdges() override {return 0;};
+ int GetNumberOfFaces() override {return 0;};
+ vtkCell *GetEdge(int) override {return nullptr;};
+ vtkCell *GetFace(int) override {return nullptr;};
void Clip(double value, vtkDataArray *cellScalars,
vtkIncrementalPointLocator *locator, vtkCellArray *pts,
vtkPointData *inPd, vtkPointData *outPd,
vtkCellData *inCd, vtkIdType cellId, vtkCellData *outCd,
- int insideOut) VTK_OVERRIDE;
+ int insideOut) override;
int EvaluatePosition(double x[3], double* closestPoint,
int& subId, double pcoords[3],
- double& dist2, double *weights) VTK_OVERRIDE;
+ double& dist2, double *weights) override;
void EvaluateLocation(int& subId, double pcoords[3], double x[3],
- double *weights) VTK_OVERRIDE;
- double *GetParametricCoords() VTK_OVERRIDE;
+ double *weights) override;
+ double *GetParametricCoords() override;
//@}
/**
@@ -68,7 +68,7 @@ public:
* (1D cell). If the return value of the method is != 0, then the point is
* inside the cell.
*/
- int CellBoundary(int subId, double pcoords[3], vtkIdList *pts) VTK_OVERRIDE;
+ int CellBoundary(int subId, double pcoords[3], vtkIdList *pts) override;
/**
* Generate contouring primitives. The scalar list cellScalars are
@@ -80,12 +80,12 @@ public:
vtkIncrementalPointLocator *locator, vtkCellArray *verts1,
vtkCellArray *lines, vtkCellArray *verts2,
vtkPointData *inPd, vtkPointData *outPd,
- vtkCellData *inCd, vtkIdType cellId, vtkCellData *outCd) VTK_OVERRIDE;
+ vtkCellData *inCd, vtkIdType cellId, vtkCellData *outCd) override;
/**
* Return the center of the triangle in parametric coordinates.
*/
- int GetParametricCenter(double pcoords[3]) VTK_OVERRIDE;
+ int GetParametricCenter(double pcoords[3]) override;
/**
* Intersect with a ray. Return parametric coordinates (both line and cell)
@@ -93,20 +93,20 @@ public:
* The method returns non-zero value if intersection occurs.
*/
int IntersectWithLine(double p1[3], double p2[3], double tol, double& t,
- double x[3], double pcoords[3], int& subId) VTK_OVERRIDE;
+ double x[3], double pcoords[3], int& subId) override;
/**
* Triangulate the vertex. This method fills pts and ptIds with information
* from the only point in the vertex.
*/
- int Triangulate(int index, vtkIdList *ptIds, vtkPoints *pts) VTK_OVERRIDE;
+ int Triangulate(int index, vtkIdList *ptIds, vtkPoints *pts) override;
/**
* Get the derivative of the vertex. Returns (0.0, 0.0, 0.0) for all
* dimensions.
*/
void Derivatives(int subId, double pcoords[3], double *values,
- int dim, double *derivs) VTK_OVERRIDE;
+ int dim, double *derivs) override;
/**
* @deprecated Replaced by vtkVertex::InterpolateFunctions as of VTK 5.2
@@ -121,11 +121,11 @@ public:
* Compute the interpolation functions/derivatives
* (aka shape functions/derivatives)
*/
- void InterpolateFunctions(double pcoords[3], double weights[1]) VTK_OVERRIDE
+ void InterpolateFunctions(double pcoords[3], double weights[1]) override
{
vtkVertex::InterpolationFunctions(pcoords,weights);
}
- void InterpolateDerivs(double pcoords[3], double derivs[3]) VTK_OVERRIDE
+ void InterpolateDerivs(double pcoords[3], double derivs[3]) override
{
vtkVertex::InterpolationDerivs(pcoords,derivs);
}
@@ -133,7 +133,7 @@ public:
protected:
vtkVertex();
- ~vtkVertex() VTK_OVERRIDE {}
+ ~vtkVertex() override {}
private:
vtkVertex(const vtkVertex&) VTK_DELETE_FUNCTION;
diff --git a/Common/DataModel/vtkVertexListIterator.h b/Common/DataModel/vtkVertexListIterator.h
index 8f469eec3a6a39a8cb364044c012e916a8047879..1e5745a487629eeb50fe7957edf79d9fec84554a 100644
--- a/Common/DataModel/vtkVertexListIterator.h
+++ b/Common/DataModel/vtkVertexListIterator.h
@@ -46,7 +46,7 @@ class VTKCOMMONDATAMODEL_EXPORT vtkVertexListIterator : public vtkObject
public:
static vtkVertexListIterator *New();
vtkTypeMacro(vtkVertexListIterator, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Setup the iterator with a graph.
@@ -82,7 +82,7 @@ public:
protected:
vtkVertexListIterator();
- ~vtkVertexListIterator() VTK_OVERRIDE;
+ ~vtkVertexListIterator() override;
vtkGraph *Graph;
vtkIdType Current;
diff --git a/Common/DataModel/vtkVoxel.h b/Common/DataModel/vtkVoxel.h
index 3cac8c8ae7a3e138b1e7a8fe2b9670bc8c40560a..2e31dcddaa675a0c87651bf864a5a6a4d0ac9d98 100644
--- a/Common/DataModel/vtkVoxel.h
+++ b/Common/DataModel/vtkVoxel.h
@@ -40,43 +40,43 @@ class VTKCOMMONDATAMODEL_EXPORT vtkVoxel : public vtkCell3D
public:
static vtkVoxel *New();
vtkTypeMacro(vtkVoxel,vtkCell3D);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
* See vtkCell3D API for description of these methods.
*/
- void GetEdgePoints(int edgeId, int* &pts) VTK_OVERRIDE;
- void GetFacePoints(int faceId, int* &pts) VTK_OVERRIDE;
- double *GetParametricCoords() VTK_OVERRIDE;
+ void GetEdgePoints(int edgeId, int* &pts) override;
+ void GetFacePoints(int faceId, int* &pts) override;
+ double *GetParametricCoords() override;
//@}
//@{
/**
* See the vtkCell API for descriptions of these methods.
*/
- int GetCellType() VTK_OVERRIDE {return VTK_VOXEL;}
- int GetCellDimension() VTK_OVERRIDE {return 3;}
- int GetNumberOfEdges() VTK_OVERRIDE {return 12;}
- int GetNumberOfFaces() VTK_OVERRIDE {return 6;}
- vtkCell *GetEdge(int edgeId) VTK_OVERRIDE;
- vtkCell *GetFace(int faceId) VTK_OVERRIDE;
- int CellBoundary(int subId, double pcoords[3], vtkIdList *pts) VTK_OVERRIDE;
+ int GetCellType() override {return VTK_VOXEL;}
+ int GetCellDimension() override {return 3;}
+ int GetNumberOfEdges() override {return 12;}
+ int GetNumberOfFaces() override {return 6;}
+ vtkCell *GetEdge(int edgeId) override;
+ vtkCell *GetFace(int faceId) override;
+ int CellBoundary(int subId, double pcoords[3], vtkIdList *pts) override;
void Contour(double value, vtkDataArray *cellScalars,
vtkIncrementalPointLocator *locator, vtkCellArray *verts,
vtkCellArray *lines, vtkCellArray *polys,
vtkPointData *inPd, vtkPointData *outPd,
- vtkCellData *inCd, vtkIdType cellId, vtkCellData *outCd) VTK_OVERRIDE;
+ vtkCellData *inCd, vtkIdType cellId, vtkCellData *outCd) override;
int EvaluatePosition(double x[3], double* closestPoint,
int& subId, double pcoords[3],
- double& dist2, double *weights) VTK_OVERRIDE;
+ double& dist2, double *weights) override;
void EvaluateLocation(int& subId, double pcoords[3], double x[3],
- double *weights) VTK_OVERRIDE;
+ double *weights) override;
int IntersectWithLine(double p1[3], double p2[3], double tol, double& t,
- double x[3], double pcoords[3], int& subId) VTK_OVERRIDE;
- int Triangulate(int index, vtkIdList *ptIds, vtkPoints *pts) VTK_OVERRIDE;
+ double x[3], double pcoords[3], int& subId) override;
+ int Triangulate(int index, vtkIdList *ptIds, vtkPoints *pts) override;
void Derivatives(int subId, double pcoords[3], double *values,
- int dim, double *derivs) VTK_OVERRIDE;
+ int dim, double *derivs) override;
//@}
/**
@@ -88,11 +88,11 @@ public:
* Compute the interpolation functions/derivatives
* (aka shape functions/derivatives)
*/
- void InterpolateFunctions(double pcoords[3], double weights[8]) VTK_OVERRIDE
+ void InterpolateFunctions(double pcoords[3], double weights[8]) override
{
vtkVoxel::InterpolationFunctions(pcoords,weights);
}
- void InterpolateDerivs(double pcoords[3], double derivs[24]) VTK_OVERRIDE
+ void InterpolateDerivs(double pcoords[3], double derivs[24]) override
{
vtkVoxel::InterpolationDerivs(pcoords,derivs);
}
@@ -116,7 +116,7 @@ public:
protected:
vtkVoxel();
- ~vtkVoxel() VTK_OVERRIDE;
+ ~vtkVoxel() override;
private:
vtkVoxel(const vtkVoxel&) VTK_DELETE_FUNCTION;
diff --git a/Common/DataModel/vtkWedge.h b/Common/DataModel/vtkWedge.h
index 20f785b80137ffc9c1e294d0c6c2e51c3d16db5a..88c19c928f648bf1b481aef7515bebb63c6b100e 100644
--- a/Common/DataModel/vtkWedge.h
+++ b/Common/DataModel/vtkWedge.h
@@ -45,49 +45,49 @@ class VTKCOMMONDATAMODEL_EXPORT vtkWedge : public vtkCell3D
public:
static vtkWedge *New();
vtkTypeMacro(vtkWedge,vtkCell3D);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
* See vtkCell3D API for description of these methods.
*/
- void GetEdgePoints(int edgeId, int* &pts) VTK_OVERRIDE;
- void GetFacePoints(int faceId, int* &pts) VTK_OVERRIDE;
+ void GetEdgePoints(int edgeId, int* &pts) override;
+ void GetFacePoints(int faceId, int* &pts) override;
//@}
//@{
/**
* See the vtkCell API for descriptions of these methods.
*/
- int GetCellType() VTK_OVERRIDE {return VTK_WEDGE;}
- int GetCellDimension() VTK_OVERRIDE {return 3;}
- int GetNumberOfEdges() VTK_OVERRIDE {return 9;}
- int GetNumberOfFaces() VTK_OVERRIDE {return 5;}
- vtkCell *GetEdge(int edgeId) VTK_OVERRIDE;
- vtkCell *GetFace(int faceId) VTK_OVERRIDE;
- int CellBoundary(int subId, double pcoords[3], vtkIdList *pts) VTK_OVERRIDE;
+ int GetCellType() override {return VTK_WEDGE;}
+ int GetCellDimension() override {return 3;}
+ int GetNumberOfEdges() override {return 9;}
+ int GetNumberOfFaces() override {return 5;}
+ vtkCell *GetEdge(int edgeId) override;
+ vtkCell *GetFace(int faceId) override;
+ int CellBoundary(int subId, double pcoords[3], vtkIdList *pts) override;
void Contour(double value, vtkDataArray *cellScalars,
vtkIncrementalPointLocator *locator, vtkCellArray *verts,
vtkCellArray *lines, vtkCellArray *polys,
vtkPointData *inPd, vtkPointData *outPd,
- vtkCellData *inCd, vtkIdType cellId, vtkCellData *outCd) VTK_OVERRIDE;
+ vtkCellData *inCd, vtkIdType cellId, vtkCellData *outCd) override;
int EvaluatePosition(double x[3], double* closestPoint,
int& subId, double pcoords[3],
- double& dist2, double *weights) VTK_OVERRIDE;
+ double& dist2, double *weights) override;
void EvaluateLocation(int& subId, double pcoords[3], double x[3],
- double *weights) VTK_OVERRIDE;
+ double *weights) override;
int IntersectWithLine(double p1[3], double p2[3], double tol, double& t,
- double x[3], double pcoords[3], int& subId) VTK_OVERRIDE;
- int Triangulate(int index, vtkIdList *ptIds, vtkPoints *pts) VTK_OVERRIDE;
+ double x[3], double pcoords[3], int& subId) override;
+ int Triangulate(int index, vtkIdList *ptIds, vtkPoints *pts) override;
void Derivatives(int subId, double pcoords[3], double *values,
- int dim, double *derivs) VTK_OVERRIDE;
- double *GetParametricCoords() VTK_OVERRIDE;
+ int dim, double *derivs) override;
+ double *GetParametricCoords() override;
//@}
/**
* Return the center of the wedge in parametric coordinates.
*/
- int GetParametricCenter(double pcoords[3]) VTK_OVERRIDE;
+ int GetParametricCenter(double pcoords[3]) override;
/**
* @deprecated Replaced by vtkWedge::InterpolateFunctions as of VTK 5.2
@@ -102,11 +102,11 @@ public:
* Compute the interpolation functions/derivatives
* (aka shape functions/derivatives)
*/
- void InterpolateFunctions(double pcoords[3], double weights[6]) VTK_OVERRIDE
+ void InterpolateFunctions(double pcoords[3], double weights[6]) override
{
vtkWedge::InterpolationFunctions(pcoords,weights);
}
- void InterpolateDerivs(double pcoords[3], double derivs[18]) VTK_OVERRIDE
+ void InterpolateDerivs(double pcoords[3], double derivs[18]) override
{
vtkWedge::InterpolationDerivs(pcoords,derivs);
}
@@ -124,7 +124,7 @@ public:
protected:
vtkWedge();
- ~vtkWedge() VTK_OVERRIDE;
+ ~vtkWedge() override;
vtkLine *Line;
vtkTriangle *Triangle;
diff --git a/Common/DataModel/vtkXMLDataElement.h b/Common/DataModel/vtkXMLDataElement.h
index ef541b3b0c3d9983d88905dcc06b61bcbe0f9cb7..f6a29411243f16e3481e8b8025f51c520b3be2ab 100644
--- a/Common/DataModel/vtkXMLDataElement.h
+++ b/Common/DataModel/vtkXMLDataElement.h
@@ -37,7 +37,7 @@ class VTKCOMMONDATAMODEL_EXPORT vtkXMLDataElement : public vtkObject
{
public:
vtkTypeMacro(vtkXMLDataElement,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkXMLDataElement* New();
//@{
@@ -289,7 +289,7 @@ public:
protected:
vtkXMLDataElement();
- ~vtkXMLDataElement() VTK_OVERRIDE;
+ ~vtkXMLDataElement() override;
// The name of the element from the XML file.
char* Name;
diff --git a/Common/ExecutionModel/Testing/Cxx/TestCopyAttributeData.cxx b/Common/ExecutionModel/Testing/Cxx/TestCopyAttributeData.cxx
index 61b42dd02c0a2969b4f49dd74d12b5cad4a3e8e7..b7fc8fc0b8bb9c5a7cff8363b691ceb01ee0a61d 100644
--- a/Common/ExecutionModel/Testing/Cxx/TestCopyAttributeData.cxx
+++ b/Common/ExecutionModel/Testing/Cxx/TestCopyAttributeData.cxx
@@ -43,12 +43,12 @@ public:
protected:
vtkDummyImageFilter() {};
- ~vtkDummyImageFilter() VTK_OVERRIDE {};
+ ~vtkDummyImageFilter() override {};
int RequestData(
vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
private:
vtkDummyImageFilter(const vtkDummyImageFilter&) VTK_DELETE_FUNCTION;
diff --git a/Common/ExecutionModel/Testing/Cxx/TestMetaData.cxx b/Common/ExecutionModel/Testing/Cxx/TestMetaData.cxx
index 93a24e92f25370c4aecb5602fdb299abdbbd8098..5646ff99a00e44ab4a052df29bf7520c28150b48 100644
--- a/Common/ExecutionModel/Testing/Cxx/TestMetaData.cxx
+++ b/Common/ExecutionModel/Testing/Cxx/TestMetaData.cxx
@@ -56,7 +56,7 @@ protected:
int RequestInformation(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector* outputVector) VTK_OVERRIDE
+ vtkInformationVector* outputVector) override
{
vtkInformation* outInfo = outputVector->GetInformationObject(0);
vtkPolyData* pd = vtkPolyData::New();
@@ -66,7 +66,7 @@ protected:
}
int RequestData(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector* outputVector) VTK_OVERRIDE
+ vtkInformationVector* outputVector) override
{
// Here we verify that a request set at the end of the pipeline
// made it to here properly.
diff --git a/Common/ExecutionModel/Testing/Cxx/TestTemporalSupport.cxx b/Common/ExecutionModel/Testing/Cxx/TestTemporalSupport.cxx
index e421abded2a0334147e7748dfa499e74fef9c9a1..8ad737eafff580cdb0ef0172b5df1a517d4fc74a 100644
--- a/Common/ExecutionModel/Testing/Cxx/TestTemporalSupport.cxx
+++ b/Common/ExecutionModel/Testing/Cxx/TestTemporalSupport.cxx
@@ -42,7 +42,7 @@ public:
vtkGetMacro(NumRequestUpdateTime, int);
vtkGetMacro(NumRequestTimeDependentInformation, int);
- int ProcessRequest(vtkInformation* request, vtkInformationVector** inputVector, vtkInformationVector* outputVector) VTK_OVERRIDE
+ int ProcessRequest(vtkInformation* request, vtkInformationVector** inputVector, vtkInformationVector* outputVector) override
{
if(request->Has(vtkDemandDrivenPipeline::REQUEST_INFORMATION()))
{
@@ -112,7 +112,7 @@ public:
this->HasTimeDependentData=false;
}
- int RequestData(vtkInformation*, vtkInformationVector**, vtkInformationVector* outputVector) VTK_OVERRIDE
+ int RequestData(vtkInformation*, vtkInformationVector**, vtkInformationVector* outputVector) override
{
vtkInformation *outInfo = outputVector->GetInformationObject(0);
vtkImageData *outImage = vtkImageData::SafeDownCast(outInfo->Get(vtkDataObject::DATA_OBJECT()));
@@ -125,7 +125,7 @@ public:
return 1;
}
- int RequestInformation(vtkInformation*, vtkInformationVector**, vtkInformationVector* outputVector) VTK_OVERRIDE
+ int RequestInformation(vtkInformation*, vtkInformationVector**, vtkInformationVector* outputVector) override
{
vtkInformation *outInfo = outputVector->GetInformationObject(0);
double range[2]= {0,9};
@@ -139,7 +139,7 @@ public:
return 1;
}
- int FillOutputPortInformation(int, vtkInformation *info) VTK_OVERRIDE
+ int FillOutputPortInformation(int, vtkInformation *info) override
{
info->Set(vtkDataObject::DATA_TYPE_NAME(), "vtkImageData");
return 1;
@@ -162,21 +162,21 @@ public:
vtkSetMacro(StartTime, double);
vtkSetMacro(TimeIterations, int);
- void PrintSelf(ostream&, vtkIndent) VTK_OVERRIDE{}
+ void PrintSelf(ostream&, vtkIndent) override{}
- int FillInputPortInformation(int, vtkInformation *info) VTK_OVERRIDE
+ int FillInputPortInformation(int, vtkInformation *info) override
{
info->Set(vtkAlgorithm::INPUT_REQUIRED_DATA_TYPE(), "vtkDataObject");
return 1;
}
- int FillOutputPortInformation(int, vtkInformation *info) VTK_OVERRIDE
+ int FillOutputPortInformation(int, vtkInformation *info) override
{
info->Set(vtkDataObject::DATA_TYPE_NAME(), "vtkImageData");
return 1;
}
- int RequestData(vtkInformation* request, vtkInformationVector**in, vtkInformationVector* ) VTK_OVERRIDE
+ int RequestData(vtkInformation* request, vtkInformationVector**in, vtkInformationVector* ) override
{
cout<<"Has TD: "<<
in[0]->GetInformationObject(0)->Get(vtkStreamingDemandDrivenPipeline::TIME_DEPENDENT_INFORMATION())<<endl;
@@ -193,7 +193,7 @@ public:
return 1;
}
- int RequestUpdateExtent(vtkInformation*, vtkInformationVector** inputVector, vtkInformationVector*) VTK_OVERRIDE
+ int RequestUpdateExtent(vtkInformation*, vtkInformationVector** inputVector, vtkInformationVector*) override
{
vtkInformation *inInfo = inputVector[0]->GetInformationObject(0);
double timeStep= this->StartTime + (double)this->TimeIndex;
diff --git a/Common/ExecutionModel/vtkAlgorithm.h b/Common/ExecutionModel/vtkAlgorithm.h
index 99ba75e1f56a7837cbea0544cd77a4dc4783d0ce..06aa5229873de64ddc7b40590ef341f5be36f727 100644
--- a/Common/ExecutionModel/vtkAlgorithm.h
+++ b/Common/ExecutionModel/vtkAlgorithm.h
@@ -55,7 +55,7 @@ class VTKCOMMONEXECUTIONMODEL_EXPORT vtkAlgorithm : public vtkObject
public:
static vtkAlgorithm *New();
vtkTypeMacro(vtkAlgorithm,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Values used for setting the desired output precision for various
@@ -191,8 +191,8 @@ public:
/**
* Participate in garbage collection.
*/
- void Register(vtkObjectBase* o) VTK_OVERRIDE;
- void UnRegister(vtkObjectBase* o) VTK_OVERRIDE;
+ void Register(vtkObjectBase* o) override;
+ void UnRegister(vtkObjectBase* o) override;
//@}
//@{
@@ -719,7 +719,7 @@ public:
protected:
vtkAlgorithm();
- ~vtkAlgorithm() VTK_OVERRIDE;
+ ~vtkAlgorithm() override;
// Keys used to indicate that input/output port information has been
// filled.
@@ -880,7 +880,7 @@ protected:
char *ProgressText;
// Garbage collection support.
- void ReportReferences(vtkGarbageCollector*) VTK_OVERRIDE;
+ void ReportReferences(vtkGarbageCollector*) override;
// executive methods below
diff --git a/Common/ExecutionModel/vtkAlgorithmOutput.h b/Common/ExecutionModel/vtkAlgorithmOutput.h
index 1875ccd955eb1b46c704cbd24286d29ebd86b630..615cedebe2c580f1869f481e5fab312381ae1dcd 100644
--- a/Common/ExecutionModel/vtkAlgorithmOutput.h
+++ b/Common/ExecutionModel/vtkAlgorithmOutput.h
@@ -38,7 +38,7 @@ class VTKCOMMONEXECUTIONMODEL_EXPORT vtkAlgorithmOutput : public vtkObject
public:
static vtkAlgorithmOutput *New();
vtkTypeMacro(vtkAlgorithmOutput,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
void SetIndex(int index);
int GetIndex();
@@ -48,7 +48,7 @@ public:
protected:
vtkAlgorithmOutput();
- ~vtkAlgorithmOutput() VTK_OVERRIDE;
+ ~vtkAlgorithmOutput() override;
int Index;
vtkAlgorithm* Producer;
diff --git a/Common/ExecutionModel/vtkAnnotationLayersAlgorithm.h b/Common/ExecutionModel/vtkAnnotationLayersAlgorithm.h
index 55501407c4f38a8dcf6b34cccbab1da42209af06..4c752acc5594f37b5866e33f41b8c2dd8592ddc6 100644
--- a/Common/ExecutionModel/vtkAnnotationLayersAlgorithm.h
+++ b/Common/ExecutionModel/vtkAnnotationLayersAlgorithm.h
@@ -44,14 +44,14 @@ class VTKCOMMONEXECUTIONMODEL_EXPORT vtkAnnotationLayersAlgorithm : public vtkAl
public:
static vtkAnnotationLayersAlgorithm *New();
vtkTypeMacro(vtkAnnotationLayersAlgorithm,vtkAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* see vtkAlgorithm for details
*/
int ProcessRequest(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
/**
* Get the output data object for a port on this algorithm.
@@ -69,7 +69,7 @@ public:
protected:
vtkAnnotationLayersAlgorithm();
- ~vtkAnnotationLayersAlgorithm() VTK_OVERRIDE;
+ ~vtkAnnotationLayersAlgorithm() override;
// convenience method
virtual int RequestInformation(vtkInformation* request,
@@ -93,8 +93,8 @@ protected:
vtkInformationVector*);
// see algorithm for more info
- int FillOutputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillOutputPortInformation(int port, vtkInformation* info) override;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
private:
vtkAnnotationLayersAlgorithm(const vtkAnnotationLayersAlgorithm&) VTK_DELETE_FUNCTION;
diff --git a/Common/ExecutionModel/vtkArrayDataAlgorithm.h b/Common/ExecutionModel/vtkArrayDataAlgorithm.h
index 4483d0d185acf5df35bc99d6621fe6b6ca76ab97..a31542d766100aa9ead3fd93d1c054333014c4bb 100644
--- a/Common/ExecutionModel/vtkArrayDataAlgorithm.h
+++ b/Common/ExecutionModel/vtkArrayDataAlgorithm.h
@@ -55,14 +55,14 @@ class VTKCOMMONEXECUTIONMODEL_EXPORT vtkArrayDataAlgorithm : public vtkAlgorithm
public:
static vtkArrayDataAlgorithm *New();
vtkTypeMacro(vtkArrayDataAlgorithm,vtkAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* see vtkAlgorithm for details
*/
int ProcessRequest(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
/**
* Get the output data object for a port on this algorithm.
@@ -80,7 +80,7 @@ public:
protected:
vtkArrayDataAlgorithm();
- ~vtkArrayDataAlgorithm() VTK_OVERRIDE;
+ ~vtkArrayDataAlgorithm() override;
// convenience method
virtual int RequestInformation(vtkInformation* request,
@@ -104,8 +104,8 @@ protected:
vtkInformationVector*);
// see algorithm for more info
- int FillOutputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillOutputPortInformation(int port, vtkInformation* info) override;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
private:
vtkArrayDataAlgorithm(const vtkArrayDataAlgorithm&) VTK_DELETE_FUNCTION;
diff --git a/Common/ExecutionModel/vtkCachedStreamingDemandDrivenPipeline.h b/Common/ExecutionModel/vtkCachedStreamingDemandDrivenPipeline.h
index ff3b6e4909e42205ec41176b659c3e1259709927..0903c79e33c33b97c96398d801a3b13ae7f5c88e 100644
--- a/Common/ExecutionModel/vtkCachedStreamingDemandDrivenPipeline.h
+++ b/Common/ExecutionModel/vtkCachedStreamingDemandDrivenPipeline.h
@@ -34,7 +34,7 @@ public:
static vtkCachedStreamingDemandDrivenPipeline* New();
vtkTypeMacro(vtkCachedStreamingDemandDrivenPipeline,
vtkStreamingDemandDrivenPipeline);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -47,14 +47,14 @@ public:
protected:
vtkCachedStreamingDemandDrivenPipeline();
- ~vtkCachedStreamingDemandDrivenPipeline() VTK_OVERRIDE;
+ ~vtkCachedStreamingDemandDrivenPipeline() override;
int NeedToExecuteData(int outputPort,
vtkInformationVector** inInfoVec,
- vtkInformationVector* outInfoVec) VTK_OVERRIDE;
+ vtkInformationVector* outInfoVec) override;
int ExecuteData(vtkInformation* request,
vtkInformationVector** inInfoVec,
- vtkInformationVector* outInfoVec) VTK_OVERRIDE;
+ vtkInformationVector* outInfoVec) override;
int CacheSize;
diff --git a/Common/ExecutionModel/vtkCastToConcrete.h b/Common/ExecutionModel/vtkCastToConcrete.h
index 17e18d7aab79c86a170c0b2689e934fe7e3e08c5..8fc9b18bccee8cbe97493eac2ed54a59a306a0ce 100644
--- a/Common/ExecutionModel/vtkCastToConcrete.h
+++ b/Common/ExecutionModel/vtkCastToConcrete.h
@@ -50,14 +50,14 @@ class VTKCOMMONEXECUTIONMODEL_EXPORT vtkCastToConcrete : public vtkDataSetAlgori
public:
static vtkCastToConcrete *New();
vtkTypeMacro(vtkCastToConcrete,vtkDataSetAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkCastToConcrete() {}
- ~vtkCastToConcrete() VTK_OVERRIDE {}
+ ~vtkCastToConcrete() override {}
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE; //insures compatibility; satisfies abstract api in vtkFilter
- int RequestInformation(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override; //insures compatibility; satisfies abstract api in vtkFilter
+ int RequestInformation(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
private:
vtkCastToConcrete(const vtkCastToConcrete&) VTK_DELETE_FUNCTION;
void operator=(const vtkCastToConcrete&) VTK_DELETE_FUNCTION;
diff --git a/Common/ExecutionModel/vtkCompositeDataPipeline.h b/Common/ExecutionModel/vtkCompositeDataPipeline.h
index 79094713b6ee87f6fab61bd064f7a8ec4aaa1d4e..1a9a4d49979de25ac71c135e817c97e461055af5 100644
--- a/Common/ExecutionModel/vtkCompositeDataPipeline.h
+++ b/Common/ExecutionModel/vtkCompositeDataPipeline.h
@@ -62,7 +62,7 @@ class VTKCOMMONEXECUTIONMODEL_EXPORT vtkCompositeDataPipeline :
public:
static vtkCompositeDataPipeline* New();
vtkTypeMacro(vtkCompositeDataPipeline,vtkStreamingDemandDrivenPipeline);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Returns the data object stored with the DATA_OBJECT() in the
@@ -115,35 +115,35 @@ public:
protected:
vtkCompositeDataPipeline();
- ~vtkCompositeDataPipeline() VTK_OVERRIDE;
+ ~vtkCompositeDataPipeline() override;
- int ForwardUpstream(vtkInformation* request) VTK_OVERRIDE;
+ int ForwardUpstream(vtkInformation* request) override;
virtual int ForwardUpstream(int i, int j, vtkInformation* request);
// Copy information for the given request.
void CopyDefaultInformation(vtkInformation* request, int direction,
vtkInformationVector** inInfoVec,
- vtkInformationVector* outInfoVec) VTK_OVERRIDE;
+ vtkInformationVector* outInfoVec) override;
virtual void PushInformation(vtkInformation*);
virtual void PopInformation (vtkInformation*);
int ExecuteDataObject(vtkInformation* request,
vtkInformationVector** inInfo,
- vtkInformationVector* outInfo) VTK_OVERRIDE;
+ vtkInformationVector* outInfo) override;
int ExecuteData(vtkInformation* request,
vtkInformationVector** inInfoVec,
- vtkInformationVector* outInfoVec) VTK_OVERRIDE;
+ vtkInformationVector* outInfoVec) override;
void ExecuteDataStart(vtkInformation* request,
vtkInformationVector** inInfoVec,
- vtkInformationVector* outInfoVec) VTK_OVERRIDE;
+ vtkInformationVector* outInfoVec) override;
// Override this check to account for update extent.
int NeedToExecuteData(int outputPort,
vtkInformationVector** inInfoVec,
- vtkInformationVector* outInfoVec) VTK_OVERRIDE;
+ vtkInformationVector* outInfoVec) override;
// Check whether the data object in the pipeline information for an
// output port exists and has a valid type.
@@ -182,14 +182,14 @@ protected:
int& compositePort);
int InputTypeIsValid(int port, int index,
- vtkInformationVector **inInfoVec) VTK_OVERRIDE;
+ vtkInformationVector **inInfoVec) override;
vtkInformation* InformationCache;
vtkInformation* GenericRequest;
vtkInformation* InformationRequest;
- void ResetPipelineInformation(int port, vtkInformation*) VTK_OVERRIDE;
+ void ResetPipelineInformation(int port, vtkInformation*) override;
/**
* Tries to create the best possible composite data output for the given input
@@ -206,7 +206,7 @@ protected:
// Override this to handle UPDATE_COMPOSITE_INDICES().
void MarkOutputsGenerated(vtkInformation* request,
vtkInformationVector** inInfoVec,
- vtkInformationVector* outInfoVec) VTK_OVERRIDE;
+ vtkInformationVector* outInfoVec) override;
int NeedToExecuteBasedOnCompositeIndices(vtkInformation* outInfo);
diff --git a/Common/ExecutionModel/vtkCompositeDataSetAlgorithm.h b/Common/ExecutionModel/vtkCompositeDataSetAlgorithm.h
index a4af56bd4f5d8b6406179dbb42ad5138d8cb1a89..e1effcfdbd15814e5d57b4a3ce257e23fd2a8046 100644
--- a/Common/ExecutionModel/vtkCompositeDataSetAlgorithm.h
+++ b/Common/ExecutionModel/vtkCompositeDataSetAlgorithm.h
@@ -34,7 +34,7 @@ class VTKCOMMONEXECUTIONMODEL_EXPORT vtkCompositeDataSetAlgorithm : public vtkAl
public:
static vtkCompositeDataSetAlgorithm *New();
vtkTypeMacro(vtkCompositeDataSetAlgorithm,vtkAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -59,11 +59,11 @@ public:
*/
int ProcessRequest(vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
protected:
vtkCompositeDataSetAlgorithm();
- ~vtkCompositeDataSetAlgorithm() VTK_OVERRIDE {}
+ ~vtkCompositeDataSetAlgorithm() override {}
/**
* This is called by the superclass.
@@ -103,11 +103,11 @@ protected:
//@}
// Create a default executive.
- vtkExecutive* CreateDefaultExecutive() VTK_OVERRIDE;
+ vtkExecutive* CreateDefaultExecutive() override;
// see algorithm for more info
- int FillOutputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillOutputPortInformation(int port, vtkInformation* info) override;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
vtkDataObject *GetInput(int port);
diff --git a/Common/ExecutionModel/vtkDataObjectAlgorithm.h b/Common/ExecutionModel/vtkDataObjectAlgorithm.h
index 38cf8f0a2e3c8719685e2bc28fcd6715f7ee629e..32518e9ed927041453f761897a2c29fb62bfddfe 100644
--- a/Common/ExecutionModel/vtkDataObjectAlgorithm.h
+++ b/Common/ExecutionModel/vtkDataObjectAlgorithm.h
@@ -45,7 +45,7 @@ class VTKCOMMONEXECUTIONMODEL_EXPORT vtkDataObjectAlgorithm : public vtkAlgorith
public:
static vtkDataObjectAlgorithm *New();
vtkTypeMacro(vtkDataObjectAlgorithm,vtkAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -61,7 +61,7 @@ public:
*/
int ProcessRequest(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
// this method is not recommended for use, but lots of old style filters
// use it
@@ -90,7 +90,7 @@ public:
protected:
vtkDataObjectAlgorithm();
- ~vtkDataObjectAlgorithm() VTK_OVERRIDE;
+ ~vtkDataObjectAlgorithm() override;
// convenience method
virtual int RequestInformation(vtkInformation* request,
@@ -127,8 +127,8 @@ protected:
}
// see algorithm for more info
- int FillOutputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillOutputPortInformation(int port, vtkInformation* info) override;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
private:
vtkDataObjectAlgorithm(const vtkDataObjectAlgorithm&) VTK_DELETE_FUNCTION;
diff --git a/Common/ExecutionModel/vtkDataSetAlgorithm.h b/Common/ExecutionModel/vtkDataSetAlgorithm.h
index d22af39455dbfd1ee51074ab044d87de74225c1c..c03bc66041acdc4b6fc38b6df4a053ced383a343 100644
--- a/Common/ExecutionModel/vtkDataSetAlgorithm.h
+++ b/Common/ExecutionModel/vtkDataSetAlgorithm.h
@@ -50,7 +50,7 @@ class VTKCOMMONEXECUTIONMODEL_EXPORT vtkDataSetAlgorithm : public vtkAlgorithm
public:
static vtkDataSetAlgorithm *New();
vtkTypeMacro(vtkDataSetAlgorithm,vtkAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -125,11 +125,11 @@ public:
*/
int ProcessRequest(vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
protected:
vtkDataSetAlgorithm();
- ~vtkDataSetAlgorithm() VTK_OVERRIDE {}
+ ~vtkDataSetAlgorithm() override {}
/**
* This is called within ProcessRequest when a request asks for
@@ -183,8 +183,8 @@ protected:
// see algorithm for more info
- int FillOutputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillOutputPortInformation(int port, vtkInformation* info) override;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
vtkDataObject *GetInput(int port);
diff --git a/Common/ExecutionModel/vtkDemandDrivenPipeline.h b/Common/ExecutionModel/vtkDemandDrivenPipeline.h
index 9f7977ee2d7f4b76cc2ade4e495dd7aa0c189f1f..116d79a0dacffe780a76cd9d2dc0fc42ce460d13 100644
--- a/Common/ExecutionModel/vtkDemandDrivenPipeline.h
+++ b/Common/ExecutionModel/vtkDemandDrivenPipeline.h
@@ -50,7 +50,7 @@ class VTKCOMMONEXECUTIONMODEL_EXPORT vtkDemandDrivenPipeline : public vtkExecuti
public:
static vtkDemandDrivenPipeline* New();
vtkTypeMacro(vtkDemandDrivenPipeline,vtkExecutive);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Generalized interface for asking the executive to fulfill update
@@ -58,7 +58,7 @@ public:
*/
int ProcessRequest(vtkInformation* request,
vtkInformationVector** inInfo,
- vtkInformationVector* outInfo) VTK_OVERRIDE;
+ vtkInformationVector* outInfo) override;
/**
* Implement the pipeline modified time request.
@@ -68,15 +68,15 @@ public:
vtkInformationVector** inInfoVec,
vtkInformationVector* outInfoVec,
int requestFromOutputPort,
- vtkMTimeType* mtime) VTK_OVERRIDE;
+ vtkMTimeType* mtime) override;
//@{
/**
* Bring the algorithm's outputs up-to-date. Returns 1 for success
* and 0 for failure.
*/
- int Update() VTK_OVERRIDE;
- int Update(int port) VTK_OVERRIDE;
+ int Update() override;
+ int Update(int port) override;
//@}
//@{
@@ -107,12 +107,12 @@ public:
* not actually produce data, but does create the data object that
* will store data produced during the UpdateData step.
*/
- int UpdateDataObject() VTK_OVERRIDE;
+ int UpdateDataObject() override;
/**
* Bring the output information up to date.
*/
- int UpdateInformation() VTK_OVERRIDE;
+ int UpdateInformation() override;
/**
* Bring the output data up to date. This should be called only
@@ -170,7 +170,7 @@ public:
protected:
vtkDemandDrivenPipeline();
- ~vtkDemandDrivenPipeline() VTK_OVERRIDE;
+ ~vtkDemandDrivenPipeline() override;
// Helper methods to send requests to the algorithm.
virtual int ExecuteDataObject(vtkInformation* request,
@@ -185,7 +185,7 @@ protected:
// Reset the pipeline update values in the given output information object.
- void ResetPipelineInformation(int, vtkInformation*) VTK_OVERRIDE;
+ void ResetPipelineInformation(int, vtkInformation*) override;
// Check whether the data object in the pipeline information for an
// output port exists and has a valid type.
diff --git a/Common/ExecutionModel/vtkDirectedGraphAlgorithm.h b/Common/ExecutionModel/vtkDirectedGraphAlgorithm.h
index 2e4a98e4fdada6ce2b5d472e1a9c1e8ca3da35ae..72f4a42e02c90b8bc927ce0666dd5aba42e08618 100644
--- a/Common/ExecutionModel/vtkDirectedGraphAlgorithm.h
+++ b/Common/ExecutionModel/vtkDirectedGraphAlgorithm.h
@@ -54,14 +54,14 @@ class VTKCOMMONEXECUTIONMODEL_EXPORT vtkDirectedGraphAlgorithm : public vtkAlgor
public:
static vtkDirectedGraphAlgorithm *New();
vtkTypeMacro(vtkDirectedGraphAlgorithm,vtkAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* see vtkAlgorithm for details
*/
int ProcessRequest(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
/**
* Get the output data object for a port on this algorithm.
@@ -79,7 +79,7 @@ public:
protected:
vtkDirectedGraphAlgorithm();
- ~vtkDirectedGraphAlgorithm() VTK_OVERRIDE;
+ ~vtkDirectedGraphAlgorithm() override;
// convenience method
virtual int RequestInformation(vtkInformation* request,
@@ -103,8 +103,8 @@ protected:
vtkInformationVector*);
// see algorithm for more info
- int FillOutputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillOutputPortInformation(int port, vtkInformation* info) override;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
private:
vtkDirectedGraphAlgorithm(const vtkDirectedGraphAlgorithm&) VTK_DELETE_FUNCTION;
diff --git a/Common/ExecutionModel/vtkEnsembleSource.h b/Common/ExecutionModel/vtkEnsembleSource.h
index f9b8445178c641abe5f44d0e88a2141483cbfdb0..f435aca0612df0bf32c9d368f4fc2a2a2312e3bb 100644
--- a/Common/ExecutionModel/vtkEnsembleSource.h
+++ b/Common/ExecutionModel/vtkEnsembleSource.h
@@ -41,7 +41,7 @@ class VTKCOMMONEXECUTIONMODEL_EXPORT vtkEnsembleSource : public vtkAlgorithm
public:
static vtkEnsembleSource *New();
vtkTypeMacro(vtkEnsembleSource,vtkAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Add an algorithm (source) that will produce the next ensemble member.
@@ -90,7 +90,7 @@ public:
protected:
vtkEnsembleSource();
- ~vtkEnsembleSource() VTK_OVERRIDE;
+ ~vtkEnsembleSource() override;
static vtkInformationIntegerKey* DATA_MEMBER();
@@ -98,8 +98,8 @@ protected:
int ProcessRequest(vtkInformation *request,
vtkInformationVector **inputVector,
- vtkInformationVector *outputVector) VTK_OVERRIDE;
- int FillOutputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
+ vtkInformationVector *outputVector) override;
+ int FillOutputPortInformation(int, vtkInformation*) override;
vtkAlgorithm* GetCurrentReader(vtkInformation*);
diff --git a/Common/ExecutionModel/vtkExecutive.h b/Common/ExecutionModel/vtkExecutive.h
index 98839a7cd626dee036b7cbdf911053581e3bc0e9..7d65523a3f13db08eb509a3929954088aa607b57 100644
--- a/Common/ExecutionModel/vtkExecutive.h
+++ b/Common/ExecutionModel/vtkExecutive.h
@@ -47,7 +47,7 @@ class VTKCOMMONEXECUTIONMODEL_EXPORT vtkExecutive : public vtkObject
{
public:
vtkTypeMacro(vtkExecutive,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Get the algorithm to which this executive has been assigned.
@@ -181,8 +181,8 @@ public:
/**
* Participate in garbage collection.
*/
- void Register(vtkObjectBase* o) VTK_OVERRIDE;
- void UnRegister(vtkObjectBase* o) VTK_OVERRIDE;
+ void Register(vtkObjectBase* o) override;
+ void UnRegister(vtkObjectBase* o) override;
//@}
/**
@@ -228,7 +228,7 @@ public:
protected:
vtkExecutive();
- ~vtkExecutive() VTK_OVERRIDE;
+ ~vtkExecutive() override;
// Helper methods for subclasses.
int InputPortIndexInRange(int port, const char* action);
@@ -258,7 +258,7 @@ protected:
virtual int UpdateDataObject()=0;
// Garbage collection support.
- void ReportReferences(vtkGarbageCollector*) VTK_OVERRIDE;
+ void ReportReferences(vtkGarbageCollector*) override;
virtual void SetAlgorithm(vtkAlgorithm* algorithm);
diff --git a/Common/ExecutionModel/vtkExtentRCBPartitioner.h b/Common/ExecutionModel/vtkExtentRCBPartitioner.h
index b41df9ae7244f2d127fe64cee6d053b8daa78f0e..4a4242f7c8f86aca4535e853f96e4000bfd493ea 100644
--- a/Common/ExecutionModel/vtkExtentRCBPartitioner.h
+++ b/Common/ExecutionModel/vtkExtentRCBPartitioner.h
@@ -34,7 +34,7 @@ class VTKCOMMONEXECUTIONMODEL_EXPORT vtkExtentRCBPartitioner : public vtkObject
public:
static vtkExtentRCBPartitioner *New();
vtkTypeMacro(vtkExtentRCBPartitioner,vtkObject);
- void PrintSelf(ostream &oss, vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf(ostream &oss, vtkIndent indent ) override;
//@{
/**
@@ -106,7 +106,7 @@ class VTKCOMMONEXECUTIONMODEL_EXPORT vtkExtentRCBPartitioner : public vtkObject
protected:
vtkExtentRCBPartitioner();
- ~vtkExtentRCBPartitioner() VTK_OVERRIDE;
+ ~vtkExtentRCBPartitioner() override;
//@{
/**
diff --git a/Common/ExecutionModel/vtkExtentSplitter.h b/Common/ExecutionModel/vtkExtentSplitter.h
index b8d33c110a8a50c3f976cbf07938d33c343d9779..cbdd6da238ca9d4c7346036ba401a5e42dcd9754 100644
--- a/Common/ExecutionModel/vtkExtentSplitter.h
+++ b/Common/ExecutionModel/vtkExtentSplitter.h
@@ -38,7 +38,7 @@ class VTKCOMMONEXECUTIONMODEL_EXPORT vtkExtentSplitter : public vtkObject
{
public:
vtkTypeMacro(vtkExtentSplitter,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkExtentSplitter *New();
//@{
@@ -111,7 +111,7 @@ public:
protected:
vtkExtentSplitter();
- ~vtkExtentSplitter() VTK_OVERRIDE;
+ ~vtkExtentSplitter() override;
// Internal utility methods.
void SplitExtent(int* extent, int* subextent);
diff --git a/Common/ExecutionModel/vtkExtentTranslator.h b/Common/ExecutionModel/vtkExtentTranslator.h
index 52666c6df15d9fc7b8399c4c4946bed1e66548e5..df94dd08af7a47f2eb16b32467f95f58ae86ef02 100644
--- a/Common/ExecutionModel/vtkExtentTranslator.h
+++ b/Common/ExecutionModel/vtkExtentTranslator.h
@@ -37,7 +37,7 @@ public:
static vtkExtentTranslator *New();
vtkTypeMacro(vtkExtentTranslator,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -118,7 +118,7 @@ public:
protected:
vtkExtentTranslator();
- ~vtkExtentTranslator() VTK_OVERRIDE;
+ ~vtkExtentTranslator() override;
static vtkInformationIntegerKey* DATA_SPLIT_MODE();
diff --git a/Common/ExecutionModel/vtkGraphAlgorithm.h b/Common/ExecutionModel/vtkGraphAlgorithm.h
index 340733b95bfa3f5e128794ce8eea4ce53f5a1c8e..af9638cf99bc0f7622f5779132ea010e1bfb935d 100644
--- a/Common/ExecutionModel/vtkGraphAlgorithm.h
+++ b/Common/ExecutionModel/vtkGraphAlgorithm.h
@@ -53,14 +53,14 @@ class VTKCOMMONEXECUTIONMODEL_EXPORT vtkGraphAlgorithm : public vtkAlgorithm
public:
static vtkGraphAlgorithm *New();
vtkTypeMacro(vtkGraphAlgorithm,vtkAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* see vtkAlgorithm for details
*/
int ProcessRequest(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
/**
* Get the output data object for a port on this algorithm.
@@ -78,7 +78,7 @@ public:
protected:
vtkGraphAlgorithm();
- ~vtkGraphAlgorithm() VTK_OVERRIDE;
+ ~vtkGraphAlgorithm() override;
// convenience method
virtual int RequestInformation(vtkInformation* request,
@@ -107,8 +107,8 @@ protected:
vtkInformationVector*);
// see algorithm for more info
- int FillOutputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillOutputPortInformation(int port, vtkInformation* info) override;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
private:
vtkGraphAlgorithm(const vtkGraphAlgorithm&) VTK_DELETE_FUNCTION;
diff --git a/Common/ExecutionModel/vtkHierarchicalBoxDataSetAlgorithm.h b/Common/ExecutionModel/vtkHierarchicalBoxDataSetAlgorithm.h
index dad84a264d904636d07d7cc38f0e40cc120f93ed..59f197e63aaca72ba7ec9a8821e3835950750dfe 100644
--- a/Common/ExecutionModel/vtkHierarchicalBoxDataSetAlgorithm.h
+++ b/Common/ExecutionModel/vtkHierarchicalBoxDataSetAlgorithm.h
@@ -34,7 +34,7 @@ class VTKCOMMONEXECUTIONMODEL_EXPORT vtkHierarchicalBoxDataSetAlgorithm : public
public:
static vtkHierarchicalBoxDataSetAlgorithm* New();
vtkTypeMacro(vtkHierarchicalBoxDataSetAlgorithm, vtkAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -59,11 +59,11 @@ public:
*/
int ProcessRequest(vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
protected:
vtkHierarchicalBoxDataSetAlgorithm();
- ~vtkHierarchicalBoxDataSetAlgorithm() VTK_OVERRIDE;
+ ~vtkHierarchicalBoxDataSetAlgorithm() override;
/**
* This is called by the superclass.
@@ -103,11 +103,11 @@ protected:
//@}
// Create a default executive.
- vtkExecutive* CreateDefaultExecutive() VTK_OVERRIDE;
+ vtkExecutive* CreateDefaultExecutive() override;
// see algorithm for more info
- int FillOutputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillOutputPortInformation(int port, vtkInformation* info) override;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
vtkDataObject *GetInput(int port);
diff --git a/Common/ExecutionModel/vtkHyperOctreeAlgorithm.h b/Common/ExecutionModel/vtkHyperOctreeAlgorithm.h
index 3f3cfcf152953fd762fe410e47de376a0de04712..c038fb3139b18ad2c535196a37d28ef03bcd5d3e 100644
--- a/Common/ExecutionModel/vtkHyperOctreeAlgorithm.h
+++ b/Common/ExecutionModel/vtkHyperOctreeAlgorithm.h
@@ -42,7 +42,7 @@ class VTKCOMMONEXECUTIONMODEL_EXPORT vtkHyperOctreeAlgorithm : public vtkAlgorit
{
public:
vtkTypeMacro(vtkHyperOctreeAlgorithm,vtkAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -58,7 +58,7 @@ public:
*/
int ProcessRequest(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
// this method is not recommended for use, but lots of old style filters
// use it
@@ -88,7 +88,7 @@ public:
protected:
vtkHyperOctreeAlgorithm();
- ~vtkHyperOctreeAlgorithm() VTK_OVERRIDE;
+ ~vtkHyperOctreeAlgorithm() override;
// convenience method
virtual int RequestInformation(vtkInformation* request,
@@ -112,8 +112,8 @@ protected:
vtkInformationVector*);
// see algorithm for more info
- int FillOutputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillOutputPortInformation(int port, vtkInformation* info) override;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
private:
vtkHyperOctreeAlgorithm(const vtkHyperOctreeAlgorithm&) VTK_DELETE_FUNCTION;
diff --git a/Common/ExecutionModel/vtkHyperTreeGridAlgorithm.h b/Common/ExecutionModel/vtkHyperTreeGridAlgorithm.h
index b65335dcc8610d62742fdef3a4f6b57f040ef79e..a92a144b2f3943e746c8411ce54db0cb5826d4b6 100644
--- a/Common/ExecutionModel/vtkHyperTreeGridAlgorithm.h
+++ b/Common/ExecutionModel/vtkHyperTreeGridAlgorithm.h
@@ -47,7 +47,7 @@ class VTKCOMMONEXECUTIONMODEL_EXPORT vtkHyperTreeGridAlgorithm : public vtkAlgor
{
public:
vtkTypeMacro(vtkHyperTreeGridAlgorithm,vtkAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -87,7 +87,7 @@ public:
*/
virtual int ProcessRequest( vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
//@{
/**
@@ -111,7 +111,7 @@ public:
protected:
vtkHyperTreeGridAlgorithm();
- ~vtkHyperTreeGridAlgorithm() VTK_OVERRIDE;
+ ~vtkHyperTreeGridAlgorithm() override;
// convenience method
virtual int RequestInformation( vtkInformation*,
@@ -145,8 +145,8 @@ protected:
/**
* Define default input and output port types
*/
- int FillInputPortInformation( int, vtkInformation* ) VTK_OVERRIDE;
- int FillOutputPortInformation( int, vtkInformation* ) VTK_OVERRIDE;
+ int FillInputPortInformation( int, vtkInformation* ) override;
+ int FillOutputPortInformation( int, vtkInformation* ) override;
//@}
vtkDataSetAttributes* InData;
diff --git a/Common/ExecutionModel/vtkImageAlgorithm.h b/Common/ExecutionModel/vtkImageAlgorithm.h
index ae120da041ef52bbc8f6968fe827e7b8e64a5b85..2c3491c90524fbd0b5c7ab3b6f9ad45cfb565ab5 100644
--- a/Common/ExecutionModel/vtkImageAlgorithm.h
+++ b/Common/ExecutionModel/vtkImageAlgorithm.h
@@ -38,7 +38,7 @@ class VTKCOMMONEXECUTIONMODEL_EXPORT vtkImageAlgorithm : public vtkAlgorithm
{
public:
vtkTypeMacro(vtkImageAlgorithm,vtkAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -56,7 +56,7 @@ public:
*/
int ProcessRequest(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
//@{
/**
@@ -91,7 +91,7 @@ public:
protected:
vtkImageAlgorithm();
- ~vtkImageAlgorithm() VTK_OVERRIDE;
+ ~vtkImageAlgorithm() override;
/**
* Subclasses can reimplement this method to collect information
@@ -175,8 +175,8 @@ protected:
* more than a single input or single output.
* See vtkAlgorithm for more information.
*/
- int FillOutputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillOutputPortInformation(int port, vtkInformation* info) override;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
//@}
private:
diff --git a/Common/ExecutionModel/vtkImageInPlaceFilter.h b/Common/ExecutionModel/vtkImageInPlaceFilter.h
index 85f756de8b52ec69ce10b43c15570197aff3ff77..fc6756a6fe142bae2139f63160055df8d57f105f 100644
--- a/Common/ExecutionModel/vtkImageInPlaceFilter.h
+++ b/Common/ExecutionModel/vtkImageInPlaceFilter.h
@@ -32,15 +32,15 @@ class VTKCOMMONEXECUTIONMODEL_EXPORT vtkImageInPlaceFilter : public vtkImageAlgo
{
public:
vtkTypeMacro(vtkImageInPlaceFilter,vtkImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkImageInPlaceFilter();
- ~vtkImageInPlaceFilter() VTK_OVERRIDE;
+ ~vtkImageInPlaceFilter() override;
int RequestData(vtkInformation *request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
void CopyData(vtkImageData *in, vtkImageData *out, int* outExt);
diff --git a/Common/ExecutionModel/vtkImageToStructuredGrid.h b/Common/ExecutionModel/vtkImageToStructuredGrid.h
index ad106b6474677159461cdda1b0345418fc19642e..a1955e76c7058def26b31f56886ec5c23eb4b033 100644
--- a/Common/ExecutionModel/vtkImageToStructuredGrid.h
+++ b/Common/ExecutionModel/vtkImageToStructuredGrid.h
@@ -38,16 +38,16 @@ class VTKCOMMONEXECUTIONMODEL_EXPORT vtkImageToStructuredGrid:
public:
static vtkImageToStructuredGrid* New();
vtkTypeMacro(vtkImageToStructuredGrid,vtkStructuredGridAlgorithm);
- void PrintSelf(ostream &oss, vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf(ostream &oss, vtkIndent indent ) override;
protected:
vtkImageToStructuredGrid();
- ~vtkImageToStructuredGrid() VTK_OVERRIDE;
+ ~vtkImageToStructuredGrid() override;
int RequestData(
vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector ) VTK_OVERRIDE;
+ vtkInformationVector* outputVector ) override;
//@{
/**
@@ -57,8 +57,8 @@ class VTKCOMMONEXECUTIONMODEL_EXPORT vtkImageToStructuredGrid:
void CopyCellData( vtkImageData*, vtkStructuredGrid* );
//@}
- int FillInputPortInformation(int, vtkInformation* info) VTK_OVERRIDE;
- int FillOutputPortInformation(int, vtkInformation* info ) VTK_OVERRIDE;
+ int FillInputPortInformation(int, vtkInformation* info) override;
+ int FillOutputPortInformation(int, vtkInformation* info ) override;
private:
vtkImageToStructuredGrid(
diff --git a/Common/ExecutionModel/vtkImageToStructuredPoints.h b/Common/ExecutionModel/vtkImageToStructuredPoints.h
index d5824822478d6b62aa03c85fab38248e5a3715e9..93a56b1d46db051d9a2a840916a3371e912f3578 100644
--- a/Common/ExecutionModel/vtkImageToStructuredPoints.h
+++ b/Common/ExecutionModel/vtkImageToStructuredPoints.h
@@ -38,7 +38,7 @@ class VTKCOMMONEXECUTIONMODEL_EXPORT vtkImageToStructuredPoints : public vtkImag
public:
static vtkImageToStructuredPoints *New();
vtkTypeMacro(vtkImageToStructuredPoints,vtkImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -55,17 +55,17 @@ public:
protected:
vtkImageToStructuredPoints();
- ~vtkImageToStructuredPoints() VTK_OVERRIDE;
+ ~vtkImageToStructuredPoints() override;
// to translate the wholeExtent to have min 0 ( I do not like this hack).
int Translate[3];
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int RequestInformation (vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int RequestUpdateExtent(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int RequestInformation (vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int RequestUpdateExtent(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
- int FillOutputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
- int FillInputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
+ int FillOutputPortInformation(int, vtkInformation*) override;
+ int FillInputPortInformation(int, vtkInformation*) override;
private:
vtkImageToStructuredPoints(const vtkImageToStructuredPoints&) VTK_DELETE_FUNCTION;
diff --git a/Common/ExecutionModel/vtkInformationDataObjectMetaDataKey.h b/Common/ExecutionModel/vtkInformationDataObjectMetaDataKey.h
index bc64021f86cdb52691c4b27085571099236cc610..a004eae80601debc3d82eeeacbc2b43035b16421 100644
--- a/Common/ExecutionModel/vtkInformationDataObjectMetaDataKey.h
+++ b/Common/ExecutionModel/vtkInformationDataObjectMetaDataKey.h
@@ -32,10 +32,10 @@ class VTKCOMMONEXECUTIONMODEL_EXPORT vtkInformationDataObjectMetaDataKey : publi
{
public:
vtkTypeMacro(vtkInformationDataObjectMetaDataKey,vtkInformationDataObjectKey);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
vtkInformationDataObjectMetaDataKey(const char* name, const char* location);
- ~vtkInformationDataObjectMetaDataKey() VTK_OVERRIDE;
+ ~vtkInformationDataObjectMetaDataKey() override;
/**
* This method simply returns a new vtkInformationDataObjectMetaDataKey, given a
@@ -54,7 +54,7 @@ public:
*/
void CopyDefaultInformation(vtkInformation* request,
vtkInformation* fromInfo,
- vtkInformation* toInfo) VTK_OVERRIDE;
+ vtkInformation* toInfo) override;
private:
vtkInformationDataObjectMetaDataKey(const vtkInformationDataObjectMetaDataKey&) VTK_DELETE_FUNCTION;
diff --git a/Common/ExecutionModel/vtkInformationExecutivePortKey.h b/Common/ExecutionModel/vtkInformationExecutivePortKey.h
index 70832fea63b8ea46d0eeedf4587d307a9e7dbe34..4c5cc162acebc8225fcb32f9f5be18a550fde9f1 100644
--- a/Common/ExecutionModel/vtkInformationExecutivePortKey.h
+++ b/Common/ExecutionModel/vtkInformationExecutivePortKey.h
@@ -35,10 +35,10 @@ class VTKCOMMONEXECUTIONMODEL_EXPORT vtkInformationExecutivePortKey : public vtk
{
public:
vtkTypeMacro(vtkInformationExecutivePortKey,vtkInformationKey);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
vtkInformationExecutivePortKey(const char* name, const char* location);
- ~vtkInformationExecutivePortKey() VTK_OVERRIDE;
+ ~vtkInformationExecutivePortKey() override;
/**
* This method simply returns a new vtkInformationExecutivePortKey, given a
@@ -66,17 +66,17 @@ public:
* object to another. If there is no entry in the first information
* object for this key, the value is removed from the second.
*/
- void ShallowCopy(vtkInformation* from, vtkInformation* to) VTK_OVERRIDE;
+ void ShallowCopy(vtkInformation* from, vtkInformation* to) override;
/**
* Report a reference this key has in the given information object.
*/
- void Report(vtkInformation* info, vtkGarbageCollector* collector) VTK_OVERRIDE;
+ void Report(vtkInformation* info, vtkGarbageCollector* collector) override;
/**
* Print the key's value in an information object to a stream.
*/
- void Print(ostream& os, vtkInformation* info) VTK_OVERRIDE;
+ void Print(ostream& os, vtkInformation* info) override;
private:
vtkInformationExecutivePortKey(const vtkInformationExecutivePortKey&) VTK_DELETE_FUNCTION;
diff --git a/Common/ExecutionModel/vtkInformationExecutivePortVectorKey.cxx b/Common/ExecutionModel/vtkInformationExecutivePortVectorKey.cxx
index 3fab1970c8f1554e6cc5d49f0e9bf96284ab1984..83dd36982503aee1ba991524dac551c60d79e072 100644
--- a/Common/ExecutionModel/vtkInformationExecutivePortVectorKey.cxx
+++ b/Common/ExecutionModel/vtkInformationExecutivePortVectorKey.cxx
@@ -53,7 +53,7 @@ public:
std::vector<vtkExecutive*> Executives;
std::vector<int> Ports;
- ~vtkInformationExecutivePortVectorValue() VTK_OVERRIDE;
+ ~vtkInformationExecutivePortVectorValue() override;
void UnRegisterAllExecutives();
};
diff --git a/Common/ExecutionModel/vtkInformationExecutivePortVectorKey.h b/Common/ExecutionModel/vtkInformationExecutivePortVectorKey.h
index 2d21b054235255fda8eeb26c782080b018dfe82c..c88e9df7170d50f3188043c78b52e58fed01a8de 100644
--- a/Common/ExecutionModel/vtkInformationExecutivePortVectorKey.h
+++ b/Common/ExecutionModel/vtkInformationExecutivePortVectorKey.h
@@ -35,10 +35,10 @@ class VTKCOMMONEXECUTIONMODEL_EXPORT vtkInformationExecutivePortVectorKey : publ
{
public:
vtkTypeMacro(vtkInformationExecutivePortVectorKey,vtkInformationKey);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
vtkInformationExecutivePortVectorKey(const char* name, const char* location);
- ~vtkInformationExecutivePortVectorKey() VTK_OVERRIDE;
+ ~vtkInformationExecutivePortVectorKey() override;
/**
* This method simply returns a new vtkInformationExecutivePortVectorKey,
@@ -69,22 +69,22 @@ public:
* object to another. If there is no entry in the first information
* object for this key, the value is removed from the second.
*/
- void ShallowCopy(vtkInformation* from, vtkInformation* to) VTK_OVERRIDE;
+ void ShallowCopy(vtkInformation* from, vtkInformation* to) override;
/**
* Remove this key from the given information object.
*/
- void Remove(vtkInformation* info) VTK_OVERRIDE;
+ void Remove(vtkInformation* info) override;
/**
* Report a reference this key has in the given information object.
*/
- void Report(vtkInformation* info, vtkGarbageCollector* collector) VTK_OVERRIDE;
+ void Report(vtkInformation* info, vtkGarbageCollector* collector) override;
/**
* Print the key's value in an information object to a stream.
*/
- void Print(ostream& os, vtkInformation* info) VTK_OVERRIDE;
+ void Print(ostream& os, vtkInformation* info) override;
protected:
diff --git a/Common/ExecutionModel/vtkInformationIntegerRequestKey.h b/Common/ExecutionModel/vtkInformationIntegerRequestKey.h
index c060f06b9e09a50e26245d65df4d9bb6069c8b1f..00dced69a77dffd90cc636e5c41e432ee4fe79cd 100644
--- a/Common/ExecutionModel/vtkInformationIntegerRequestKey.h
+++ b/Common/ExecutionModel/vtkInformationIntegerRequestKey.h
@@ -42,10 +42,10 @@ class VTKCOMMONEXECUTIONMODEL_EXPORT vtkInformationIntegerRequestKey : public vt
{
public:
vtkTypeMacro(vtkInformationIntegerRequestKey,vtkInformationIntegerKey);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
vtkInformationIntegerRequestKey(const char* name, const char* location);
- ~vtkInformationIntegerRequestKey() VTK_OVERRIDE;
+ ~vtkInformationIntegerRequestKey() override;
/**
* This method simply returns a new vtkInformationIntegerRequestKey,
@@ -63,7 +63,7 @@ public:
* this key.
*/
bool NeedToExecute(vtkInformation* pipelineInfo,
- vtkInformation* dobjInfo) VTK_OVERRIDE;
+ vtkInformation* dobjInfo) override;
/**
* Copies the value stored in pipelineInfo using this key into
@@ -71,7 +71,7 @@ public:
*/
void StoreMetaData(vtkInformation* request,
vtkInformation* pipelineInfo,
- vtkInformation* dobjInfo) VTK_OVERRIDE;
+ vtkInformation* dobjInfo) override;
/**
* Copies the value stored in fromInfo using this key into toInfo
@@ -79,7 +79,7 @@ public:
*/
void CopyDefaultInformation(vtkInformation* request,
vtkInformation* fromInfo,
- vtkInformation* toInfo) VTK_OVERRIDE;
+ vtkInformation* toInfo) override;
protected:
vtkInformationIntegerKey* DataKey;
diff --git a/Common/ExecutionModel/vtkMultiBlockDataSetAlgorithm.h b/Common/ExecutionModel/vtkMultiBlockDataSetAlgorithm.h
index 9bbd01c94c1600fd5ab2338b92207f85b2fdb927..cc661807fb7c174cd06c8a414fa136fa2e6f67fe 100644
--- a/Common/ExecutionModel/vtkMultiBlockDataSetAlgorithm.h
+++ b/Common/ExecutionModel/vtkMultiBlockDataSetAlgorithm.h
@@ -34,7 +34,7 @@ class VTKCOMMONEXECUTIONMODEL_EXPORT vtkMultiBlockDataSetAlgorithm : public vtkA
public:
static vtkMultiBlockDataSetAlgorithm *New();
vtkTypeMacro(vtkMultiBlockDataSetAlgorithm,vtkAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -59,11 +59,11 @@ public:
*/
int ProcessRequest(vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
protected:
vtkMultiBlockDataSetAlgorithm();
- ~vtkMultiBlockDataSetAlgorithm() VTK_OVERRIDE {}
+ ~vtkMultiBlockDataSetAlgorithm() override {}
/**
* This is called by the superclass.
@@ -103,11 +103,11 @@ protected:
//@}
// Create a default executive.
- vtkExecutive* CreateDefaultExecutive() VTK_OVERRIDE;
+ vtkExecutive* CreateDefaultExecutive() override;
// see algorithm for more info
- int FillOutputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillOutputPortInformation(int port, vtkInformation* info) override;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
vtkDataObject *GetInput(int port);
diff --git a/Common/ExecutionModel/vtkMultiTimeStepAlgorithm.h b/Common/ExecutionModel/vtkMultiTimeStepAlgorithm.h
index 4a7f8b682d705ed8e90a0058ca2664d9f3804074..f522e8980ab0b6f60aa81b3b1352b37f454364c3 100644
--- a/Common/ExecutionModel/vtkMultiTimeStepAlgorithm.h
+++ b/Common/ExecutionModel/vtkMultiTimeStepAlgorithm.h
@@ -41,13 +41,13 @@ class VTKCOMMONEXECUTIONMODEL_EXPORT vtkMultiTimeStepAlgorithm : public vtkAlgor
public:
static vtkMultiTimeStepAlgorithm *New();
vtkTypeMacro(vtkMultiTimeStepAlgorithm,vtkAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkMultiTimeStepAlgorithm();
- ~vtkMultiTimeStepAlgorithm() VTK_OVERRIDE
+ ~vtkMultiTimeStepAlgorithm() override
{
};
@@ -97,7 +97,7 @@ protected:
return 1;
}
- int ProcessRequest(vtkInformation*, vtkInformationVector**, vtkInformationVector*) VTK_OVERRIDE;
+ int ProcessRequest(vtkInformation*, vtkInformationVector**, vtkInformationVector*) override;
bool CacheData;
unsigned int NumberOfCacheEntries;
diff --git a/Common/ExecutionModel/vtkNonOverlappingAMRAlgorithm.h b/Common/ExecutionModel/vtkNonOverlappingAMRAlgorithm.h
index 363fed3281b9ca9bd597385c77c76a6f8435c6bd..bbb393fe6849190b884c625be6a731e2248d4883 100644
--- a/Common/ExecutionModel/vtkNonOverlappingAMRAlgorithm.h
+++ b/Common/ExecutionModel/vtkNonOverlappingAMRAlgorithm.h
@@ -35,7 +35,7 @@ class VTKCOMMONEXECUTIONMODEL_EXPORT vtkNonOverlappingAMRAlgorithm :
public:
static vtkNonOverlappingAMRAlgorithm* New();
vtkTypeMacro(vtkNonOverlappingAMRAlgorithm,vtkUniformGridAMRAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -47,14 +47,14 @@ class VTKCOMMONEXECUTIONMODEL_EXPORT vtkNonOverlappingAMRAlgorithm :
protected:
vtkNonOverlappingAMRAlgorithm();
- ~vtkNonOverlappingAMRAlgorithm() VTK_OVERRIDE;
+ ~vtkNonOverlappingAMRAlgorithm() override;
//@{
/**
* See algorithm for more info.
*/
- int FillOutputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillOutputPortInformation(int port, vtkInformation* info) override;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
//@}
private:
diff --git a/Common/ExecutionModel/vtkOverlappingAMRAlgorithm.h b/Common/ExecutionModel/vtkOverlappingAMRAlgorithm.h
index 871bc59e818ec57e06410fd9a247ff41257b5c02..3e47374e5208e5560d987f47d0cdb6c5b5ec6434 100644
--- a/Common/ExecutionModel/vtkOverlappingAMRAlgorithm.h
+++ b/Common/ExecutionModel/vtkOverlappingAMRAlgorithm.h
@@ -35,7 +35,7 @@ class VTKCOMMONEXECUTIONMODEL_EXPORT vtkOverlappingAMRAlgorithm :
public:
static vtkOverlappingAMRAlgorithm* New();
vtkTypeMacro(vtkOverlappingAMRAlgorithm,vtkUniformGridAMRAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -47,14 +47,14 @@ class VTKCOMMONEXECUTIONMODEL_EXPORT vtkOverlappingAMRAlgorithm :
protected:
vtkOverlappingAMRAlgorithm();
- ~vtkOverlappingAMRAlgorithm() VTK_OVERRIDE;
+ ~vtkOverlappingAMRAlgorithm() override;
//@{
/**
* See algorithm for more info.
*/
- int FillOutputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillOutputPortInformation(int port, vtkInformation* info) override;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
//@}
private:
diff --git a/Common/ExecutionModel/vtkPassInputTypeAlgorithm.h b/Common/ExecutionModel/vtkPassInputTypeAlgorithm.h
index 87ecfb0fcdcdf93576017440d618927970687327..27eb10d4890e58a8028812592d8219e7de921362 100644
--- a/Common/ExecutionModel/vtkPassInputTypeAlgorithm.h
+++ b/Common/ExecutionModel/vtkPassInputTypeAlgorithm.h
@@ -52,7 +52,7 @@ class VTKCOMMONEXECUTIONMODEL_EXPORT vtkPassInputTypeAlgorithm : public vtkAlgor
public:
static vtkPassInputTypeAlgorithm *New();
vtkTypeMacro(vtkPassInputTypeAlgorithm,vtkAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -134,11 +134,11 @@ public:
*/
int ProcessRequest(vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
protected:
vtkPassInputTypeAlgorithm();
- ~vtkPassInputTypeAlgorithm() VTK_OVERRIDE {}
+ ~vtkPassInputTypeAlgorithm() override {}
/**
* This is called within ProcessRequest when a request asks for
@@ -202,8 +202,8 @@ protected:
// see algorithm for more info
- int FillOutputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillOutputPortInformation(int port, vtkInformation* info) override;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
vtkDataObject *GetInput(int port);
diff --git a/Common/ExecutionModel/vtkPiecewiseFunctionAlgorithm.h b/Common/ExecutionModel/vtkPiecewiseFunctionAlgorithm.h
index 63d4b1c7f2d082107685bd17dd3a32e87fcf6fda..e5a7456f266ed29f976d1d38fdc8bd765a2125ca 100644
--- a/Common/ExecutionModel/vtkPiecewiseFunctionAlgorithm.h
+++ b/Common/ExecutionModel/vtkPiecewiseFunctionAlgorithm.h
@@ -45,7 +45,7 @@ class VTKCOMMONEXECUTIONMODEL_EXPORT vtkPiecewiseFunctionAlgorithm : public vtkA
public:
static vtkPiecewiseFunctionAlgorithm *New();
vtkTypeMacro(vtkPiecewiseFunctionAlgorithm,vtkAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -61,7 +61,7 @@ public:
*/
int ProcessRequest(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
// this method is not recommended for use, but lots of old style filters
// use it
@@ -90,7 +90,7 @@ public:
protected:
vtkPiecewiseFunctionAlgorithm();
- ~vtkPiecewiseFunctionAlgorithm() VTK_OVERRIDE;
+ ~vtkPiecewiseFunctionAlgorithm() override;
/**
* This is called by the superclass.
@@ -101,8 +101,8 @@ protected:
vtkInformationVector* outputVector);
// see algorithm for more info
- int FillOutputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillOutputPortInformation(int port, vtkInformation* info) override;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
private:
vtkPiecewiseFunctionAlgorithm(const vtkPiecewiseFunctionAlgorithm&) VTK_DELETE_FUNCTION;
diff --git a/Common/ExecutionModel/vtkPiecewiseFunctionShiftScale.h b/Common/ExecutionModel/vtkPiecewiseFunctionShiftScale.h
index 1783f6e33778dd2e8882d0a68663efa3d529c9e2..6f600a5aef5b07513d09ad32b44118ee054086fe 100644
--- a/Common/ExecutionModel/vtkPiecewiseFunctionShiftScale.h
+++ b/Common/ExecutionModel/vtkPiecewiseFunctionShiftScale.h
@@ -32,7 +32,7 @@ class VTKCOMMONEXECUTIONMODEL_EXPORT vtkPiecewiseFunctionShiftScale : public vtk
public:
static vtkPiecewiseFunctionShiftScale *New();
vtkTypeMacro(vtkPiecewiseFunctionShiftScale, vtkPiecewiseFunctionAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
vtkSetMacro(PositionShift, double);
vtkSetMacro(PositionScale, double);
@@ -46,10 +46,10 @@ public:
protected:
vtkPiecewiseFunctionShiftScale();
- ~vtkPiecewiseFunctionShiftScale() VTK_OVERRIDE;
+ ~vtkPiecewiseFunctionShiftScale() override;
int RequestData(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
double PositionShift;
double PositionScale;
diff --git a/Common/ExecutionModel/vtkPointSetAlgorithm.h b/Common/ExecutionModel/vtkPointSetAlgorithm.h
index 90c936f7dcb33370ece6267db1a0f063e4403162..0015009fe2df40101887721a4271f2ac6173ab29 100644
--- a/Common/ExecutionModel/vtkPointSetAlgorithm.h
+++ b/Common/ExecutionModel/vtkPointSetAlgorithm.h
@@ -45,7 +45,7 @@ class VTKCOMMONEXECUTIONMODEL_EXPORT vtkPointSetAlgorithm : public vtkAlgorithm
public:
static vtkPointSetAlgorithm *New();
vtkTypeMacro(vtkPointSetAlgorithm,vtkAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -103,11 +103,11 @@ public:
*/
int ProcessRequest(vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
protected:
vtkPointSetAlgorithm();
- ~vtkPointSetAlgorithm() VTK_OVERRIDE {}
+ ~vtkPointSetAlgorithm() override {}
/**
* This is called by the superclass.
@@ -147,8 +147,8 @@ protected:
//@}
// see algorithm for more info
- int FillOutputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillOutputPortInformation(int port, vtkInformation* info) override;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
private:
vtkPointSetAlgorithm(const vtkPointSetAlgorithm&) VTK_DELETE_FUNCTION;
diff --git a/Common/ExecutionModel/vtkPolyDataAlgorithm.h b/Common/ExecutionModel/vtkPolyDataAlgorithm.h
index 743f4a83db7307d2b1b37293d494c501eb86bc0a..29a5a118ef4aa995e3ba587820ce951d8831a102 100644
--- a/Common/ExecutionModel/vtkPolyDataAlgorithm.h
+++ b/Common/ExecutionModel/vtkPolyDataAlgorithm.h
@@ -43,7 +43,7 @@ class VTKCOMMONEXECUTIONMODEL_EXPORT vtkPolyDataAlgorithm : public vtkAlgorithm
public:
static vtkPolyDataAlgorithm *New();
vtkTypeMacro(vtkPolyDataAlgorithm,vtkAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -59,7 +59,7 @@ public:
*/
int ProcessRequest(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
// this method is not recommended for use, but lots of old style filters
// use it
@@ -89,7 +89,7 @@ public:
protected:
vtkPolyDataAlgorithm();
- ~vtkPolyDataAlgorithm() VTK_OVERRIDE;
+ ~vtkPolyDataAlgorithm() override;
// convenience method
virtual int RequestInformation(vtkInformation* request,
@@ -113,8 +113,8 @@ protected:
vtkInformationVector*);
// see algorithm for more info
- int FillOutputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillOutputPortInformation(int port, vtkInformation* info) override;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
private:
vtkPolyDataAlgorithm(const vtkPolyDataAlgorithm&) VTK_DELETE_FUNCTION;
diff --git a/Common/ExecutionModel/vtkProgressObserver.h b/Common/ExecutionModel/vtkProgressObserver.h
index 4ed60b31838889bb020a89f56462c2387c59380c..d324ad4c06d0d1c0327a60a4f4f5ff1ef6dc5af4 100644
--- a/Common/ExecutionModel/vtkProgressObserver.h
+++ b/Common/ExecutionModel/vtkProgressObserver.h
@@ -38,7 +38,7 @@ class VTKCOMMONEXECUTIONMODEL_EXPORT vtkProgressObserver : public vtkObject
public:
static vtkProgressObserver *New();
vtkTypeMacro(vtkProgressObserver,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* The default behavior is to update the Progress data member
@@ -55,7 +55,7 @@ public:
protected:
vtkProgressObserver();
- ~vtkProgressObserver() VTK_OVERRIDE;
+ ~vtkProgressObserver() override;
double Progress;
diff --git a/Common/ExecutionModel/vtkRectilinearGridAlgorithm.h b/Common/ExecutionModel/vtkRectilinearGridAlgorithm.h
index beb02b6d0371105ca02d78dfa95b744f8c488132..c3391051c3722d5b0e4a89a846030446acc2c025 100644
--- a/Common/ExecutionModel/vtkRectilinearGridAlgorithm.h
+++ b/Common/ExecutionModel/vtkRectilinearGridAlgorithm.h
@@ -45,7 +45,7 @@ class VTKCOMMONEXECUTIONMODEL_EXPORT vtkRectilinearGridAlgorithm : public vtkAlg
public:
static vtkRectilinearGridAlgorithm *New();
vtkTypeMacro(vtkRectilinearGridAlgorithm,vtkAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -61,7 +61,7 @@ public:
*/
int ProcessRequest(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
// this method is not recommended for use, but lots of old style filters
// use it
@@ -91,7 +91,7 @@ public:
protected:
vtkRectilinearGridAlgorithm();
- ~vtkRectilinearGridAlgorithm() VTK_OVERRIDE;
+ ~vtkRectilinearGridAlgorithm() override;
// convenience method
virtual int RequestInformation(vtkInformation* request,
@@ -120,8 +120,8 @@ protected:
//@}
// see algorithm for more info
- int FillOutputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillOutputPortInformation(int port, vtkInformation* info) override;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
private:
vtkRectilinearGridAlgorithm(const vtkRectilinearGridAlgorithm&) VTK_DELETE_FUNCTION;
diff --git a/Common/ExecutionModel/vtkSMPProgressObserver.h b/Common/ExecutionModel/vtkSMPProgressObserver.h
index afef41b54b476cf62cea459ac28c9ae45ee75fb8..317c84f8ea70a8e9924f9f62d67661ea4388fd69 100644
--- a/Common/ExecutionModel/vtkSMPProgressObserver.h
+++ b/Common/ExecutionModel/vtkSMPProgressObserver.h
@@ -36,13 +36,13 @@ class VTKCOMMONEXECUTIONMODEL_EXPORT vtkSMPProgressObserver : public vtkProgress
public:
static vtkSMPProgressObserver *New();
vtkTypeMacro(vtkSMPProgressObserver,vtkProgressObserver);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Passes the progress event to a thread local ProgressObserver
* instance.
*/
- void UpdateProgress(double amount) VTK_OVERRIDE;
+ void UpdateProgress(double amount) override;
/**
* Returns the progress observer local to the thread it was
@@ -55,7 +55,7 @@ public:
protected:
vtkSMPProgressObserver();
- ~vtkSMPProgressObserver() VTK_OVERRIDE;
+ ~vtkSMPProgressObserver() override;
vtkSMPThreadLocalObject<vtkProgressObserver> Observers;
diff --git a/Common/ExecutionModel/vtkScalarTree.h b/Common/ExecutionModel/vtkScalarTree.h
index 0b3cc960247348ca00b683e506a67bce76f96165..2aa54cc0d45dea53ec76b0c1fdf2084369885a8f 100644
--- a/Common/ExecutionModel/vtkScalarTree.h
+++ b/Common/ExecutionModel/vtkScalarTree.h
@@ -55,7 +55,7 @@ class VTKCOMMONEXECUTIONMODEL_EXPORT vtkScalarTree : public vtkObject
{
public:
vtkTypeMacro(vtkScalarTree,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -139,7 +139,7 @@ public:
protected:
vtkScalarTree();
- ~vtkScalarTree() VTK_OVERRIDE;
+ ~vtkScalarTree() override;
vtkDataSet *DataSet; //the dataset over which the scalar tree is built
vtkDataArray *Scalars; //the scalars of the DataSet
diff --git a/Common/ExecutionModel/vtkSelectionAlgorithm.h b/Common/ExecutionModel/vtkSelectionAlgorithm.h
index c89f25ddf3e4e795a492da175af7d46ff245a8f9..ad086a10d08be9d6691a4cb31fc834a0100d3ed5 100644
--- a/Common/ExecutionModel/vtkSelectionAlgorithm.h
+++ b/Common/ExecutionModel/vtkSelectionAlgorithm.h
@@ -48,14 +48,14 @@ class VTKCOMMONEXECUTIONMODEL_EXPORT vtkSelectionAlgorithm : public vtkAlgorithm
public:
static vtkSelectionAlgorithm *New();
vtkTypeMacro(vtkSelectionAlgorithm,vtkAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* see vtkAlgorithm for details
*/
int ProcessRequest(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
/**
* Get the output data object for a port on this algorithm.
@@ -73,7 +73,7 @@ public:
protected:
vtkSelectionAlgorithm();
- ~vtkSelectionAlgorithm() VTK_OVERRIDE;
+ ~vtkSelectionAlgorithm() override;
// convenience method
virtual int RequestInformation(vtkInformation* request,
@@ -97,8 +97,8 @@ protected:
vtkInformationVector*);
// see algorithm for more info
- int FillOutputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillOutputPortInformation(int port, vtkInformation* info) override;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
private:
vtkSelectionAlgorithm(const vtkSelectionAlgorithm&) VTK_DELETE_FUNCTION;
diff --git a/Common/ExecutionModel/vtkSimpleImageToImageFilter.h b/Common/ExecutionModel/vtkSimpleImageToImageFilter.h
index af2aa79bf12bda2cc8d86f720786de1267377641..08e0f44594288e035ec1431c6f5c3abd70dc0009 100644
--- a/Common/ExecutionModel/vtkSimpleImageToImageFilter.h
+++ b/Common/ExecutionModel/vtkSimpleImageToImageFilter.h
@@ -47,21 +47,21 @@ class VTKCOMMONEXECUTIONMODEL_EXPORT vtkSimpleImageToImageFilter : public vtkIma
{
public:
vtkTypeMacro(vtkSimpleImageToImageFilter,vtkImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkSimpleImageToImageFilter();
- ~vtkSimpleImageToImageFilter() VTK_OVERRIDE;
+ ~vtkSimpleImageToImageFilter() override;
// These are called by the superclass.
int RequestUpdateExtent (vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
// You don't have to touch this unless you have a good reason.
int RequestData(vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
// In the simplest case, this is the only method you need to define.
virtual void SimpleExecute(vtkImageData* input, vtkImageData* output) = 0;
diff --git a/Common/ExecutionModel/vtkSimpleScalarTree.h b/Common/ExecutionModel/vtkSimpleScalarTree.h
index 74f1698ba901e2e003d6b14bd0df40b3f96a93e1..4d0c61c19f93c2a8c7025519c64e2429a3e373a6 100644
--- a/Common/ExecutionModel/vtkSimpleScalarTree.h
+++ b/Common/ExecutionModel/vtkSimpleScalarTree.h
@@ -66,7 +66,7 @@ public:
* Standard type related macros and PrintSelf() method.
*/
vtkTypeMacro(vtkSimpleScalarTree,vtkScalarTree);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -100,18 +100,18 @@ public:
* Construct the scalar tree from the dataset provided. Checks build times
* and modified time from input and reconstructs the tree if necessary.
*/
- void BuildTree() VTK_OVERRIDE;
+ void BuildTree() override;
/**
* Initialize locator. Frees memory and resets object as appropriate.
*/
- void Initialize() VTK_OVERRIDE;
+ void Initialize() override;
/**
* Begin to traverse the cells based on a scalar value. Returned cells
* will likely have scalar values that span the scalar value specified.
*/
- void InitTraversal(double scalarValue) VTK_OVERRIDE;
+ void InitTraversal(double scalarValue) override;
/**
* Return the next cell that may contain scalar value specified to
@@ -120,7 +120,7 @@ public:
* you'll get erratic behavior.
*/
vtkCell *GetNextCell(vtkIdType &cellId, vtkIdList* &ptIds,
- vtkDataArray *cellScalars) VTK_OVERRIDE;
+ vtkDataArray *cellScalars) override;
// The following methods supports parallel (threaded)
// applications. Basically batches of cells (which represent a
@@ -135,7 +135,7 @@ public:
* [0...(NumberOfCellBatches-1)] will contain all the cells
* potentially containing the isocontour.
*/
- vtkIdType GetNumberOfCellBatches() VTK_OVERRIDE;
+ vtkIdType GetNumberOfCellBatches() override;
/**
* Return the array of cell ids in the specified batch. The method
@@ -143,11 +143,11 @@ public:
* call InitTraversal() beforehand.
*/
const vtkIdType* GetCellBatch(vtkIdType batchNum,
- vtkIdType& numCells) VTK_OVERRIDE;
+ vtkIdType& numCells) override;
protected:
vtkSimpleScalarTree();
- ~vtkSimpleScalarTree() VTK_OVERRIDE;
+ ~vtkSimpleScalarTree() override;
int MaxLevel;
int Level;
diff --git a/Common/ExecutionModel/vtkSpanSpace.h b/Common/ExecutionModel/vtkSpanSpace.h
index 7b3e83499e3e34a5a359a10145eeb7eab2d30f67..76e6899cf52d16187e312f528a48810832a7061d 100644
--- a/Common/ExecutionModel/vtkSpanSpace.h
+++ b/Common/ExecutionModel/vtkSpanSpace.h
@@ -57,7 +57,7 @@ public:
* Standard type related macros and PrintSelf() method.
*/
vtkTypeMacro(vtkSpanSpace,vtkScalarTree);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//----------------------------------------------------------------------
@@ -83,13 +83,13 @@ public:
/**
* Initialize locator. Frees memory and resets object as appropriate.
*/
- void Initialize() VTK_OVERRIDE;
+ void Initialize() override;
/**
* Construct the scalar tree from the dataset provided. Checks build times
* and modified time from input and reconstructs the tree if necessary.
*/
- void BuildTree() VTK_OVERRIDE;
+ void BuildTree() override;
/**
* Begin to traverse the cells based on a scalar value. Returned cells
@@ -97,7 +97,7 @@ public:
* method must be called prior to parallel or serial traversal since it
* specifies the scalar value to be extracted.
*/
- void InitTraversal(double scalarValue) VTK_OVERRIDE;
+ void InitTraversal(double scalarValue) override;
/**
* Return the next cell that may contain scalar value specified to
@@ -106,7 +106,7 @@ public:
* you'll get erratic behavior. This is inherently a serial operation.
*/
vtkCell *GetNextCell(vtkIdType &cellId, vtkIdList* &ptIds,
- vtkDataArray *cellScalars) VTK_OVERRIDE;
+ vtkDataArray *cellScalars) override;
// The following methods supports parallel (threaded)
// applications. Basically batches of cells (which represent a
@@ -122,7 +122,7 @@ public:
* [0...(NumberOfCellBatches-1)] will contain all the cells
* potentially containing the isocontour.
*/
- vtkIdType GetNumberOfCellBatches() VTK_OVERRIDE;
+ vtkIdType GetNumberOfCellBatches() override;
/**
* Return the array of cell ids in the specified batch. The method
@@ -130,11 +130,11 @@ public:
* call InitTraversal() beforehand.
*/
const vtkIdType* GetCellBatch(vtkIdType batchNum,
- vtkIdType& numCells) VTK_OVERRIDE;
+ vtkIdType& numCells) override;
protected:
vtkSpanSpace();
- ~vtkSpanSpace() VTK_OVERRIDE;
+ ~vtkSpanSpace() override;
vtkIdType Resolution;
vtkInternalSpanSpace *SpanSpace;
diff --git a/Common/ExecutionModel/vtkSphereTree.h b/Common/ExecutionModel/vtkSphereTree.h
index f3cd7dcef70f7b814e46a880e3036bc2e6c037ee..25ac9289030e06a4692cbca31b1f0046c2fcad64 100644
--- a/Common/ExecutionModel/vtkSphereTree.h
+++ b/Common/ExecutionModel/vtkSphereTree.h
@@ -80,7 +80,7 @@ public:
* Standard type related macros and PrintSelf() method.
*/
vtkTypeMacro(vtkSphereTree,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -196,7 +196,7 @@ public:
protected:
vtkSphereTree();
- ~vtkSphereTree() VTK_OVERRIDE;
+ ~vtkSphereTree() override;
// Data members
vtkDataSet *DataSet;
diff --git a/Common/ExecutionModel/vtkStreamingDemandDrivenPipeline.h b/Common/ExecutionModel/vtkStreamingDemandDrivenPipeline.h
index 85b17b1712762c1e30a9ceccefa46daf9dd63509..627aee416a62b95210e1c0be9de3a77da96aa3b4 100644
--- a/Common/ExecutionModel/vtkStreamingDemandDrivenPipeline.h
+++ b/Common/ExecutionModel/vtkStreamingDemandDrivenPipeline.h
@@ -47,7 +47,7 @@ class VTKCOMMONEXECUTIONMODEL_EXPORT vtkStreamingDemandDrivenPipeline : public v
public:
static vtkStreamingDemandDrivenPipeline* New();
vtkTypeMacro(vtkStreamingDemandDrivenPipeline,vtkDemandDrivenPipeline);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Generalized interface for asking the executive to fulfill update
@@ -55,14 +55,14 @@ public:
*/
int ProcessRequest(vtkInformation* request,
vtkInformationVector** inInfo,
- vtkInformationVector* outInfo) VTK_OVERRIDE;
+ vtkInformationVector* outInfo) override;
//@{
/**
* Bring the outputs up-to-date.
*/
- int Update() VTK_OVERRIDE;
- int Update(int port) VTK_OVERRIDE;
+ int Update() override;
+ int Update(int port) override;
virtual int UpdateWholeExtent();
//@}
@@ -255,7 +255,7 @@ public:
protected:
vtkStreamingDemandDrivenPipeline();
- ~vtkStreamingDemandDrivenPipeline() VTK_OVERRIDE;
+ ~vtkStreamingDemandDrivenPipeline() override;
/**
* Keep track of the update time request corresponding to the
@@ -278,12 +278,12 @@ protected:
// executes information.
int ExecuteInformation(vtkInformation* request,
vtkInformationVector** inInfoVec,
- vtkInformationVector* outInfoVec) VTK_OVERRIDE;
+ vtkInformationVector* outInfoVec) override;
// Copy information for the given request.
void CopyDefaultInformation(vtkInformation* request, int direction,
vtkInformationVector** inInfoVec,
- vtkInformationVector* outInfoVec) VTK_OVERRIDE;
+ vtkInformationVector* outInfoVec) override;
// Helper to check output information before propagating it to inputs.
virtual int VerifyOutputInformation(int outputPort,
@@ -294,24 +294,24 @@ protected:
// Override this check to account for update extent.
int NeedToExecuteData(int outputPort,
vtkInformationVector** inInfoVec,
- vtkInformationVector* outInfoVec) VTK_OVERRIDE;
+ vtkInformationVector* outInfoVec) override;
// Override these to handle the continue-executing option.
void ExecuteDataStart(vtkInformation* request,
vtkInformationVector** inInfoVec,
- vtkInformationVector* outInfoVec) VTK_OVERRIDE;
+ vtkInformationVector* outInfoVec) override;
void ExecuteDataEnd(vtkInformation* request,
vtkInformationVector** inInfoVec,
- vtkInformationVector* outInfoVec) VTK_OVERRIDE;
+ vtkInformationVector* outInfoVec) override;
// Override this to handle cropping and ghost levels.
void MarkOutputsGenerated(vtkInformation* request,
vtkInformationVector** inInfoVec,
- vtkInformationVector* outInfoVec) VTK_OVERRIDE;
+ vtkInformationVector* outInfoVec) override;
// Remove update/whole extent when resetting pipeline information.
- void ResetPipelineInformation(int port, vtkInformation*) VTK_OVERRIDE;
+ void ResetPipelineInformation(int port, vtkInformation*) override;
// Flag for when an algorithm returns with CONTINUE_EXECUTING in the
// request.
diff --git a/Common/ExecutionModel/vtkStructuredGridAlgorithm.h b/Common/ExecutionModel/vtkStructuredGridAlgorithm.h
index c81d663fde72eca360431cdde0b6b77bbaee117c..71654a7bff7f2c6182f1b448b25b0937b97188c2 100644
--- a/Common/ExecutionModel/vtkStructuredGridAlgorithm.h
+++ b/Common/ExecutionModel/vtkStructuredGridAlgorithm.h
@@ -43,7 +43,7 @@ class VTKCOMMONEXECUTIONMODEL_EXPORT vtkStructuredGridAlgorithm : public vtkAlgo
public:
static vtkStructuredGridAlgorithm *New();
vtkTypeMacro(vtkStructuredGridAlgorithm,vtkAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -59,7 +59,7 @@ public:
*/
int ProcessRequest(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
// this method is not recommended for use, but lots of old style filters
// use it
@@ -89,7 +89,7 @@ public:
protected:
vtkStructuredGridAlgorithm();
- ~vtkStructuredGridAlgorithm() VTK_OVERRIDE;
+ ~vtkStructuredGridAlgorithm() override;
// convenience method
virtual int RequestInformation(vtkInformation* request,
@@ -118,8 +118,8 @@ protected:
//@}
// see algorithm for more info
- int FillOutputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillOutputPortInformation(int port, vtkInformation* info) override;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
private:
vtkStructuredGridAlgorithm(const vtkStructuredGridAlgorithm&) VTK_DELETE_FUNCTION;
diff --git a/Common/ExecutionModel/vtkTableAlgorithm.h b/Common/ExecutionModel/vtkTableAlgorithm.h
index 389e6e9a965624ff1a4ba86d0fd554b5be974b43..720bb65b3213624974004db49e73233b0073a388 100644
--- a/Common/ExecutionModel/vtkTableAlgorithm.h
+++ b/Common/ExecutionModel/vtkTableAlgorithm.h
@@ -50,14 +50,14 @@ class VTKCOMMONEXECUTIONMODEL_EXPORT vtkTableAlgorithm : public vtkAlgorithm
public:
static vtkTableAlgorithm *New();
vtkTypeMacro(vtkTableAlgorithm,vtkAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* see vtkAlgorithm for details
*/
int ProcessRequest(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
/**
* Get the output data object for a port on this algorithm.
@@ -75,7 +75,7 @@ public:
protected:
vtkTableAlgorithm();
- ~vtkTableAlgorithm() VTK_OVERRIDE;
+ ~vtkTableAlgorithm() override;
// convenience method
virtual int RequestInformation(vtkInformation* request,
@@ -99,8 +99,8 @@ protected:
vtkInformationVector*);
// see algorithm for more info
- int FillOutputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillOutputPortInformation(int port, vtkInformation* info) override;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
private:
vtkTableAlgorithm(const vtkTableAlgorithm&) VTK_DELETE_FUNCTION;
diff --git a/Common/ExecutionModel/vtkThreadedCompositeDataPipeline.cxx b/Common/ExecutionModel/vtkThreadedCompositeDataPipeline.cxx
index 6ff88babd3b52a97d129cfb13e9b4a0925c3ac77..e683522e11d936cc76737fddccf0bc7b29402dcf 100644
--- a/Common/ExecutionModel/vtkThreadedCompositeDataPipeline.cxx
+++ b/Common/ExecutionModel/vtkThreadedCompositeDataPipeline.cxx
@@ -98,7 +98,7 @@ public:
this->Out->Copy(outInfoVec,1);
}
- ~ProcessBlockData() VTK_OVERRIDE
+ ~ProcessBlockData() override
{
DeleteAll(this->In, this->InSize);
this->Out->Delete();
diff --git a/Common/ExecutionModel/vtkThreadedCompositeDataPipeline.h b/Common/ExecutionModel/vtkThreadedCompositeDataPipeline.h
index b0405179f4677a8a0fe053cc4f807ec0e6733d9d..a9c76b6a9ccfe4ae9a6faae63135a87cd2f5b327 100644
--- a/Common/ExecutionModel/vtkThreadedCompositeDataPipeline.h
+++ b/Common/ExecutionModel/vtkThreadedCompositeDataPipeline.h
@@ -39,7 +39,7 @@ class VTKCOMMONEXECUTIONMODEL_EXPORT vtkThreadedCompositeDataPipeline : public v
public:
static vtkThreadedCompositeDataPipeline* New();
vtkTypeMacro(vtkThreadedCompositeDataPipeline,vtkCompositeDataPipeline);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
/**
* An API to CallAlgorithm that allows you to pass in the info objects to
@@ -47,18 +47,18 @@ class VTKCOMMONEXECUTIONMODEL_EXPORT vtkThreadedCompositeDataPipeline : public v
*/
int CallAlgorithm(vtkInformation* request, int direction,
vtkInformationVector** inInfo,
- vtkInformationVector* outInfo) VTK_OVERRIDE;
+ vtkInformationVector* outInfo) override;
protected:
vtkThreadedCompositeDataPipeline();
- ~vtkThreadedCompositeDataPipeline() VTK_OVERRIDE;
+ ~vtkThreadedCompositeDataPipeline() override;
void ExecuteEach(vtkCompositeDataIterator* iter,
vtkInformationVector** inInfoVec,
vtkInformationVector* outInfoVec,
int compositePort,
int connection,
vtkInformation* request,
- vtkCompositeDataSet* compositeOutput) VTK_OVERRIDE;
+ vtkCompositeDataSet* compositeOutput) override;
private:
vtkThreadedCompositeDataPipeline(const vtkThreadedCompositeDataPipeline&) VTK_DELETE_FUNCTION;
diff --git a/Common/ExecutionModel/vtkThreadedImageAlgorithm.h b/Common/ExecutionModel/vtkThreadedImageAlgorithm.h
index 8e791bda2cfaa6605494fbb4ae90663cad8c0e45..09d6a3561b489c9675a791d40a42069ccd69070c 100644
--- a/Common/ExecutionModel/vtkThreadedImageAlgorithm.h
+++ b/Common/ExecutionModel/vtkThreadedImageAlgorithm.h
@@ -38,7 +38,7 @@ class VTKCOMMONEXECUTIONMODEL_EXPORT vtkThreadedImageAlgorithm : public vtkImage
{
public:
vtkTypeMacro(vtkThreadedImageAlgorithm,vtkImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* If the subclass does not define an Execute method, then the task
@@ -126,7 +126,7 @@ public:
protected:
vtkThreadedImageAlgorithm();
- ~vtkThreadedImageAlgorithm() VTK_OVERRIDE;
+ ~vtkThreadedImageAlgorithm() override;
vtkMultiThreader *Threader;
int NumberOfThreads;
@@ -153,7 +153,7 @@ protected:
*/
int RequestData(vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
/**
* Execute ThreadedRequestData for the given set of pieces.
diff --git a/Common/ExecutionModel/vtkTreeAlgorithm.h b/Common/ExecutionModel/vtkTreeAlgorithm.h
index 7af562160c8459581ca4c14d88b6464314b41b8e..43ad0582393c09e45d58c5ec13288dd5a8c38b92 100644
--- a/Common/ExecutionModel/vtkTreeAlgorithm.h
+++ b/Common/ExecutionModel/vtkTreeAlgorithm.h
@@ -47,14 +47,14 @@ class VTKCOMMONEXECUTIONMODEL_EXPORT vtkTreeAlgorithm : public vtkAlgorithm
public:
static vtkTreeAlgorithm *New();
vtkTypeMacro(vtkTreeAlgorithm,vtkAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* see vtkAlgorithm for details
*/
int ProcessRequest(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
/**
* Get the output data object for a port on this algorithm.
@@ -72,7 +72,7 @@ public:
protected:
vtkTreeAlgorithm();
- ~vtkTreeAlgorithm() VTK_OVERRIDE;
+ ~vtkTreeAlgorithm() override;
// convenience method
virtual int RequestInformation(vtkInformation* request,
@@ -96,8 +96,8 @@ protected:
vtkInformationVector*);
// see algorithm for more info
- int FillOutputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillOutputPortInformation(int port, vtkInformation* info) override;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
private:
vtkTreeAlgorithm(const vtkTreeAlgorithm&) VTK_DELETE_FUNCTION;
diff --git a/Common/ExecutionModel/vtkTrivialConsumer.h b/Common/ExecutionModel/vtkTrivialConsumer.h
index bb19e0adfa9ff62faeec5745864fe6e75b748b20..dd6a7052f3762240dd663d5ab913af722899c118 100644
--- a/Common/ExecutionModel/vtkTrivialConsumer.h
+++ b/Common/ExecutionModel/vtkTrivialConsumer.h
@@ -33,14 +33,14 @@ class VTKCOMMONEXECUTIONMODEL_EXPORT vtkTrivialConsumer : public vtkAlgorithm
public:
static vtkTrivialConsumer *New();
vtkTypeMacro(vtkTrivialConsumer,vtkAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkTrivialConsumer();
- ~vtkTrivialConsumer() VTK_OVERRIDE;
+ ~vtkTrivialConsumer() override;
- int FillInputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
- int FillOutputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
+ int FillInputPortInformation(int, vtkInformation*) override;
+ int FillOutputPortInformation(int, vtkInformation*) override;
private:
vtkTrivialConsumer(const vtkTrivialConsumer&) VTK_DELETE_FUNCTION;
void operator=(const vtkTrivialConsumer&) VTK_DELETE_FUNCTION;
diff --git a/Common/ExecutionModel/vtkTrivialProducer.h b/Common/ExecutionModel/vtkTrivialProducer.h
index 625543fde12f8cd88167ccbaeb1666903d7489d6..9508e597a100d48e8754fec24abbb0109b8b4bd0 100644
--- a/Common/ExecutionModel/vtkTrivialProducer.h
+++ b/Common/ExecutionModel/vtkTrivialProducer.h
@@ -36,7 +36,7 @@ class VTKCOMMONEXECUTIONMODEL_EXPORT vtkTrivialProducer : public vtkAlgorithm
public:
static vtkTrivialProducer *New();
vtkTypeMacro(vtkTrivialProducer,vtkAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Process upstream/downstream requests trivially. The associated
@@ -45,7 +45,7 @@ public:
*/
int ProcessRequest(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
/**
* Set the data object that is "produced" by this producer. It is
@@ -57,7 +57,7 @@ public:
* The modified time of this producer is the newer of this object or
* the assigned output.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
//@{
/**
@@ -79,18 +79,18 @@ public:
protected:
vtkTrivialProducer();
- ~vtkTrivialProducer() VTK_OVERRIDE;
+ ~vtkTrivialProducer() override;
- int FillInputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
- int FillOutputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
- vtkExecutive* CreateDefaultExecutive() VTK_OVERRIDE;
+ int FillInputPortInformation(int, vtkInformation*) override;
+ int FillOutputPortInformation(int, vtkInformation*) override;
+ vtkExecutive* CreateDefaultExecutive() override;
// The real data object.
vtkDataObject* Output;
int WholeExtent[6];
- void ReportReferences(vtkGarbageCollector*) VTK_OVERRIDE;
+ void ReportReferences(vtkGarbageCollector*) override;
private:
vtkTrivialProducer(const vtkTrivialProducer&) VTK_DELETE_FUNCTION;
void operator=(const vtkTrivialProducer&) VTK_DELETE_FUNCTION;
diff --git a/Common/ExecutionModel/vtkUndirectedGraphAlgorithm.h b/Common/ExecutionModel/vtkUndirectedGraphAlgorithm.h
index 874a34d9bcf2c393beaea4d7a8a44d5cbfc3a97d..603f3941903577d652f5ade35b7205f172c4e2ed 100644
--- a/Common/ExecutionModel/vtkUndirectedGraphAlgorithm.h
+++ b/Common/ExecutionModel/vtkUndirectedGraphAlgorithm.h
@@ -51,14 +51,14 @@ class VTKCOMMONEXECUTIONMODEL_EXPORT vtkUndirectedGraphAlgorithm : public vtkAlg
public:
static vtkUndirectedGraphAlgorithm *New();
vtkTypeMacro(vtkUndirectedGraphAlgorithm,vtkAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* see vtkAlgorithm for details
*/
int ProcessRequest(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
/**
* Get the output data object for a port on this algorithm.
@@ -76,7 +76,7 @@ public:
protected:
vtkUndirectedGraphAlgorithm();
- ~vtkUndirectedGraphAlgorithm() VTK_OVERRIDE;
+ ~vtkUndirectedGraphAlgorithm() override;
// convenience method
virtual int RequestInformation(vtkInformation* request,
@@ -100,8 +100,8 @@ protected:
vtkInformationVector*);
// see algorithm for more info
- int FillOutputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillOutputPortInformation(int port, vtkInformation* info) override;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
private:
vtkUndirectedGraphAlgorithm(const vtkUndirectedGraphAlgorithm&) VTK_DELETE_FUNCTION;
diff --git a/Common/ExecutionModel/vtkUniformGridAMRAlgorithm.h b/Common/ExecutionModel/vtkUniformGridAMRAlgorithm.h
index 0f17cbb6c969cf1c181e8a9bc30748d3a6f0ca41..7cb68e7f416a7732f47a134f34d597b3001a0bf9 100644
--- a/Common/ExecutionModel/vtkUniformGridAMRAlgorithm.h
+++ b/Common/ExecutionModel/vtkUniformGridAMRAlgorithm.h
@@ -37,7 +37,7 @@ class VTKCOMMONEXECUTIONMODEL_EXPORT vtkUniformGridAMRAlgorithm : public vtkAlgo
public:
static vtkUniformGridAMRAlgorithm* New();
vtkTypeMacro(vtkUniformGridAMRAlgorithm, vtkAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -60,11 +60,11 @@ class VTKCOMMONEXECUTIONMODEL_EXPORT vtkUniformGridAMRAlgorithm : public vtkAlgo
*/
int ProcessRequest(vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector ) VTK_OVERRIDE;
+ vtkInformationVector* outputVector ) override;
protected:
vtkUniformGridAMRAlgorithm();
- ~vtkUniformGridAMRAlgorithm() VTK_OVERRIDE;
+ ~vtkUniformGridAMRAlgorithm() override;
/**
* This is called by the superclass.
@@ -101,14 +101,14 @@ class VTKCOMMONEXECUTIONMODEL_EXPORT vtkUniformGridAMRAlgorithm : public vtkAlgo
/**
* Create a default executive
*/
- vtkExecutive* CreateDefaultExecutive() VTK_OVERRIDE;
+ vtkExecutive* CreateDefaultExecutive() override;
//@{
/**
* See algorithm for more info.
*/
- int FillOutputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillOutputPortInformation(int port, vtkInformation* info) override;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
//@}
vtkDataObject *GetInput(int port);
diff --git a/Common/ExecutionModel/vtkUniformGridPartitioner.h b/Common/ExecutionModel/vtkUniformGridPartitioner.h
index 4a70d5c105eefe8f9ee1f15ac43d2f54613ffe23..1e7e4a43d3abd74a7050b03477d59fb0bc7b32c4 100644
--- a/Common/ExecutionModel/vtkUniformGridPartitioner.h
+++ b/Common/ExecutionModel/vtkUniformGridPartitioner.h
@@ -41,7 +41,7 @@ class VTKCOMMONEXECUTIONMODEL_EXPORT vtkUniformGridPartitioner :
public:
static vtkUniformGridPartitioner *New();
vtkTypeMacro(vtkUniformGridPartitioner, vtkMultiBlockDataSetAlgorithm);
- void PrintSelf(ostream &oss, vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf(ostream &oss, vtkIndent indent ) override;
//@{
/**
@@ -67,13 +67,13 @@ class VTKCOMMONEXECUTIONMODEL_EXPORT vtkUniformGridPartitioner :
protected:
vtkUniformGridPartitioner();
- ~vtkUniformGridPartitioner() VTK_OVERRIDE;
+ ~vtkUniformGridPartitioner() override;
// Standard Pipeline methods
int RequestData(
- vtkInformation*,vtkInformationVector**,vtkInformationVector*) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
- int FillOutputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ vtkInformation*,vtkInformationVector**,vtkInformationVector*) override;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
+ int FillOutputPortInformation(int port, vtkInformation *info) override;
int NumberOfPartitions;
int NumberOfGhostLayers;
diff --git a/Common/ExecutionModel/vtkUnstructuredGridAlgorithm.h b/Common/ExecutionModel/vtkUnstructuredGridAlgorithm.h
index b21dd0dea167fcb305e79faaaf9d5403e76d08a9..33c5631833bbc733a667f7e76e159356557b55aa 100644
--- a/Common/ExecutionModel/vtkUnstructuredGridAlgorithm.h
+++ b/Common/ExecutionModel/vtkUnstructuredGridAlgorithm.h
@@ -42,7 +42,7 @@ class VTKCOMMONEXECUTIONMODEL_EXPORT vtkUnstructuredGridAlgorithm : public vtkAl
public:
static vtkUnstructuredGridAlgorithm *New();
vtkTypeMacro(vtkUnstructuredGridAlgorithm,vtkAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -58,7 +58,7 @@ public:
*/
int ProcessRequest(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
// this method is not recommended for use, but lots of old style filters
// use it
@@ -88,7 +88,7 @@ public:
protected:
vtkUnstructuredGridAlgorithm();
- ~vtkUnstructuredGridAlgorithm() VTK_OVERRIDE;
+ ~vtkUnstructuredGridAlgorithm() override;
// convenience method
virtual int RequestInformation(vtkInformation* request,
@@ -112,8 +112,8 @@ protected:
vtkInformationVector*);
// see algorithm for more info
- int FillOutputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillOutputPortInformation(int port, vtkInformation* info) override;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
private:
vtkUnstructuredGridAlgorithm(const vtkUnstructuredGridAlgorithm&) VTK_DELETE_FUNCTION;
diff --git a/Common/ExecutionModel/vtkUnstructuredGridBaseAlgorithm.h b/Common/ExecutionModel/vtkUnstructuredGridBaseAlgorithm.h
index 81c5ff77c8d84b3aadea243b2e72b0b89a0de4f8..8f2ebdeb69f450913750e3b2e7aaf8f5728892b9 100644
--- a/Common/ExecutionModel/vtkUnstructuredGridBaseAlgorithm.h
+++ b/Common/ExecutionModel/vtkUnstructuredGridBaseAlgorithm.h
@@ -42,7 +42,7 @@ class VTKCOMMONEXECUTIONMODEL_EXPORT vtkUnstructuredGridBaseAlgorithm
public:
static vtkUnstructuredGridBaseAlgorithm *New();
vtkTypeMacro(vtkUnstructuredGridBaseAlgorithm, vtkAlgorithm)
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -58,7 +58,7 @@ public:
*/
int ProcessRequest(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
//@{
/**
@@ -82,7 +82,7 @@ public:
protected:
vtkUnstructuredGridBaseAlgorithm();
- ~vtkUnstructuredGridBaseAlgorithm() VTK_OVERRIDE;
+ ~vtkUnstructuredGridBaseAlgorithm() override;
// convenience method
virtual int RequestInformation(vtkInformation* request,
@@ -114,8 +114,8 @@ protected:
vtkInformationVector*);
// see algorithm for more info
- int FillOutputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillOutputPortInformation(int port, vtkInformation* info) override;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
private:
vtkUnstructuredGridBaseAlgorithm(const vtkUnstructuredGridBaseAlgorithm&) VTK_DELETE_FUNCTION;
diff --git a/Common/Math/vtkAmoebaMinimizer.h b/Common/Math/vtkAmoebaMinimizer.h
index ca9a1d42201dd7aae59c2a49c750f48c883b7df4..6551cf30f3c58a9a6f3ebcaa60736a1a44f51f0c 100644
--- a/Common/Math/vtkAmoebaMinimizer.h
+++ b/Common/Math/vtkAmoebaMinimizer.h
@@ -37,7 +37,7 @@ class VTKCOMMONMATH_EXPORT vtkAmoebaMinimizer : public vtkObject
public:
static vtkAmoebaMinimizer *New();
vtkTypeMacro(vtkAmoebaMinimizer,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Specify the function to be minimized. When this function
@@ -196,7 +196,7 @@ public:
protected:
vtkAmoebaMinimizer();
- ~vtkAmoebaMinimizer() VTK_OVERRIDE;
+ ~vtkAmoebaMinimizer() override;
void (*Function)(void *);
void (*FunctionArgDelete)(void *);
diff --git a/Common/Math/vtkFunctionSet.h b/Common/Math/vtkFunctionSet.h
index 6597e80f8a89136ec56d70bbe4d884f8dfc161aa..2c4c818ab39717e55a7c22944dc752eceeda657a 100644
--- a/Common/Math/vtkFunctionSet.h
+++ b/Common/Math/vtkFunctionSet.h
@@ -36,7 +36,7 @@ class VTKCOMMONMATH_EXPORT vtkFunctionSet : public vtkObject
{
public:
vtkTypeMacro(vtkFunctionSet,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Evaluate functions at x_j.
@@ -64,7 +64,7 @@ public:
protected:
vtkFunctionSet();
- ~vtkFunctionSet() VTK_OVERRIDE {}
+ ~vtkFunctionSet() override {}
int NumFuncs;
int NumIndepVars;
diff --git a/Common/Math/vtkInitialValueProblemSolver.h b/Common/Math/vtkInitialValueProblemSolver.h
index 40dc2b691ec5d879ace7fe11b302ef1648342c40..f5e8afceb6fc9f01d125a6980a0fc1a9ece5669d 100644
--- a/Common/Math/vtkInitialValueProblemSolver.h
+++ b/Common/Math/vtkInitialValueProblemSolver.h
@@ -41,7 +41,7 @@ class VTKCOMMONMATH_EXPORT vtkInitialValueProblemSolver : public vtkObject
{
public:
vtkTypeMacro(vtkInitialValueProblemSolver,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -122,7 +122,7 @@ public:
protected:
vtkInitialValueProblemSolver();
- ~vtkInitialValueProblemSolver() VTK_OVERRIDE;
+ ~vtkInitialValueProblemSolver() override;
virtual void Initialize();
diff --git a/Common/Math/vtkMatrix3x3.h b/Common/Math/vtkMatrix3x3.h
index 49bf653d1f269d5270754b2406911588c9a65474..351a09203a37b1f266c8ba2bf720dfca286d4c30 100644
--- a/Common/Math/vtkMatrix3x3.h
+++ b/Common/Math/vtkMatrix3x3.h
@@ -48,7 +48,7 @@ public:
static vtkMatrix3x3 *New();
vtkTypeMacro(vtkMatrix3x3,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Set the elements of the matrix to the same values as the elements
@@ -156,7 +156,7 @@ public:
protected:
vtkMatrix3x3();
- ~vtkMatrix3x3() VTK_OVERRIDE;
+ ~vtkMatrix3x3() override;
double Element[3][3]; // The elements of the 3x3 matrix
diff --git a/Common/Math/vtkMatrix4x4.h b/Common/Math/vtkMatrix4x4.h
index e8e99f892488b296c4777ba9792f1ba8b7a93ae7..89c863ad622712933c784e84de4a9cfbd0a59030 100644
--- a/Common/Math/vtkMatrix4x4.h
+++ b/Common/Math/vtkMatrix4x4.h
@@ -44,7 +44,7 @@ public:
static vtkMatrix4x4 *New();
vtkTypeMacro(vtkMatrix4x4,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Set the elements of the matrix to the same values as the elements
@@ -172,7 +172,7 @@ public:
protected:
vtkMatrix4x4() { vtkMatrix4x4::Identity(*this->Element); };
- ~vtkMatrix4x4() VTK_OVERRIDE {}
+ ~vtkMatrix4x4() override {}
float FloatPoint[4];
double DoublePoint[4];
diff --git a/Common/Math/vtkPolynomialSolversUnivariate.h b/Common/Math/vtkPolynomialSolversUnivariate.h
index c33a10aa1212386ff325018b319e1f8232121c14..c953ed09a9a7c78a70cc9b95a91825816569b611 100644
--- a/Common/Math/vtkPolynomialSolversUnivariate.h
+++ b/Common/Math/vtkPolynomialSolversUnivariate.h
@@ -57,7 +57,7 @@ class VTKCOMMONMATH_EXPORT vtkPolynomialSolversUnivariate : public vtkObject
public:
static vtkPolynomialSolversUnivariate *New();
vtkTypeMacro(vtkPolynomialSolversUnivariate,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static ostream& PrintPolynomial( ostream& os, double* P, int degP );
//@{
@@ -286,7 +286,7 @@ public:
protected:
vtkPolynomialSolversUnivariate() {}
- ~vtkPolynomialSolversUnivariate() VTK_OVERRIDE {}
+ ~vtkPolynomialSolversUnivariate() override {}
static double DivisionTolerance;
diff --git a/Common/Math/vtkQuaternionInterpolator.h b/Common/Math/vtkQuaternionInterpolator.h
index 8a0a02a8c8110ec8bf9ae3a7c674cee9252a3b51..7cf5af9cf7c84a025572d6e3db2f3854cfceb821 100644
--- a/Common/Math/vtkQuaternionInterpolator.h
+++ b/Common/Math/vtkQuaternionInterpolator.h
@@ -65,7 +65,7 @@ class VTKCOMMONMATH_EXPORT vtkQuaternionInterpolator : public vtkObject
{
public:
vtkTypeMacro(vtkQuaternionInterpolator, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Instantiate the class.
@@ -148,7 +148,7 @@ public:
protected:
vtkQuaternionInterpolator();
- ~vtkQuaternionInterpolator() VTK_OVERRIDE;
+ ~vtkQuaternionInterpolator() override;
// Specify the type of interpolation to use
int InterpolationType;
diff --git a/Common/Math/vtkRungeKutta2.h b/Common/Math/vtkRungeKutta2.h
index b712303a789a2e25763b00c1ac63768b8516d300..cd16808d5720cd711c5a1a1133e8b4c55a76c015 100644
--- a/Common/Math/vtkRungeKutta2.h
+++ b/Common/Math/vtkRungeKutta2.h
@@ -58,7 +58,7 @@ public:
*/
int ComputeNextStep(double* xprev, double* xnext,
double t, double& delT,
- double maxError, double& error) VTK_OVERRIDE
+ double maxError, double& error) override
{
double minStep = delT;
double maxStep = delT;
@@ -68,7 +68,7 @@ public:
}
int ComputeNextStep(double* xprev, double* dxprev, double* xnext,
double t, double& delT,
- double maxError, double& error) VTK_OVERRIDE
+ double maxError, double& error) override
{
double minStep = delT;
double maxStep = delT;
@@ -79,7 +79,7 @@ public:
int ComputeNextStep(double* xprev, double* xnext,
double t, double& delT, double& delTActual,
double minStep, double maxStep,
- double maxError, double& error) VTK_OVERRIDE
+ double maxError, double& error) override
{
return this->ComputeNextStep(xprev, nullptr, xnext, t, delT, delTActual,
minStep, maxStep, maxError, error);
@@ -87,12 +87,12 @@ public:
int ComputeNextStep(double* xprev, double* dxprev, double* xnext,
double t, double& delT, double& delTActual,
double minStep, double maxStep,
- double maxError, double& error) VTK_OVERRIDE;
+ double maxError, double& error) override;
//@}
protected:
vtkRungeKutta2();
- ~vtkRungeKutta2() VTK_OVERRIDE;
+ ~vtkRungeKutta2() override;
private:
vtkRungeKutta2(const vtkRungeKutta2&) VTK_DELETE_FUNCTION;
void operator=(const vtkRungeKutta2&) VTK_DELETE_FUNCTION;
diff --git a/Common/Math/vtkRungeKutta4.h b/Common/Math/vtkRungeKutta4.h
index 813a0af02f7d18f7bec34692dfc167d7051a0a8e..3194e34dff207124e0c4eacfe644df5837b5165f 100644
--- a/Common/Math/vtkRungeKutta4.h
+++ b/Common/Math/vtkRungeKutta4.h
@@ -36,7 +36,7 @@ class VTKCOMMONMATH_EXPORT vtkRungeKutta4 : public vtkInitialValueProblemSolver
{
public:
vtkTypeMacro(vtkRungeKutta4,vtkInitialValueProblemSolver);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct a vtkRungeKutta4 with no initial FunctionSet.
@@ -60,7 +60,7 @@ public:
*/
int ComputeNextStep(double* xprev, double* xnext,
double t, double& delT,
- double maxError, double& error) VTK_OVERRIDE
+ double maxError, double& error) override
{
double minStep = delT;
double maxStep = delT;
@@ -70,7 +70,7 @@ public:
}
int ComputeNextStep(double* xprev, double* dxprev, double* xnext,
double t, double& delT,
- double maxError, double& error) VTK_OVERRIDE
+ double maxError, double& error) override
{
double minStep = delT;
double maxStep = delT;
@@ -81,7 +81,7 @@ public:
int ComputeNextStep(double* xprev, double* xnext,
double t, double& delT, double& delTActual,
double minStep, double maxStep,
- double maxError, double& error) VTK_OVERRIDE
+ double maxError, double& error) override
{
return this->ComputeNextStep(xprev, nullptr, xnext, t, delT, delTActual,
minStep, maxStep, maxError, error);
@@ -89,14 +89,14 @@ public:
int ComputeNextStep(double* xprev, double* dxprev, double* xnext,
double t, double& delT, double& delTActual,
double minStep, double maxStep,
- double maxError, double& error) VTK_OVERRIDE;
+ double maxError, double& error) override;
//@}
protected:
vtkRungeKutta4();
- ~vtkRungeKutta4() VTK_OVERRIDE;
+ ~vtkRungeKutta4() override;
- void Initialize() VTK_OVERRIDE;
+ void Initialize() override;
double* NextDerivs[3];
private:
diff --git a/Common/Math/vtkRungeKutta45.h b/Common/Math/vtkRungeKutta45.h
index 4df4b36b90c51d50fb96aea2354921243be0928a..c38e726e779db6857762e40458954c0c59687065 100644
--- a/Common/Math/vtkRungeKutta45.h
+++ b/Common/Math/vtkRungeKutta45.h
@@ -42,7 +42,7 @@ class VTKCOMMONMATH_EXPORT vtkRungeKutta45 : public vtkInitialValueProblemSolver
{
public:
vtkTypeMacro(vtkRungeKutta45,vtkInitialValueProblemSolver);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct a vtkRungeKutta45 with no initial FunctionSet.
@@ -74,7 +74,7 @@ public:
*/
int ComputeNextStep(double* xprev, double* xnext,
double t, double& delT,
- double maxError, double& error) VTK_OVERRIDE
+ double maxError, double& error) override
{
double minStep = delT;
double maxStep = delT;
@@ -84,7 +84,7 @@ public:
}
int ComputeNextStep(double* xprev, double* dxprev, double* xnext,
double t, double& delT,
- double maxError, double& error) VTK_OVERRIDE
+ double maxError, double& error) override
{
double minStep = delT;
double maxStep = delT;
@@ -95,7 +95,7 @@ public:
int ComputeNextStep(double* xprev, double* xnext,
double t, double& delT, double& delTActual,
double minStep, double maxStep,
- double maxError, double& error) VTK_OVERRIDE
+ double maxError, double& error) override
{
return this->ComputeNextStep(xprev, nullptr, xnext, t, delT, delTActual,
minStep, maxStep, maxError, error);
@@ -103,14 +103,14 @@ public:
int ComputeNextStep(double* xprev, double* dxprev, double* xnext,
double t, double& delT, double& delTActual,
double minStep, double maxStep,
- double maxError, double& error) VTK_OVERRIDE;
+ double maxError, double& error) override;
//@}
protected:
vtkRungeKutta45();
- ~vtkRungeKutta45() VTK_OVERRIDE;
+ ~vtkRungeKutta45() override;
- void Initialize() VTK_OVERRIDE;
+ void Initialize() override;
// Cash-Karp parameters
static double A[5];
diff --git a/Common/Misc/vtkContourValues.h b/Common/Misc/vtkContourValues.h
index 94963d35ef1e653d1c7f57bb1aa14d3dc6b00159..489a7e398931d47b32f768b70fdd6efdcc0d3288 100644
--- a/Common/Misc/vtkContourValues.h
+++ b/Common/Misc/vtkContourValues.h
@@ -41,7 +41,7 @@ public:
static vtkContourValues *New();
vtkTypeMacro(vtkContourValues,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Set the ith contour value.
@@ -93,7 +93,7 @@ public:
protected:
vtkContourValues();
- ~vtkContourValues() VTK_OVERRIDE;
+ ~vtkContourValues() override;
vtkDoubleArray *Contours;
diff --git a/Common/Misc/vtkFunctionParser.h b/Common/Misc/vtkFunctionParser.h
index ae9ddf7dc6433b58fb5175e5b9061a164b781c81..c9b9e5eb27342102ca0cf102e8194a515cc0f353 100644
--- a/Common/Misc/vtkFunctionParser.h
+++ b/Common/Misc/vtkFunctionParser.h
@@ -135,12 +135,12 @@ class VTKCOMMONMISC_EXPORT vtkFunctionParser : public vtkObject
public:
static vtkFunctionParser *New();
vtkTypeMacro(vtkFunctionParser, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Return parser's MTime
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
//@{
/**
@@ -311,7 +311,7 @@ public:
protected:
vtkFunctionParser();
- ~vtkFunctionParser() VTK_OVERRIDE;
+ ~vtkFunctionParser() override;
int Parse();
diff --git a/Common/Misc/vtkHeap.h b/Common/Misc/vtkHeap.h
index 015d8db8de62cab4c81c9ed32f4f297fa7a57cf2..eb97160bf1f358a20fe33987316d4d865d0c18c1 100644
--- a/Common/Misc/vtkHeap.h
+++ b/Common/Misc/vtkHeap.h
@@ -55,7 +55,7 @@ class VTKCOMMONMISC_EXPORT vtkHeap : public vtkObject
public:
static vtkHeap *New();
vtkTypeMacro(vtkHeap,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Allocate the memory requested.
@@ -95,7 +95,7 @@ public:
protected:
vtkHeap();
- ~vtkHeap() VTK_OVERRIDE;
+ ~vtkHeap() override;
void Add(size_t blockSize);
void CleanAll();
diff --git a/Common/System/vtkClientSocket.h b/Common/System/vtkClientSocket.h
index 55c82c49f195527cf1ad8fec311e087a58bb7bf1..2747c41d815773b56d3eeb760d20adc176847e5d 100644
--- a/Common/System/vtkClientSocket.h
+++ b/Common/System/vtkClientSocket.h
@@ -29,7 +29,7 @@ class VTKCOMMONSYSTEM_EXPORT vtkClientSocket : public vtkSocket
public:
static vtkClientSocket* New();
vtkTypeMacro(vtkClientSocket, vtkSocket);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Connects to host. Returns 0 on success, -1 on error.
@@ -48,7 +48,7 @@ public:
protected:
vtkClientSocket();
- ~vtkClientSocket() VTK_OVERRIDE;
+ ~vtkClientSocket() override;
vtkSetMacro(ConnectingSide, bool);
bool ConnectingSide;
diff --git a/Common/System/vtkDirectory.h b/Common/System/vtkDirectory.h
index eec3a205a6ffd806cc242ebb6dc90f4cf773d705..d579e0c4cb43979574f844e73375d88ab2c172f7 100644
--- a/Common/System/vtkDirectory.h
+++ b/Common/System/vtkDirectory.h
@@ -49,7 +49,7 @@ public:
/**
* Print directory to stream.
*/
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Open the specified directory and load the names of the files
@@ -108,7 +108,7 @@ protected:
// NumberOfFiles to 0
void CleanUpFilesAndPath();
vtkDirectory();
- ~vtkDirectory() VTK_OVERRIDE;
+ ~vtkDirectory() override;
private:
char* Path; // Path to Open'ed directory
diff --git a/Common/System/vtkServerSocket.h b/Common/System/vtkServerSocket.h
index 0fd5e1a53eb19c608df3cc4fa5a9076e575dd1d0..8ba8a3765e925e6e3716089b797e016c9a5651d7 100644
--- a/Common/System/vtkServerSocket.h
+++ b/Common/System/vtkServerSocket.h
@@ -31,7 +31,7 @@ class VTKCOMMONSYSTEM_EXPORT vtkServerSocket : public vtkSocket
public:
static vtkServerSocket* New();
vtkTypeMacro(vtkServerSocket, vtkSocket);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Creates a server socket at a given port and binds to it.
@@ -53,7 +53,7 @@ public:
protected:
vtkServerSocket();
- ~vtkServerSocket() VTK_OVERRIDE;
+ ~vtkServerSocket() override;
private:
vtkServerSocket(const vtkServerSocket&) VTK_DELETE_FUNCTION;
diff --git a/Common/System/vtkSocket.h b/Common/System/vtkSocket.h
index 333f720b3cc69c221e44677b4982fb02c41a0ec6..c2fe6c360ae4b1a0bd8608573fc37fbd50287c66 100644
--- a/Common/System/vtkSocket.h
+++ b/Common/System/vtkSocket.h
@@ -31,7 +31,7 @@ class VTKCOMMONSYSTEM_EXPORT vtkSocket : public vtkObject
{
public:
vtkTypeMacro(vtkSocket, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
// ----- Status API ----
/**
@@ -77,7 +77,7 @@ public:
protected:
vtkSocket();
- ~vtkSocket() VTK_OVERRIDE;
+ ~vtkSocket() override;
int SocketDescriptor;
diff --git a/Common/System/vtkSocketCollection.h b/Common/System/vtkSocketCollection.h
index cf2a56492b46a73ea09abe1eb998bda4072e50b0..51af81daee2a94dbb9c88328565695315f16c924 100644
--- a/Common/System/vtkSocketCollection.h
+++ b/Common/System/vtkSocketCollection.h
@@ -33,7 +33,7 @@ class VTKCOMMONSYSTEM_EXPORT vtkSocketCollection : public vtkCollection
public:
static vtkSocketCollection* New();
vtkTypeMacro(vtkSocketCollection, vtkCollection);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
// Add Socket to the collection.
void AddItem(vtkSocket* soc);
@@ -65,7 +65,7 @@ public:
protected:
vtkSocketCollection();
- ~vtkSocketCollection() VTK_OVERRIDE;
+ ~vtkSocketCollection() override;
vtkSocket* SelectedSocket;
private:
diff --git a/Common/System/vtkThreadMessager.h b/Common/System/vtkThreadMessager.h
index ca1cd26019884cdad622e18fa456c05bf928535a..77fc7c00e2b0ef96ba597235e49bc82ce994dbd8 100644
--- a/Common/System/vtkThreadMessager.h
+++ b/Common/System/vtkThreadMessager.h
@@ -36,7 +36,7 @@ public:
static vtkThreadMessager *New();
vtkTypeMacro(vtkThreadMessager,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Wait (block, non-busy) until another thread sends a
@@ -73,7 +73,7 @@ public:
protected:
vtkThreadMessager();
- ~vtkThreadMessager() VTK_OVERRIDE;
+ ~vtkThreadMessager() override;
#ifdef VTK_USE_PTHREADS
pthread_mutex_t Mutex;
diff --git a/Common/System/vtkTimerLog.h b/Common/System/vtkTimerLog.h
index caf546ca753cbfd1dd40e4039da11e1b7899b684..5707fd84397bdcdfbcb9b29861c7eac9a013ead7 100644
--- a/Common/System/vtkTimerLog.h
+++ b/Common/System/vtkTimerLog.h
@@ -88,7 +88,7 @@ public:
static vtkTimerLog *New();
vtkTypeMacro(vtkTimerLog,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* This flag will turn logging of events off or on.
@@ -208,7 +208,7 @@ public:
protected:
vtkTimerLog() {this->StartTime=0; this->EndTime = 0;}; //insure constructor/destructor protected
- ~vtkTimerLog() VTK_OVERRIDE { };
+ ~vtkTimerLog() override { };
static int Logging;
static int Indent;
diff --git a/Common/Transforms/vtkAbstractTransform.cxx b/Common/Transforms/vtkAbstractTransform.cxx
index e14e8b01548343c5794ee9db15d73ce2da22a653..cc7949cc27b401fe108b20beaaecfd78c6b14fa1 100644
--- a/Common/Transforms/vtkAbstractTransform.cxx
+++ b/Common/Transforms/vtkAbstractTransform.cxx
@@ -363,8 +363,8 @@ class vtkSimpleTransform : public vtkHomogeneousTransform
public:
vtkTypeMacro(vtkSimpleTransform,vtkHomogeneousTransform);
static vtkSimpleTransform *New() { VTK_STANDARD_NEW_BODY(vtkSimpleTransform) }
- vtkAbstractTransform *MakeTransform() VTK_OVERRIDE { return vtkSimpleTransform::New(); };
- void Inverse() VTK_OVERRIDE { this->Matrix->Invert(); this->Modified(); };
+ vtkAbstractTransform *MakeTransform() override { return vtkSimpleTransform::New(); };
+ void Inverse() override { this->Matrix->Invert(); this->Modified(); };
protected:
vtkSimpleTransform() {};
vtkSimpleTransform(const vtkSimpleTransform&);
diff --git a/Common/Transforms/vtkAbstractTransform.h b/Common/Transforms/vtkAbstractTransform.h
index d9fcc33ba732042717eac5ca23d5f27db2b63014..ceae088f57d8c3096998ac890e7220456a517b2e 100644
--- a/Common/Transforms/vtkAbstractTransform.h
+++ b/Common/Transforms/vtkAbstractTransform.h
@@ -52,7 +52,7 @@ class VTKCOMMONTRANSFORMS_EXPORT vtkAbstractTransform : public vtkObject
public:
vtkTypeMacro(vtkAbstractTransform,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Apply the transformation to a coordinate. You can use the same
@@ -280,17 +280,17 @@ public:
/**
* Override GetMTime necessary because of inverse transforms.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
/**
* Needs a special UnRegister() implementation to avoid
* circular references.
*/
- void UnRegister(vtkObjectBase *O) VTK_OVERRIDE;
+ void UnRegister(vtkObjectBase *O) override;
protected:
vtkAbstractTransform();
- ~vtkAbstractTransform() VTK_OVERRIDE;
+ ~vtkAbstractTransform() override;
/**
* Perform any subclass-specific Update.
diff --git a/Common/Transforms/vtkCylindricalTransform.h b/Common/Transforms/vtkCylindricalTransform.h
index b743571a59a7b30ff3edb418050861452ac33c2c..aee939e6bc6b6415b0eaf22301753c1fb11bf64f 100644
--- a/Common/Transforms/vtkCylindricalTransform.h
+++ b/Common/Transforms/vtkCylindricalTransform.h
@@ -39,42 +39,42 @@ class VTKCOMMONTRANSFORMS_EXPORT vtkCylindricalTransform : public vtkWarpTransfo
public:
static vtkCylindricalTransform *New();
vtkTypeMacro(vtkCylindricalTransform,vtkWarpTransform);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Make another transform of the same type.
*/
- vtkAbstractTransform *MakeTransform() VTK_OVERRIDE;
+ vtkAbstractTransform *MakeTransform() override;
protected:
vtkCylindricalTransform();
- ~vtkCylindricalTransform() VTK_OVERRIDE;
+ ~vtkCylindricalTransform() override;
/**
* Copy this transform from another of the same type.
*/
- void InternalDeepCopy(vtkAbstractTransform *transform) VTK_OVERRIDE;
+ void InternalDeepCopy(vtkAbstractTransform *transform) override;
//@{
/**
* Internal functions for calculating the transformation.
*/
- void ForwardTransformPoint(const float in[3], float out[3]) VTK_OVERRIDE;
- void ForwardTransformPoint(const double in[3], double out[3]) VTK_OVERRIDE;
+ void ForwardTransformPoint(const float in[3], float out[3]) override;
+ void ForwardTransformPoint(const double in[3], double out[3]) override;
//@}
void ForwardTransformDerivative(const float in[3], float out[3],
- float derivative[3][3]) VTK_OVERRIDE;
+ float derivative[3][3]) override;
void ForwardTransformDerivative(const double in[3], double out[3],
- double derivative[3][3]) VTK_OVERRIDE;
+ double derivative[3][3]) override;
- void InverseTransformPoint(const float in[3], float out[3]) VTK_OVERRIDE;
- void InverseTransformPoint(const double in[3], double out[3]) VTK_OVERRIDE;
+ void InverseTransformPoint(const float in[3], float out[3]) override;
+ void InverseTransformPoint(const double in[3], double out[3]) override;
void InverseTransformDerivative(const float in[3], float out[3],
- float derivative[3][3]) VTK_OVERRIDE;
+ float derivative[3][3]) override;
void InverseTransformDerivative(const double in[3], double out[3],
- double derivative[3][3]) VTK_OVERRIDE;
+ double derivative[3][3]) override;
private:
vtkCylindricalTransform(const vtkCylindricalTransform&) VTK_DELETE_FUNCTION;
diff --git a/Common/Transforms/vtkGeneralTransform.h b/Common/Transforms/vtkGeneralTransform.h
index 9c25dca1f68e345005a31e9cbc6101bf75e8731c..820edc2ebc5637679e4eccb04769e71c1a059996 100644
--- a/Common/Transforms/vtkGeneralTransform.h
+++ b/Common/Transforms/vtkGeneralTransform.h
@@ -40,7 +40,7 @@ public:
static vtkGeneralTransform *New();
vtkTypeMacro(vtkGeneralTransform,vtkAbstractTransform);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Set this transformation to the identity transformation. If
@@ -55,7 +55,7 @@ public:
* the transformation will use the inverse of its Input, if an Input
* has been set.
*/
- void Inverse() VTK_OVERRIDE
+ void Inverse() override
{ this->Concatenation->Inverse(); this->Modified(); }
//@{
@@ -224,8 +224,8 @@ public:
* This will calculate the transformation without calling Update.
* Meant for use only within other VTK classes.
*/
- void InternalTransformPoint(const float in[3], float out[3]) VTK_OVERRIDE;
- void InternalTransformPoint(const double in[3], double out[3]) VTK_OVERRIDE;
+ void InternalTransformPoint(const float in[3], float out[3]) override;
+ void InternalTransformPoint(const double in[3], double out[3]) override;
//@}
//@{
@@ -235,9 +235,9 @@ public:
* classes.
*/
void InternalTransformDerivative(const float in[3], float out[3],
- float derivative[3][3]) VTK_OVERRIDE;
+ float derivative[3][3]) override;
void InternalTransformDerivative(const double in[3], double out[3],
- double derivative[3][3]) VTK_OVERRIDE;
+ double derivative[3][3]) override;
//@}
/**
@@ -248,24 +248,24 @@ public:
* and Concatenate(vtkXTransform *). Avoid using this function,
* it is experimental.
*/
- int CircuitCheck(vtkAbstractTransform *transform) VTK_OVERRIDE;
+ int CircuitCheck(vtkAbstractTransform *transform) override;
/**
* Make another transform of the same type.
*/
- vtkAbstractTransform *MakeTransform() VTK_OVERRIDE;
+ vtkAbstractTransform *MakeTransform() override;
/**
* Override GetMTime to account for input and concatenation.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
protected:
vtkGeneralTransform();
- ~vtkGeneralTransform() VTK_OVERRIDE;
+ ~vtkGeneralTransform() override;
- void InternalDeepCopy(vtkAbstractTransform *t) VTK_OVERRIDE;
- void InternalUpdate() VTK_OVERRIDE;
+ void InternalDeepCopy(vtkAbstractTransform *t) override;
+ void InternalUpdate() override;
vtkAbstractTransform *Input;
vtkTransformConcatenation *Concatenation;
diff --git a/Common/Transforms/vtkHomogeneousTransform.h b/Common/Transforms/vtkHomogeneousTransform.h
index 2510f3b2c0cd8028da6c2bbfdcdb1dd79defd9e2..3640d034cb40f9354c876f8e7e0951efa8c043dc 100644
--- a/Common/Transforms/vtkHomogeneousTransform.h
+++ b/Common/Transforms/vtkHomogeneousTransform.h
@@ -36,13 +36,13 @@ class VTKCOMMONTRANSFORMS_EXPORT vtkHomogeneousTransform : public vtkAbstractTra
public:
vtkTypeMacro(vtkHomogeneousTransform,vtkAbstractTransform);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Apply the transformation to a series of points, and append the
* results to outPts.
*/
- void TransformPoints(vtkPoints *inPts, vtkPoints *outPts) VTK_OVERRIDE;
+ void TransformPoints(vtkPoints *inPts, vtkPoints *outPts) override;
/**
* Apply the transformation to a combination of points, normals
@@ -53,7 +53,7 @@ public:
vtkDataArray *inNms,
vtkDataArray *outNms,
vtkDataArray *inVrs,
- vtkDataArray *outVrs) VTK_OVERRIDE;
+ vtkDataArray *outVrs) override;
/**
* Get a copy of the internal transformation matrix. The
@@ -84,8 +84,8 @@ public:
* This will calculate the transformation without calling Update.
* Meant for use only within other VTK classes.
*/
- void InternalTransformPoint(const float in[3], float out[3]) VTK_OVERRIDE;
- void InternalTransformPoint(const double in[3], double out[3]) VTK_OVERRIDE;
+ void InternalTransformPoint(const float in[3], float out[3]) override;
+ void InternalTransformPoint(const double in[3], double out[3]) override;
//@}
//@{
@@ -95,16 +95,16 @@ public:
* classes.
*/
void InternalTransformDerivative(const float in[3], float out[3],
- float derivative[3][3]) VTK_OVERRIDE;
+ float derivative[3][3]) override;
void InternalTransformDerivative(const double in[3], double out[3],
- double derivative[3][3]) VTK_OVERRIDE;
+ double derivative[3][3]) override;
//@}
protected:
vtkHomogeneousTransform();
- ~vtkHomogeneousTransform() VTK_OVERRIDE;
+ ~vtkHomogeneousTransform() override;
- void InternalDeepCopy(vtkAbstractTransform *transform) VTK_OVERRIDE;
+ void InternalDeepCopy(vtkAbstractTransform *transform) override;
vtkMatrix4x4 *Matrix;
diff --git a/Common/Transforms/vtkIdentityTransform.h b/Common/Transforms/vtkIdentityTransform.h
index 169f22dfd7c13819d74e4f37fea7c8f40515ead5..4ce9e02548ab4d2df58113d90181e02bb1506610 100644
--- a/Common/Transforms/vtkIdentityTransform.h
+++ b/Common/Transforms/vtkIdentityTransform.h
@@ -35,25 +35,25 @@ public:
static vtkIdentityTransform *New();
vtkTypeMacro(vtkIdentityTransform,vtkLinearTransform);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Apply the transformation to a series of points, and append the
* results to outPts.
*/
- void TransformPoints(vtkPoints *inPts, vtkPoints *outPts) VTK_OVERRIDE;
+ void TransformPoints(vtkPoints *inPts, vtkPoints *outPts) override;
/**
* Apply the transformation to a series of normals, and append the
* results to outNms.
*/
- void TransformNormals(vtkDataArray *inNms, vtkDataArray *outNms) VTK_OVERRIDE;
+ void TransformNormals(vtkDataArray *inNms, vtkDataArray *outNms) override;
/**
* Apply the transformation to a series of vectors, and append the
* results to outVrs.
*/
- void TransformVectors(vtkDataArray *inVrs, vtkDataArray *outVrs) VTK_OVERRIDE;
+ void TransformVectors(vtkDataArray *inVrs, vtkDataArray *outVrs) override;
/**
* Apply the transformation to a combination of points, normals
@@ -64,19 +64,19 @@ public:
vtkDataArray *inNms,
vtkDataArray *outNms,
vtkDataArray *inVrs,
- vtkDataArray *outVrs) VTK_OVERRIDE;
+ vtkDataArray *outVrs) override;
// Invert the transformation. This doesn't do anything to the
// identity transformation.
- void Inverse() VTK_OVERRIDE {}
+ void Inverse() override {}
//@{
/**
* This will calculate the transformation without calling Update.
* Meant for use only within other VTK classes.
*/
- void InternalTransformPoint(const float in[3], float out[3]) VTK_OVERRIDE;
- void InternalTransformPoint(const double in[3], double out[3]) VTK_OVERRIDE;
+ void InternalTransformPoint(const float in[3], float out[3]) override;
+ void InternalTransformPoint(const double in[3], double out[3]) override;
//@}
//@{
@@ -84,8 +84,8 @@ public:
* This will calculate the transformation without calling Update.
* Meant for use only within other VTK classes.
*/
- void InternalTransformNormal(const float in[3], float out[3]) VTK_OVERRIDE;
- void InternalTransformNormal(const double in[3], double out[3]) VTK_OVERRIDE;
+ void InternalTransformNormal(const float in[3], float out[3]) override;
+ void InternalTransformNormal(const double in[3], double out[3]) override;
//@}
//@{
@@ -93,8 +93,8 @@ public:
* This will calculate the transformation without calling Update.
* Meant for use only within other VTK classes.
*/
- void InternalTransformVector(const float in[3], float out[3]) VTK_OVERRIDE;
- void InternalTransformVector(const double in[3], double out[3]) VTK_OVERRIDE;
+ void InternalTransformVector(const float in[3], float out[3]) override;
+ void InternalTransformVector(const double in[3], double out[3]) override;
//@}
//@{
@@ -104,22 +104,22 @@ public:
* classes.
*/
void InternalTransformDerivative(const float in[3], float out[3],
- float derivative[3][3]) VTK_OVERRIDE;
+ float derivative[3][3]) override;
void InternalTransformDerivative(const double in[3], double out[3],
- double derivative[3][3]) VTK_OVERRIDE;
+ double derivative[3][3]) override;
//@}
/**
* Make a transform of the same type. This will actually
* return the same transform.
*/
- vtkAbstractTransform *MakeTransform() VTK_OVERRIDE;
+ vtkAbstractTransform *MakeTransform() override;
protected:
vtkIdentityTransform();
- ~vtkIdentityTransform() VTK_OVERRIDE;
+ ~vtkIdentityTransform() override;
- void InternalDeepCopy(vtkAbstractTransform *t) VTK_OVERRIDE;
+ void InternalDeepCopy(vtkAbstractTransform *t) override;
private:
vtkIdentityTransform(const vtkIdentityTransform&) VTK_DELETE_FUNCTION;
diff --git a/Common/Transforms/vtkLandmarkTransform.h b/Common/Transforms/vtkLandmarkTransform.h
index ff2089cea90b833141e334c2864316dcb030ebc4..a3243f75c3900e7dfc41185f8b161b6e924f298f 100644
--- a/Common/Transforms/vtkLandmarkTransform.h
+++ b/Common/Transforms/vtkLandmarkTransform.h
@@ -45,7 +45,7 @@ public:
static vtkLandmarkTransform *New();
vtkTypeMacro(vtkLandmarkTransform,vtkLinearTransform);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -87,29 +87,29 @@ public:
* Invert the transformation. This is done by switching the
* source and target landmarks.
*/
- void Inverse() VTK_OVERRIDE;
+ void Inverse() override;
/**
* Get the MTime.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
/**
* Make another transform of the same type.
*/
- vtkAbstractTransform *MakeTransform() VTK_OVERRIDE;
+ vtkAbstractTransform *MakeTransform() override;
protected:
vtkLandmarkTransform();
- ~vtkLandmarkTransform() VTK_OVERRIDE;
+ ~vtkLandmarkTransform() override;
// Update the matrix from the quaternion.
- void InternalUpdate() VTK_OVERRIDE;
+ void InternalUpdate() override;
/**
* This method does no type checking, use DeepCopy instead.
*/
- void InternalDeepCopy(vtkAbstractTransform *transform) VTK_OVERRIDE;
+ void InternalDeepCopy(vtkAbstractTransform *transform) override;
vtkPoints* SourceLandmarks;
vtkPoints* TargetLandmarks;
diff --git a/Common/Transforms/vtkLinearTransform.h b/Common/Transforms/vtkLinearTransform.h
index 093f3e53e4d1c06881ced0a70504f96d1307b08a..de6024ee25304146419b0adb90ebafa020d79a51 100644
--- a/Common/Transforms/vtkLinearTransform.h
+++ b/Common/Transforms/vtkLinearTransform.h
@@ -33,7 +33,7 @@ class VTKCOMMONTRANSFORMS_EXPORT vtkLinearTransform : public vtkHomogeneousTrans
public:
vtkTypeMacro(vtkLinearTransform,vtkHomogeneousTransform);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Apply the transformation to a normal.
@@ -145,7 +145,7 @@ public:
* Apply the transformation to a series of points, and append the
* results to outPts.
*/
- void TransformPoints(vtkPoints *inPts, vtkPoints *outPts) VTK_OVERRIDE;
+ void TransformPoints(vtkPoints *inPts, vtkPoints *outPts) override;
/**
* Apply the transformation to a series of normals, and append the
@@ -168,7 +168,7 @@ public:
vtkDataArray *inNms,
vtkDataArray *outNms,
vtkDataArray *inVrs,
- vtkDataArray *outVrs) VTK_OVERRIDE;
+ vtkDataArray *outVrs) override;
/**
* Just like GetInverse, but it includes a typecast to
@@ -184,8 +184,8 @@ public:
* This will calculate the transformation without calling Update.
* Meant for use only within other VTK classes.
*/
- void InternalTransformPoint(const float in[3], float out[3]) VTK_OVERRIDE;
- void InternalTransformPoint(const double in[3], double out[3]) VTK_OVERRIDE;
+ void InternalTransformPoint(const float in[3], float out[3]) override;
+ void InternalTransformPoint(const double in[3], double out[3]) override;
//@}
//@{
@@ -213,14 +213,14 @@ public:
* classes.
*/
void InternalTransformDerivative(const float in[3], float out[3],
- float derivative[3][3]) VTK_OVERRIDE;
+ float derivative[3][3]) override;
void InternalTransformDerivative(const double in[3], double out[3],
- double derivative[3][3]) VTK_OVERRIDE;
+ double derivative[3][3]) override;
//@}
protected:
vtkLinearTransform() {}
- ~vtkLinearTransform() VTK_OVERRIDE {}
+ ~vtkLinearTransform() override {}
private:
vtkLinearTransform(const vtkLinearTransform&) VTK_DELETE_FUNCTION;
void operator=(const vtkLinearTransform&) VTK_DELETE_FUNCTION;
diff --git a/Common/Transforms/vtkMatrixToHomogeneousTransform.h b/Common/Transforms/vtkMatrixToHomogeneousTransform.h
index f739aac5f50b7e50953e87f9927f6a998374cb25..05e4ab359963eaa890b97dcaf0ba8e509e5c389b 100644
--- a/Common/Transforms/vtkMatrixToHomogeneousTransform.h
+++ b/Common/Transforms/vtkMatrixToHomogeneousTransform.h
@@ -39,7 +39,7 @@ class VTKCOMMONTRANSFORMS_EXPORT vtkMatrixToHomogeneousTransform : public vtkHom
public:
static vtkMatrixToHomogeneousTransform *New();
vtkTypeMacro(vtkMatrixToHomogeneousTransform,vtkHomogeneousTransform);
- void PrintSelf (ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf (ostream& os, vtkIndent indent) override;
// Set the input matrix. Any modifications to the matrix will be
// reflected in the transformation.
@@ -50,24 +50,24 @@ class VTKCOMMONTRANSFORMS_EXPORT vtkMatrixToHomogeneousTransform : public vtkHom
* The input matrix is left as-is, but the transformation matrix
* is inverted.
*/
- void Inverse() VTK_OVERRIDE;
+ void Inverse() override;
/**
* Get the MTime: this is the bit of magic that makes everything work.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
/**
* Make a new transform of the same type.
*/
- vtkAbstractTransform *MakeTransform() VTK_OVERRIDE;
+ vtkAbstractTransform *MakeTransform() override;
protected:
vtkMatrixToHomogeneousTransform();
- ~vtkMatrixToHomogeneousTransform() VTK_OVERRIDE;
+ ~vtkMatrixToHomogeneousTransform() override;
- void InternalUpdate() VTK_OVERRIDE;
- void InternalDeepCopy(vtkAbstractTransform *transform) VTK_OVERRIDE;
+ void InternalUpdate() override;
+ void InternalDeepCopy(vtkAbstractTransform *transform) override;
int InverseFlag;
vtkMatrix4x4 *Input;
diff --git a/Common/Transforms/vtkMatrixToLinearTransform.h b/Common/Transforms/vtkMatrixToLinearTransform.h
index 0bdb7499ee5301a01ef14ee9900f896c21f6ba09..7fd85f910e91f34835a6a018f2c33fee23aa62c7 100644
--- a/Common/Transforms/vtkMatrixToLinearTransform.h
+++ b/Common/Transforms/vtkMatrixToLinearTransform.h
@@ -39,7 +39,7 @@ class VTKCOMMONTRANSFORMS_EXPORT vtkMatrixToLinearTransform : public vtkLinearTr
public:
static vtkMatrixToLinearTransform *New();
vtkTypeMacro(vtkMatrixToLinearTransform,vtkLinearTransform);
- void PrintSelf (ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf (ostream& os, vtkIndent indent) override;
//@{
/**
@@ -54,24 +54,24 @@ class VTKCOMMONTRANSFORMS_EXPORT vtkMatrixToLinearTransform : public vtkLinearTr
* The input matrix is left as-is, but the transformation matrix
* is inverted.
*/
- void Inverse() VTK_OVERRIDE;
+ void Inverse() override;
/**
* Get the MTime: this is the bit of magic that makes everything work.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
/**
* Make a new transform of the same type.
*/
- vtkAbstractTransform *MakeTransform() VTK_OVERRIDE;
+ vtkAbstractTransform *MakeTransform() override;
protected:
vtkMatrixToLinearTransform();
- ~vtkMatrixToLinearTransform() VTK_OVERRIDE;
+ ~vtkMatrixToLinearTransform() override;
- void InternalUpdate() VTK_OVERRIDE;
- void InternalDeepCopy(vtkAbstractTransform *transform) VTK_OVERRIDE;
+ void InternalUpdate() override;
+ void InternalDeepCopy(vtkAbstractTransform *transform) override;
int InverseFlag;
vtkMatrix4x4 *Input;
diff --git a/Common/Transforms/vtkPerspectiveTransform.h b/Common/Transforms/vtkPerspectiveTransform.h
index aa41f2407d8dd8e5135d6174fad016f870ca3800..dd941229ce4c46f73495a47d03e609bc1f2e2cc0 100644
--- a/Common/Transforms/vtkPerspectiveTransform.h
+++ b/Common/Transforms/vtkPerspectiveTransform.h
@@ -55,7 +55,7 @@ class VTKCOMMONTRANSFORMS_EXPORT vtkPerspectiveTransform : public vtkHomogeneous
public:
static vtkPerspectiveTransform *New();
vtkTypeMacro(vtkPerspectiveTransform,vtkHomogeneousTransform);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Set this transformation to the identity transformation. If
@@ -69,7 +69,7 @@ class VTKCOMMONTRANSFORMS_EXPORT vtkPerspectiveTransform : public vtkHomogeneous
* the transformation will use the inverse of its Input, if an Input
* has been set.
*/
- void Inverse() VTK_OVERRIDE
+ void Inverse() override
{ this->Concatenation->Inverse(); this->Modified(); };
/**
@@ -351,7 +351,7 @@ class VTKCOMMONTRANSFORMS_EXPORT vtkPerspectiveTransform : public vtkHomogeneous
* Make a new transform of the same type -- you are responsible for
* deleting the transform when you are done with it.
*/
- vtkAbstractTransform *MakeTransform() VTK_OVERRIDE;
+ vtkAbstractTransform *MakeTransform() override;
/**
* Check for self-reference. Will return true if concatenating
@@ -361,19 +361,19 @@ class VTKCOMMONTRANSFORMS_EXPORT vtkPerspectiveTransform : public vtkHomogeneous
* and Concatenate(vtkXTransform *). Avoid using this function,
* it is experimental.
*/
- int CircuitCheck(vtkAbstractTransform *transform) VTK_OVERRIDE;
+ int CircuitCheck(vtkAbstractTransform *transform) override;
/**
* Override GetMTime to account for input and concatenation.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
protected:
vtkPerspectiveTransform();
- ~vtkPerspectiveTransform() VTK_OVERRIDE;
+ ~vtkPerspectiveTransform() override;
- void InternalDeepCopy(vtkAbstractTransform *t) VTK_OVERRIDE;
- void InternalUpdate() VTK_OVERRIDE;
+ void InternalDeepCopy(vtkAbstractTransform *t) override;
+ void InternalUpdate() override;
vtkHomogeneousTransform *Input;
vtkTransformConcatenation *Concatenation;
diff --git a/Common/Transforms/vtkSphericalTransform.h b/Common/Transforms/vtkSphericalTransform.h
index eb4c2ac9a7eb4e557237622af7cbe08ff8b46407..06832e0292b6c9d7ed2687a4604abe9b3f788c26 100644
--- a/Common/Transforms/vtkSphericalTransform.h
+++ b/Common/Transforms/vtkSphericalTransform.h
@@ -40,42 +40,42 @@ class VTKCOMMONTRANSFORMS_EXPORT vtkSphericalTransform : public vtkWarpTransform
public:
static vtkSphericalTransform *New();
vtkTypeMacro(vtkSphericalTransform,vtkWarpTransform);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Make another transform of the same type.
*/
- vtkAbstractTransform *MakeTransform() VTK_OVERRIDE;
+ vtkAbstractTransform *MakeTransform() override;
protected:
vtkSphericalTransform();
- ~vtkSphericalTransform() VTK_OVERRIDE;
+ ~vtkSphericalTransform() override;
/**
* Copy this transform from another of the same type.
*/
- void InternalDeepCopy(vtkAbstractTransform *transform) VTK_OVERRIDE;
+ void InternalDeepCopy(vtkAbstractTransform *transform) override;
//@{
/**
* Internal functions for calculating the transformation.
*/
- void ForwardTransformPoint(const float in[3], float out[3]) VTK_OVERRIDE;
- void ForwardTransformPoint(const double in[3], double out[3]) VTK_OVERRIDE;
+ void ForwardTransformPoint(const float in[3], float out[3]) override;
+ void ForwardTransformPoint(const double in[3], double out[3]) override;
//@}
void ForwardTransformDerivative(const float in[3], float out[3],
- float derivative[3][3]) VTK_OVERRIDE;
+ float derivative[3][3]) override;
void ForwardTransformDerivative(const double in[3], double out[3],
- double derivative[3][3]) VTK_OVERRIDE;
+ double derivative[3][3]) override;
- void InverseTransformPoint(const float in[3], float out[3]) VTK_OVERRIDE;
- void InverseTransformPoint(const double in[3], double out[3]) VTK_OVERRIDE;
+ void InverseTransformPoint(const float in[3], float out[3]) override;
+ void InverseTransformPoint(const double in[3], double out[3]) override;
void InverseTransformDerivative(const float in[3], float out[3],
- float derivative[3][3]) VTK_OVERRIDE;
+ float derivative[3][3]) override;
void InverseTransformDerivative(const double in[3], double out[3],
- double derivative[3][3]) VTK_OVERRIDE;
+ double derivative[3][3]) override;
private:
vtkSphericalTransform(const vtkSphericalTransform&) VTK_DELETE_FUNCTION;
diff --git a/Common/Transforms/vtkThinPlateSplineTransform.h b/Common/Transforms/vtkThinPlateSplineTransform.h
index b94dec20a9d3c96cfd2139ca1700d783bce473d1..1951bd94fa03c3477c99c3c6ba45ccf6aca2bab7 100644
--- a/Common/Transforms/vtkThinPlateSplineTransform.h
+++ b/Common/Transforms/vtkThinPlateSplineTransform.h
@@ -50,7 +50,7 @@ class VTKCOMMONTRANSFORMS_EXPORT vtkThinPlateSplineTransform : public vtkWarpTra
{
public:
vtkTypeMacro(vtkThinPlateSplineTransform,vtkWarpTransform);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkThinPlateSplineTransform *New();
//@{
@@ -114,34 +114,34 @@ public:
/**
* Get the MTime.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
/**
* Make another transform of the same type.
*/
- vtkAbstractTransform *MakeTransform() VTK_OVERRIDE;
+ vtkAbstractTransform *MakeTransform() override;
protected:
vtkThinPlateSplineTransform();
- ~vtkThinPlateSplineTransform() VTK_OVERRIDE;
+ ~vtkThinPlateSplineTransform() override;
/**
* Prepare the transformation for application.
*/
- void InternalUpdate() VTK_OVERRIDE;
+ void InternalUpdate() override;
/**
* This method does no type checking, use DeepCopy instead.
*/
- void InternalDeepCopy(vtkAbstractTransform *transform) VTK_OVERRIDE;
+ void InternalDeepCopy(vtkAbstractTransform *transform) override;
- void ForwardTransformPoint(const float in[3], float out[3]) VTK_OVERRIDE;
- void ForwardTransformPoint(const double in[3], double out[3]) VTK_OVERRIDE;
+ void ForwardTransformPoint(const float in[3], float out[3]) override;
+ void ForwardTransformPoint(const double in[3], double out[3]) override;
void ForwardTransformDerivative(const float in[3], float out[3],
- float derivative[3][3]) VTK_OVERRIDE;
+ float derivative[3][3]) override;
void ForwardTransformDerivative(const double in[3], double out[3],
- double derivative[3][3]) VTK_OVERRIDE;
+ double derivative[3][3]) override;
double Sigma;
vtkPoints *SourceLandmarks;
diff --git a/Common/Transforms/vtkTransform.h b/Common/Transforms/vtkTransform.h
index 2a5d63c3f6ae2f15cd7f0d47ddfd2ee2a81127e2..4dac30790dbeef5bff6904a1038019b13a1fc712 100644
--- a/Common/Transforms/vtkTransform.h
+++ b/Common/Transforms/vtkTransform.h
@@ -56,7 +56,7 @@ class VTKCOMMONTRANSFORMS_EXPORT vtkTransform : public vtkLinearTransform
public:
static vtkTransform *New();
vtkTypeMacro(vtkTransform,vtkLinearTransform);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Set the transformation to the identity transformation. If
@@ -70,7 +70,7 @@ class VTKCOMMONTRANSFORMS_EXPORT vtkTransform : public vtkLinearTransform
* the transformation will use the inverse of its Input, if an Input
* has been set.
*/
- void Inverse() VTK_OVERRIDE;
+ void Inverse() override;
//@{
/**
@@ -351,7 +351,7 @@ class VTKCOMMONTRANSFORMS_EXPORT vtkTransform : public vtkLinearTransform
* and Concatenate(vtkXTransform *). Avoid using this function,
* it is experimental.
*/
- int CircuitCheck(vtkAbstractTransform *transform) VTK_OVERRIDE;
+ int CircuitCheck(vtkAbstractTransform *transform) override;
// Return an inverse transform which will always update itself
// to match this transform.
@@ -361,12 +361,12 @@ class VTKCOMMONTRANSFORMS_EXPORT vtkTransform : public vtkLinearTransform
/**
* Make a new transform of the same type.
*/
- vtkAbstractTransform *MakeTransform() VTK_OVERRIDE;
+ vtkAbstractTransform *MakeTransform() override;
/**
* Override GetMTime to account for input and concatenation.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
//@{
/**
@@ -382,11 +382,11 @@ class VTKCOMMONTRANSFORMS_EXPORT vtkTransform : public vtkLinearTransform
protected:
vtkTransform ();
- ~vtkTransform () VTK_OVERRIDE;
+ ~vtkTransform () override;
- void InternalDeepCopy(vtkAbstractTransform *t) VTK_OVERRIDE;
+ void InternalDeepCopy(vtkAbstractTransform *t) override;
- void InternalUpdate() VTK_OVERRIDE;
+ void InternalUpdate() override;
vtkLinearTransform *Input;
vtkTransformConcatenation *Concatenation;
diff --git a/Common/Transforms/vtkTransform2D.h b/Common/Transforms/vtkTransform2D.h
index b93b330889b5d42ae08ee84b2976eb9512c1727a..5c2d7a55c775e8eba11716713880b264919de816 100644
--- a/Common/Transforms/vtkTransform2D.h
+++ b/Common/Transforms/vtkTransform2D.h
@@ -47,7 +47,7 @@ class VTKCOMMONTRANSFORMS_EXPORT vtkTransform2D : public vtkObject
public:
static vtkTransform2D *New();
vtkTypeMacro(vtkTransform2D,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Set the transformation to the identity transformation.
@@ -140,7 +140,7 @@ class VTKCOMMONTRANSFORMS_EXPORT vtkTransform2D : public vtkObject
/**
* Override GetMTime to account for input and concatenation.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
/**
* Apply the transformation to a series of points, and append the
@@ -196,7 +196,7 @@ class VTKCOMMONTRANSFORMS_EXPORT vtkTransform2D : public vtkObject
protected:
vtkTransform2D ();
- ~vtkTransform2D () VTK_OVERRIDE;
+ ~vtkTransform2D () override;
void InternalDeepCopy(vtkTransform2D *t);
diff --git a/Common/Transforms/vtkTransformCollection.h b/Common/Transforms/vtkTransformCollection.h
index cfa24b07a82e14e819b943bb85914c2ff9b5ee23..461339c39a5414381b0a0b2f93e7331a9409dd6e 100644
--- a/Common/Transforms/vtkTransformCollection.h
+++ b/Common/Transforms/vtkTransformCollection.h
@@ -58,7 +58,7 @@ public:
protected:
vtkTransformCollection() {}
- ~vtkTransformCollection() VTK_OVERRIDE {}
+ ~vtkTransformCollection() override {}
private:
diff --git a/Common/Transforms/vtkWarpTransform.h b/Common/Transforms/vtkWarpTransform.h
index e051b1567a011632bb16729a4850509fc8bf1912..6f767be615fa83480a92310e70485b33d01a7767 100644
--- a/Common/Transforms/vtkWarpTransform.h
+++ b/Common/Transforms/vtkWarpTransform.h
@@ -33,7 +33,7 @@ class VTKCOMMONTRANSFORMS_EXPORT vtkWarpTransform : public vtkAbstractTransform
public:
vtkTypeMacro(vtkWarpTransform,vtkAbstractTransform);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Invert the transformation. Warp transformations are usually
@@ -41,7 +41,7 @@ public:
* The inverse transform is usually around five or six times as
* computationally expensive as the forward transform.
*/
- void Inverse() VTK_OVERRIDE;
+ void Inverse() override;
//@{
/**
@@ -78,8 +78,8 @@ public:
* This will calculate the transformation without calling Update.
* Meant for use only within other VTK classes.
*/
- void InternalTransformPoint(const float in[3], float out[3]) VTK_OVERRIDE;
- void InternalTransformPoint(const double in[3], double out[3]) VTK_OVERRIDE;
+ void InternalTransformPoint(const float in[3], float out[3]) override;
+ void InternalTransformPoint(const double in[3], double out[3]) override;
//@}
//@{
@@ -89,9 +89,9 @@ public:
* classes.
*/
void InternalTransformDerivative(const float in[3], float out[3],
- float derivative[3][3]) VTK_OVERRIDE;
+ float derivative[3][3]) override;
void InternalTransformDerivative(const double in[3], double out[3],
- double derivative[3][3]) VTK_OVERRIDE;
+ double derivative[3][3]) override;
//@}
//@{
@@ -125,7 +125,7 @@ public:
protected:
vtkWarpTransform();
- ~vtkWarpTransform() VTK_OVERRIDE;
+ ~vtkWarpTransform() override;
//@{
/**
diff --git a/Domains/Chemistry/Testing/Cxx/TestMoleculeSelection.cxx b/Domains/Chemistry/Testing/Cxx/TestMoleculeSelection.cxx
index 380c5be76204b581028d36b641e6d0cb2375f826..1a1900eea3d1c3ef80dcdbe0ad4bda697c90595b 100644
--- a/Domains/Chemistry/Testing/Cxx/TestMoleculeSelection.cxx
+++ b/Domains/Chemistry/Testing/Cxx/TestMoleculeSelection.cxx
@@ -50,7 +50,7 @@ public:
{
}
- ~MoleculePickCommand() VTK_OVERRIDE
+ ~MoleculePickCommand() override
{
}
@@ -84,7 +84,7 @@ public:
this->MoleculeMapper = m;
}
- void Execute(vtkObject *, unsigned long, void *) VTK_OVERRIDE
+ void Execute(vtkObject *, unsigned long, void *) override
{
vtkProp3DCollection *props = this->Picker->GetProp3Ds();
if (props->GetNumberOfItems() != 0)
diff --git a/Domains/Chemistry/vtkBlueObeliskData.h b/Domains/Chemistry/vtkBlueObeliskData.h
index 0c9047e333a08d591d3d138eb5f8ce5f0f5443e7..6f39c14f5401ca62768c01c4ab46b81ebd42e517 100644
--- a/Domains/Chemistry/vtkBlueObeliskData.h
+++ b/Domains/Chemistry/vtkBlueObeliskData.h
@@ -53,7 +53,7 @@ class VTKDOMAINSCHEMISTRY_EXPORT vtkBlueObeliskData : public vtkObject
{
public:
vtkTypeMacro(vtkBlueObeliskData,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkBlueObeliskData *New();
/**
@@ -122,7 +122,7 @@ class VTKDOMAINSCHEMISTRY_EXPORT vtkBlueObeliskData : public vtkObject
friend class vtkBlueObeliskDataParser;
vtkBlueObeliskData();
- ~vtkBlueObeliskData() VTK_OVERRIDE;
+ ~vtkBlueObeliskData() override;
vtkSimpleMutexLock *WriteMutex;
bool Initialized;
diff --git a/Domains/Chemistry/vtkBlueObeliskDataParser.h b/Domains/Chemistry/vtkBlueObeliskDataParser.h
index de378d8ad3e375412ca82296e7f4497d295ef00c..cf3950fe2ed9b10d3a3ae5af24ea0e8b5d237693 100644
--- a/Domains/Chemistry/vtkBlueObeliskDataParser.h
+++ b/Domains/Chemistry/vtkBlueObeliskDataParser.h
@@ -63,7 +63,7 @@ class VTKDOMAINSCHEMISTRY_EXPORT vtkBlueObeliskDataParser : public vtkXMLParser
/**
* Start parsing
*/
- int Parse() VTK_OVERRIDE;
+ int Parse() override;
//@{
/**
@@ -71,18 +71,18 @@ class VTKDOMAINSCHEMISTRY_EXPORT vtkBlueObeliskDataParser : public vtkXMLParser
* virtual overloads. This function simply call Parse(); the arguments are
* ignored.
*/
- int Parse(const char *) VTK_OVERRIDE;
- int Parse(const char *, unsigned int) VTK_OVERRIDE;
+ int Parse(const char *) override;
+ int Parse(const char *, unsigned int) override;
//@}
protected:
vtkBlueObeliskDataParser();
- ~vtkBlueObeliskDataParser() VTK_OVERRIDE;
+ ~vtkBlueObeliskDataParser() override;
- void StartElement(const char *name, const char **attr) VTK_OVERRIDE;
- void EndElement(const char *name) VTK_OVERRIDE;
+ void StartElement(const char *name, const char **attr) override;
+ void EndElement(const char *name) override;
- void CharacterDataHandler(const char *data, int length) VTK_OVERRIDE;
+ void CharacterDataHandler(const char *data, int length) override;
void SetCurrentValue(const char *data, int length);
void SetCurrentValue(const char *data);
diff --git a/Domains/Chemistry/vtkCMLMoleculeReader.cxx b/Domains/Chemistry/vtkCMLMoleculeReader.cxx
index ce7a3d6ce014d3a3fb6e3e7756b7e544c39cc6c6..10de6c9b7f2c966fd19db53537a235ee73e21662 100644
--- a/Domains/Chemistry/vtkCMLMoleculeReader.cxx
+++ b/Domains/Chemistry/vtkCMLMoleculeReader.cxx
@@ -40,9 +40,9 @@ public:
protected:
vtkCMLParser();
- ~vtkCMLParser() VTK_OVERRIDE;
- void StartElement(const char *name, const char **attr) VTK_OVERRIDE;
- void EndElement(const char *name) VTK_OVERRIDE;
+ ~vtkCMLParser() override;
+ void StartElement(const char *name, const char **attr) override;
+ void EndElement(const char *name) override;
std::vector<std::string> AtomNames;
diff --git a/Domains/Chemistry/vtkCMLMoleculeReader.h b/Domains/Chemistry/vtkCMLMoleculeReader.h
index f45ba61ebfdc73ad3f020cce872fed86841b9d1d..f06b1ffc4b021b8f78aa67aaa5baeda98994a9ba 100644
--- a/Domains/Chemistry/vtkCMLMoleculeReader.h
+++ b/Domains/Chemistry/vtkCMLMoleculeReader.h
@@ -32,14 +32,14 @@ class VTKDOMAINSCHEMISTRY_EXPORT vtkCMLMoleculeReader : public vtkMoleculeAlgori
public:
static vtkCMLMoleculeReader *New();
vtkTypeMacro(vtkCMLMoleculeReader,vtkMoleculeAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
* Get/Set the output (vtkMolecule) that the reader will fill
*/
vtkMolecule *GetOutput();
- void SetOutput(vtkMolecule *) VTK_OVERRIDE;
+ void SetOutput(vtkMolecule *) override;
//@}
//@{
@@ -52,11 +52,11 @@ public:
protected:
vtkCMLMoleculeReader();
- ~vtkCMLMoleculeReader() VTK_OVERRIDE;
+ ~vtkCMLMoleculeReader() override;
int RequestData(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
- int FillOutputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
+ vtkInformationVector *) override;
+ int FillOutputPortInformation(int, vtkInformation*) override;
char *FileName;
diff --git a/Domains/Chemistry/vtkGaussianCubeReader2.h b/Domains/Chemistry/vtkGaussianCubeReader2.h
index 9735b2cd2f57a7d765e0e84f30da5903fb87dd64..980f05c84ff807d4190a0825616c473cca1dc879 100644
--- a/Domains/Chemistry/vtkGaussianCubeReader2.h
+++ b/Domains/Chemistry/vtkGaussianCubeReader2.h
@@ -36,14 +36,14 @@ class VTKDOMAINSCHEMISTRY_EXPORT vtkGaussianCubeReader2 : public vtkMoleculeAlgo
public:
static vtkGaussianCubeReader2 *New();
vtkTypeMacro(vtkGaussianCubeReader2,vtkMoleculeAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
* Get/Set the output (vtkMolecule) that the reader will fill
*/
vtkMolecule *GetOutput();
- void SetOutput(vtkMolecule *) VTK_OVERRIDE;
+ void SetOutput(vtkMolecule *) override;
//@}
/**
@@ -61,13 +61,13 @@ public:
protected:
vtkGaussianCubeReader2();
- ~vtkGaussianCubeReader2() VTK_OVERRIDE;
+ ~vtkGaussianCubeReader2() override;
int RequestData(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
int RequestInformation(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
- int FillOutputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
+ vtkInformationVector *) override;
+ int FillOutputPortInformation(int, vtkInformation*) override;
char *FileName;
private:
diff --git a/Domains/Chemistry/vtkMoleculeAlgorithm.h b/Domains/Chemistry/vtkMoleculeAlgorithm.h
index ae8f94135f6532b1b821aa16e55ce4f87f3b2225..9b196d741ba42b4b4a9908f4c4b169c75a407c21 100644
--- a/Domains/Chemistry/vtkMoleculeAlgorithm.h
+++ b/Domains/Chemistry/vtkMoleculeAlgorithm.h
@@ -44,7 +44,7 @@ class VTKDOMAINSCHEMISTRY_EXPORT vtkMoleculeAlgorithm : public vtkAlgorithm
public:
static vtkMoleculeAlgorithm *New();
vtkTypeMacro(vtkMoleculeAlgorithm,vtkAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -60,7 +60,7 @@ public:
*/
int ProcessRequest(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
// this method is not recommended for use, but lots of old style filters
// use it
@@ -95,7 +95,7 @@ public:
protected:
vtkMoleculeAlgorithm();
- ~vtkMoleculeAlgorithm() VTK_OVERRIDE;
+ ~vtkMoleculeAlgorithm() override;
// convenience method
virtual int RequestInformation(vtkInformation* request,
@@ -119,8 +119,8 @@ protected:
vtkInformationVector*);
// see algorithm for more info
- int FillOutputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillOutputPortInformation(int port, vtkInformation* info) override;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
private:
vtkMoleculeAlgorithm(const vtkMoleculeAlgorithm&) VTK_DELETE_FUNCTION;
diff --git a/Domains/Chemistry/vtkMoleculeMapper.h b/Domains/Chemistry/vtkMoleculeMapper.h
index c10ba0cc55d6f58f422833b239cae29f1f12cff8..5db1c1733896d62205d20a547b3c1e5b79e61cfd 100644
--- a/Domains/Chemistry/vtkMoleculeMapper.h
+++ b/Domains/Chemistry/vtkMoleculeMapper.h
@@ -45,7 +45,7 @@ class VTKDOMAINSCHEMISTRY_EXPORT vtkMoleculeMapper : public vtkMapper
public:
static vtkMoleculeMapper *New();
vtkTypeMacro(vtkMoleculeMapper,vtkMapper);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -271,17 +271,17 @@ public:
/**
* Reimplemented from base class
*/
- void Render(vtkRenderer *, vtkActor *) VTK_OVERRIDE;
- void ReleaseGraphicsResources(vtkWindow *) VTK_OVERRIDE;
- double * GetBounds() VTK_OVERRIDE;
- void GetBounds(double bounds[6]) VTK_OVERRIDE { vtkAbstractMapper3D::GetBounds(bounds); }
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
- bool GetSupportsSelection() VTK_OVERRIDE {return true;}
+ void Render(vtkRenderer *, vtkActor *) override;
+ void ReleaseGraphicsResources(vtkWindow *) override;
+ double * GetBounds() override;
+ void GetBounds(double bounds[6]) override { vtkAbstractMapper3D::GetBounds(bounds); }
+ int FillInputPortInformation(int port, vtkInformation* info) override;
+ bool GetSupportsSelection() override {return true;}
//@}
protected:
vtkMoleculeMapper();
- ~vtkMoleculeMapper() VTK_OVERRIDE;
+ ~vtkMoleculeMapper() override;
//@{
/**
diff --git a/Domains/Chemistry/vtkMoleculeToAtomBallFilter.h b/Domains/Chemistry/vtkMoleculeToAtomBallFilter.h
index 20f310acdb6f80cf793981e2311bc90ee220b48e..5e213953193ba5b8360d8db0d4bfbb1418033689 100644
--- a/Domains/Chemistry/vtkMoleculeToAtomBallFilter.h
+++ b/Domains/Chemistry/vtkMoleculeToAtomBallFilter.h
@@ -44,7 +44,7 @@ class VTKDOMAINSCHEMISTRY_EXPORT vtkMoleculeToAtomBallFilter
{
public:
vtkTypeMacro(vtkMoleculeToAtomBallFilter,vtkMoleculeToPolyDataFilter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkMoleculeToAtomBallFilter *New();
@@ -65,10 +65,10 @@ class VTKDOMAINSCHEMISTRY_EXPORT vtkMoleculeToAtomBallFilter
protected:
vtkMoleculeToAtomBallFilter();
- ~vtkMoleculeToAtomBallFilter() VTK_OVERRIDE;
+ ~vtkMoleculeToAtomBallFilter() override;
int RequestData(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
int Resolution;
double RadiusScale;
diff --git a/Domains/Chemistry/vtkMoleculeToBondStickFilter.h b/Domains/Chemistry/vtkMoleculeToBondStickFilter.h
index 7c6f793414f4b7017c3a2842a7b9c23541fc2d63..349a7caa25e3074910913121ca18dd0af0e76f8d 100644
--- a/Domains/Chemistry/vtkMoleculeToBondStickFilter.h
+++ b/Domains/Chemistry/vtkMoleculeToBondStickFilter.h
@@ -31,16 +31,16 @@ class VTKDOMAINSCHEMISTRY_EXPORT vtkMoleculeToBondStickFilter
{
public:
vtkTypeMacro(vtkMoleculeToBondStickFilter,vtkMoleculeToPolyDataFilter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkMoleculeToBondStickFilter *New();
protected:
vtkMoleculeToBondStickFilter();
- ~vtkMoleculeToBondStickFilter() VTK_OVERRIDE;
+ ~vtkMoleculeToBondStickFilter() override;
int RequestData(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
private:
vtkMoleculeToBondStickFilter(const vtkMoleculeToBondStickFilter&) VTK_DELETE_FUNCTION;
diff --git a/Domains/Chemistry/vtkMoleculeToPolyDataFilter.h b/Domains/Chemistry/vtkMoleculeToPolyDataFilter.h
index 03ce1f37b9b3a62c2dee23a1723632c56bd8be7e..69aba79aef22fda56c7f5e8defc1f2e6db6e2eca 100644
--- a/Domains/Chemistry/vtkMoleculeToPolyDataFilter.h
+++ b/Domains/Chemistry/vtkMoleculeToPolyDataFilter.h
@@ -34,15 +34,15 @@ class VTKDOMAINSCHEMISTRY_EXPORT vtkMoleculeToPolyDataFilter
{
public:
vtkTypeMacro(vtkMoleculeToPolyDataFilter,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
vtkMolecule * GetInput();
protected:
vtkMoleculeToPolyDataFilter();
- ~vtkMoleculeToPolyDataFilter() VTK_OVERRIDE;
+ ~vtkMoleculeToPolyDataFilter() override;
- int FillInputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
+ int FillInputPortInformation(int, vtkInformation*) override;
private:
vtkMoleculeToPolyDataFilter(const vtkMoleculeToPolyDataFilter&) VTK_DELETE_FUNCTION;
diff --git a/Domains/Chemistry/vtkPeriodicTable.h b/Domains/Chemistry/vtkPeriodicTable.h
index 057bd0adef7dd72278917e542da8fd19c13a86ab..7de97361202d4b36866044bbdf4eab92a7e37aeb 100644
--- a/Domains/Chemistry/vtkPeriodicTable.h
+++ b/Domains/Chemistry/vtkPeriodicTable.h
@@ -39,7 +39,7 @@ class VTKDOMAINSCHEMISTRY_EXPORT vtkPeriodicTable : public vtkObject
{
public:
vtkTypeMacro(vtkPeriodicTable, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkPeriodicTable * New();
//@{
@@ -106,7 +106,7 @@ public:
protected:
vtkPeriodicTable();
- ~vtkPeriodicTable() VTK_OVERRIDE;
+ ~vtkPeriodicTable() override;
static vtkNew<vtkBlueObeliskData> BlueObeliskData;
diff --git a/Domains/Chemistry/vtkProgrammableElectronicData.h b/Domains/Chemistry/vtkProgrammableElectronicData.h
index db4505abad412f2f6a5da6973a1ac7947655c244..bb33234f5d92f357ead37a180a61f42072cc0de7 100644
--- a/Domains/Chemistry/vtkProgrammableElectronicData.h
+++ b/Domains/Chemistry/vtkProgrammableElectronicData.h
@@ -34,14 +34,14 @@ class VTKDOMAINSCHEMISTRY_EXPORT vtkProgrammableElectronicData
public:
static vtkProgrammableElectronicData *New();
vtkTypeMacro(vtkProgrammableElectronicData,vtkAbstractElectronicData);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
* Get/Set the number of molecular orbitals. Setting this will resize this
* internal array of MOs.
*/
- vtkIdType GetNumberOfMOs() VTK_OVERRIDE;
+ vtkIdType GetNumberOfMOs() override;
virtual void SetNumberOfMOs(vtkIdType);
//@}
@@ -50,7 +50,7 @@ public:
* Get/Set the number of electrons in the molecule. Needed for HOMO/LUMO
* convenience functions
*/
- vtkIdType GetNumberOfElectrons() VTK_OVERRIDE
+ vtkIdType GetNumberOfElectrons() override
{
return this->NumberOfElectrons;
}
@@ -61,7 +61,7 @@ public:
/**
* Get/Set the vtkImageData for the requested molecular orbital.
*/
- vtkImageData * GetMO(vtkIdType orbitalNumber) VTK_OVERRIDE;
+ vtkImageData * GetMO(vtkIdType orbitalNumber) override;
void SetMO(vtkIdType orbitalNumber, vtkImageData *data);
//@}
@@ -69,7 +69,7 @@ public:
/**
* Get/Set the vtkImageData for the molecule's electron density.
*/
- vtkImageData* GetElectronDensity() VTK_OVERRIDE
+ vtkImageData* GetElectronDensity() override
{
return this->ElectronDensity;
}
@@ -87,11 +87,11 @@ public:
/**
* Deep copies the data object into this.
*/
- void DeepCopy(vtkDataObject *obj) VTK_OVERRIDE;
+ void DeepCopy(vtkDataObject *obj) override;
protected:
vtkProgrammableElectronicData();
- ~vtkProgrammableElectronicData() VTK_OVERRIDE;
+ ~vtkProgrammableElectronicData() override;
/**
* Electronic data set property
diff --git a/Domains/Chemistry/vtkProteinRibbonFilter.h b/Domains/Chemistry/vtkProteinRibbonFilter.h
index 50cbf9821e665aca8f326ac51f1c80a13d2d0f4b..7ce49390060a2fd48c6eff1c1a039d06fcc29534 100644
--- a/Domains/Chemistry/vtkProteinRibbonFilter.h
+++ b/Domains/Chemistry/vtkProteinRibbonFilter.h
@@ -38,7 +38,7 @@ class VTKDOMAINSCHEMISTRY_EXPORT vtkProteinRibbonFilter
{
public:
vtkTypeMacro(vtkProteinRibbonFilter, vtkPolyDataAlgorithm)
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkProteinRibbonFilter* New();
@@ -84,13 +84,13 @@ public:
protected:
vtkProteinRibbonFilter();
- ~vtkProteinRibbonFilter() VTK_OVERRIDE;
+ ~vtkProteinRibbonFilter() override;
- int FillInputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
+ int FillInputPortInformation(int, vtkInformation*) override;
int RequestData(vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
void CreateThinStrip(vtkPolyData* poly, vtkUnsignedCharArray *pointsColors,
vtkPoints* p, std::vector<std::pair<vtkVector3f, bool> >& p1,
diff --git a/Domains/Chemistry/vtkSimpleBondPerceiver.h b/Domains/Chemistry/vtkSimpleBondPerceiver.h
index 6f399b7e6d10003f8f8ecf77a5d486c49996d7b8..3ab9ecc47796a3b4c5dcb7acc381e6f7e355ebe2 100644
--- a/Domains/Chemistry/vtkSimpleBondPerceiver.h
+++ b/Domains/Chemistry/vtkSimpleBondPerceiver.h
@@ -46,7 +46,7 @@ class VTKDOMAINSCHEMISTRY_EXPORT vtkSimpleBondPerceiver :
public:
static vtkSimpleBondPerceiver *New();
vtkTypeMacro(vtkSimpleBondPerceiver,vtkMoleculeAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -58,7 +58,7 @@ public:
protected:
vtkSimpleBondPerceiver();
- ~vtkSimpleBondPerceiver() VTK_OVERRIDE;
+ ~vtkSimpleBondPerceiver() override;
/**
* This is called by the superclass.
@@ -66,7 +66,7 @@ protected:
*/
int RequestData(vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
float Tolerance;
diff --git a/Domains/Chemistry/vtkVASPAnimationReader.h b/Domains/Chemistry/vtkVASPAnimationReader.h
index 0c4e8882cfdb32787de2f124464d6e1e6d2fdcea..1d4c30ff4554e38b99cc71731519cb1b243f1fa8 100644
--- a/Domains/Chemistry/vtkVASPAnimationReader.h
+++ b/Domains/Chemistry/vtkVASPAnimationReader.h
@@ -38,7 +38,7 @@ class VTKDOMAINSCHEMISTRY_EXPORT vtkVASPAnimationReader:
public:
static vtkVASPAnimationReader* New();
vtkTypeMacro(vtkVASPAnimationReader, vtkMoleculeAlgorithm)
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
//@{
/**
@@ -50,14 +50,14 @@ public:
protected:
vtkVASPAnimationReader();
- ~vtkVASPAnimationReader() VTK_OVERRIDE;
+ ~vtkVASPAnimationReader() override;
int RequestData(vtkInformation *request,
vtkInformationVector **inInfoVecs,
- vtkInformationVector *outInfoVec) VTK_OVERRIDE;
+ vtkInformationVector *outInfoVec) override;
int RequestInformation(vtkInformation *request,
vtkInformationVector **inInfoVecs,
- vtkInformationVector *outInfoVec) VTK_OVERRIDE;
+ vtkInformationVector *outInfoVec) override;
/**
* Advance @a in to the start of the data for the next timestep. Parses the
diff --git a/Domains/Chemistry/vtkVASPTessellationReader.h b/Domains/Chemistry/vtkVASPTessellationReader.h
index f925f07d6e49a139e7988ef84fb14d84ac8ab40a..d0e1bd78998b3715e092801988a926c4544fc556 100644
--- a/Domains/Chemistry/vtkVASPTessellationReader.h
+++ b/Domains/Chemistry/vtkVASPTessellationReader.h
@@ -39,7 +39,7 @@ class VTKDOMAINSCHEMISTRY_EXPORT vtkVASPTessellationReader
public:
static vtkVASPTessellationReader* New();
vtkTypeMacro(vtkVASPTessellationReader, vtkMoleculeAlgorithm)
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
//@{
/**
@@ -51,15 +51,15 @@ public:
protected:
vtkVASPTessellationReader();
- ~vtkVASPTessellationReader() VTK_OVERRIDE;
+ ~vtkVASPTessellationReader() override;
int RequestData(vtkInformation *request,
vtkInformationVector **inInfoVecs,
- vtkInformationVector *outInfoVec) VTK_OVERRIDE;
+ vtkInformationVector *outInfoVec) override;
int RequestInformation(vtkInformation *request,
vtkInformationVector **inInfoVecs,
- vtkInformationVector *outInfoVec) VTK_OVERRIDE;
- int FillOutputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ vtkInformationVector *outInfoVec) override;
+ int FillOutputPortInformation(int port, vtkInformation *info) override;
/**
* Advance @a in to the start of the data for the next timestep. Parses the
diff --git a/Domains/Chemistry/vtkXYZMolReader2.h b/Domains/Chemistry/vtkXYZMolReader2.h
index c65381a79f78635fd23c623eb1c5028c700b11c7..91062054e6de4b38ffbe4776db433836e828df81 100644
--- a/Domains/Chemistry/vtkXYZMolReader2.h
+++ b/Domains/Chemistry/vtkXYZMolReader2.h
@@ -40,14 +40,14 @@ class VTKDOMAINSCHEMISTRY_EXPORT vtkXYZMolReader2 : public vtkMoleculeAlgorithm
public:
static vtkXYZMolReader2 *New();
vtkTypeMacro(vtkXYZMolReader2,vtkMoleculeAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
* Get/Set the output (vtkMolecule) that the reader will fill
*/
vtkMolecule *GetOutput();
- void SetOutput(vtkMolecule *) VTK_OVERRIDE;
+ void SetOutput(vtkMolecule *) override;
//@}
//@{
@@ -60,12 +60,12 @@ public:
protected:
vtkXYZMolReader2();
- ~vtkXYZMolReader2() VTK_OVERRIDE;
+ ~vtkXYZMolReader2() override;
int RequestData(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
int RequestInformation(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
char *FileName;
std::vector<istream::pos_type> file_positions; // to store beginning of each tstep
diff --git a/Domains/ChemistryOpenGL2/vtkOpenGLMoleculeMapper.h b/Domains/ChemistryOpenGL2/vtkOpenGLMoleculeMapper.h
index 9a58467f3e87feaca004a8f4a45c83a74027e1c5..b0c9ec66e859bfecd3fa2ce666dc9ed42f1ed6ff 100644
--- a/Domains/ChemistryOpenGL2/vtkOpenGLMoleculeMapper.h
+++ b/Domains/ChemistryOpenGL2/vtkOpenGLMoleculeMapper.h
@@ -39,8 +39,8 @@ public:
/**
* Reimplemented from base class
*/
- void Render(vtkRenderer *, vtkActor *) VTK_OVERRIDE;
- void ReleaseGraphicsResources(vtkWindow *) VTK_OVERRIDE;
+ void Render(vtkRenderer *, vtkActor *) override;
+ void ReleaseGraphicsResources(vtkWindow *) override;
//@}
/**
@@ -51,10 +51,10 @@ public:
protected:
vtkOpenGLMoleculeMapper();
- ~vtkOpenGLMoleculeMapper() VTK_OVERRIDE;
+ ~vtkOpenGLMoleculeMapper() override;
- void UpdateAtomGlyphPolyData() VTK_OVERRIDE;
- void UpdateBondGlyphPolyData() VTK_OVERRIDE;
+ void UpdateAtomGlyphPolyData() override;
+ void UpdateBondGlyphPolyData() override;
//@{
/**
diff --git a/Domains/Microscopy/vtkOpenSlideReader.h b/Domains/Microscopy/vtkOpenSlideReader.h
index c4b8d614d5fc4017e565d1c27029448a3971e96d..c5b110b215c1913e74b5c4e984e4331dc9930a26 100644
--- a/Domains/Microscopy/vtkOpenSlideReader.h
+++ b/Domains/Microscopy/vtkOpenSlideReader.h
@@ -40,7 +40,7 @@ class VTKDOMAINSMICROSCOPY_EXPORT vtkOpenSlideReader : public vtkImageReader2
public:
static vtkOpenSlideReader *New();
vtkTypeMacro(vtkOpenSlideReader,vtkImageReader2);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Is the given file supported ?
diff --git a/Examples/Build/vtkLocal/vtkLocalExample.h b/Examples/Build/vtkLocal/vtkLocalExample.h
index 931e9d29cf23795d88f39c3b4f3a28663f45ba07..3173af62e520e7bf7b10f3560c5f5f99ba0c0769 100644
--- a/Examples/Build/vtkLocal/vtkLocalExample.h
+++ b/Examples/Build/vtkLocal/vtkLocalExample.h
@@ -21,7 +21,7 @@ class VTKLOCALEXAMPLE_EXPORT vtkLocalExample : public vtkObject
public:
static vtkLocalExample* New();
vtkTypeMacro(vtkLocalExample, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkLocalExample();
diff --git a/Examples/Build/vtkMy/Imaging/vtkImageFoo.h b/Examples/Build/vtkMy/Imaging/vtkImageFoo.h
index d4975776edc8ab4e3afbd741e77eed916018d43f..bb72a1fec684c46fc219b770c9e7694fe8745cb4 100644
--- a/Examples/Build/vtkMy/Imaging/vtkImageFoo.h
+++ b/Examples/Build/vtkMy/Imaging/vtkImageFoo.h
@@ -32,7 +32,7 @@ class VTK_MY_IMAGING_EXPORT vtkImageFoo : public vtkThreadedImageAlgorithm
public:
static vtkImageFoo *New();
vtkTypeMacro(vtkImageFoo,vtkThreadedImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -82,12 +82,12 @@ protected:
int RequestInformation(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
void ThreadedRequestData(vtkInformation* request,
vtkInformationVector** inputVector,
vtkInformationVector* outputVector,
vtkImageData*** inData, vtkImageData** outData,
- int outExt[6], int id) VTK_OVERRIDE;
+ int outExt[6], int id) override;
private:
vtkImageFoo(const vtkImageFoo&) VTK_DELETE_FUNCTION;
void operator=(const vtkImageFoo&) VTK_DELETE_FUNCTION;
diff --git a/Examples/ImageProcessing/Cxx/ImageSlicing.cxx b/Examples/ImageProcessing/Cxx/ImageSlicing.cxx
index e91265f4d3fdeeb5eb49c4d2a1fdbcb2ce9ae7d0..8d72cb4c4150219a158f9b950a7a689b66624487 100644
--- a/Examples/ImageProcessing/Cxx/ImageSlicing.cxx
+++ b/Examples/ImageProcessing/Cxx/ImageSlicing.cxx
@@ -64,7 +64,7 @@ public:
vtkRenderWindowInteractor *GetInteractor() {
return this->Interactor; };
- void Execute(vtkObject *, unsigned long event, void *) VTK_OVERRIDE
+ void Execute(vtkObject *, unsigned long event, void *) override
{
vtkRenderWindowInteractor *interactor = this->GetInteractor();
diff --git a/Examples/Infovis/Cxx/MultiView.cxx b/Examples/Infovis/Cxx/MultiView.cxx
index 73d9f52a8bbb304a6de359d722fbde35e245d552..72883ecf10a7f028221638a74a6d105dea76ced0 100644
--- a/Examples/Infovis/Cxx/MultiView.cxx
+++ b/Examples/Infovis/Cxx/MultiView.cxx
@@ -43,7 +43,7 @@ public:
view->AddObserver(vtkCommand::SelectionChangedEvent, this);
}
- void Execute(vtkObject*, unsigned long, void*) VTK_OVERRIDE
+ void Execute(vtkObject*, unsigned long, void*) override
{
for (unsigned int i = 0; i < this->Views.size(); i++)
{
@@ -52,7 +52,7 @@ public:
}
private:
ViewUpdater() { }
- ~ViewUpdater() VTK_OVERRIDE { }
+ ~ViewUpdater() override { }
std::vector<vtkView*> Views;
};
diff --git a/Examples/Tutorial/Step2/Cxx/Cone2.cxx b/Examples/Tutorial/Step2/Cxx/Cone2.cxx
index eed1f2aea3aac1717f31199e3c922b0735a0ea79..cd35e872b92bce025d27fad5af7f21885ea4a5cb 100644
--- a/Examples/Tutorial/Step2/Cxx/Cone2.cxx
+++ b/Examples/Tutorial/Step2/Cxx/Cone2.cxx
@@ -39,7 +39,7 @@ class vtkMyCallback : public vtkCommand
public:
static vtkMyCallback *New()
{ return new vtkMyCallback; }
- void Execute(vtkObject *caller, unsigned long, void*) VTK_OVERRIDE
+ void Execute(vtkObject *caller, unsigned long, void*) override
{
vtkRenderer *renderer = reinterpret_cast<vtkRenderer*>(caller);
cout << renderer->GetActiveCamera()->GetPosition()[0] << " "
diff --git a/Examples/Tutorial/Step6/Cxx/Cone6.cxx b/Examples/Tutorial/Step6/Cxx/Cone6.cxx
index ea612a785cb36fa1e43d4466f3c0404a582738d3..fd49fd812847a32f1aa14121683f2f730940d800 100644
--- a/Examples/Tutorial/Step6/Cxx/Cone6.cxx
+++ b/Examples/Tutorial/Step6/Cxx/Cone6.cxx
@@ -46,7 +46,7 @@ class vtkMyCallback : public vtkCommand
public:
static vtkMyCallback *New()
{ return new vtkMyCallback; }
- void Execute(vtkObject *caller, unsigned long, void*) VTK_OVERRIDE
+ void Execute(vtkObject *caller, unsigned long, void*) override
{
vtkTransform *t = vtkTransform::New();
vtkBoxWidget *widget = reinterpret_cast<vtkBoxWidget*>(caller);
diff --git a/Examples/VolumeRendering/Cxx/GPURenderDemo.cxx b/Examples/VolumeRendering/Cxx/GPURenderDemo.cxx
index b75ca22743aa61bb5de231a7d62ca0c03f7570e8..752fd43829478c0f7c8bb4535646672526834cf4 100644
--- a/Examples/VolumeRendering/Cxx/GPURenderDemo.cxx
+++ b/Examples/VolumeRendering/Cxx/GPURenderDemo.cxx
@@ -41,7 +41,7 @@ class vtkBoxWidgetCallback : public vtkCommand
public:
static vtkBoxWidgetCallback *New()
{ return new vtkBoxWidgetCallback; }
- void Execute(vtkObject *caller, unsigned long, void*) VTK_OVERRIDE
+ void Execute(vtkObject *caller, unsigned long, void*) override
{
vtkBoxWidget *widget = reinterpret_cast<vtkBoxWidget*>(caller);
if (this->Mapper)
diff --git a/Examples/Widgets/Cxx/Slider.cxx b/Examples/Widgets/Cxx/Slider.cxx
index daf8006df76d01ec2430bbe6cb61c7accb7ad0a6..7cddcd380df896ea2b33f2febc9a57a87d3a3503 100644
--- a/Examples/Widgets/Cxx/Slider.cxx
+++ b/Examples/Widgets/Cxx/Slider.cxx
@@ -31,7 +31,7 @@ public:
{
return new vtkSliderCallback;
}
- void Execute(vtkObject *caller, unsigned long, void*) VTK_OVERRIDE
+ void Execute(vtkObject *caller, unsigned long, void*) override
{
vtkSliderWidget *sliderWidget =
reinterpret_cast<vtkSliderWidget*>(caller);
diff --git a/Examples/Widgets/Cxx/Slider2D.cxx b/Examples/Widgets/Cxx/Slider2D.cxx
index 3c67992fdfd7414f42299a24f7a082dd909f7241..f096430b3ff3020bc325aa0190a4f902296e5ac3 100644
--- a/Examples/Widgets/Cxx/Slider2D.cxx
+++ b/Examples/Widgets/Cxx/Slider2D.cxx
@@ -27,7 +27,7 @@ public:
{
return new vtkSliderCallback;
}
- void Execute(vtkObject *caller, unsigned long, void*) VTK_OVERRIDE
+ void Execute(vtkObject *caller, unsigned long, void*) override
{
vtkSliderWidget *sliderWidget =
reinterpret_cast<vtkSliderWidget*>(caller);
diff --git a/Filters/AMR/vtkAMRCutPlane.h b/Filters/AMR/vtkAMRCutPlane.h
index 804e43905b9f7e827e34150145cc17cb7e618227..b1d9d2e63b4f3e6aa6624ebeb549d11746793c93 100644
--- a/Filters/AMR/vtkAMRCutPlane.h
+++ b/Filters/AMR/vtkAMRCutPlane.h
@@ -49,7 +49,7 @@ class VTKFILTERSAMR_EXPORT vtkAMRCutPlane : public vtkMultiBlockDataSetAlgorithm
public:
static vtkAMRCutPlane *New();
vtkTypeMacro(vtkAMRCutPlane, vtkMultiBlockDataSetAlgorithm);
- void PrintSelf(ostream &oss, vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf(ostream &oss, vtkIndent indent ) override;
//@{
/**
@@ -94,9 +94,9 @@ public:
// Standard pipeline routines
int RequestData(
- vtkInformation*,vtkInformationVector**,vtkInformationVector*) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
- int FillOutputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ vtkInformation*,vtkInformationVector**,vtkInformationVector*) override;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
+ int FillOutputPortInformation(int port, vtkInformation *info) override;
/**
@@ -106,17 +106,17 @@ public:
int RequestInformation(
vtkInformation *rqst,
vtkInformationVector **inputVector,
- vtkInformationVector *outputVector ) VTK_OVERRIDE;
+ vtkInformationVector *outputVector ) override;
/**
* Performs upstream requests to the reader
*/
int RequestUpdateExtent(
- vtkInformation*, vtkInformationVector**, vtkInformationVector* ) VTK_OVERRIDE;
+ vtkInformation*, vtkInformationVector**, vtkInformationVector* ) override;
protected:
vtkAMRCutPlane();
- ~vtkAMRCutPlane() VTK_OVERRIDE;
+ ~vtkAMRCutPlane() override;
/**
* Returns the cut-plane defined by a vtkCutPlane instance based on the
diff --git a/Filters/AMR/vtkAMRGaussianPulseSource.h b/Filters/AMR/vtkAMRGaussianPulseSource.h
index 578bfe50326b42068faa0987c4301f45c956c373..f722470465a16cb05a34c958d55304e62eb6b32d 100644
--- a/Filters/AMR/vtkAMRGaussianPulseSource.h
+++ b/Filters/AMR/vtkAMRGaussianPulseSource.h
@@ -43,7 +43,7 @@ class VTKFILTERSAMR_EXPORT vtkAMRGaussianPulseSource :
public:
static vtkAMRGaussianPulseSource* New();
vtkTypeMacro(vtkAMRGaussianPulseSource, vtkOverlappingAMRAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -114,7 +114,7 @@ public:
protected:
vtkAMRGaussianPulseSource();
- ~vtkAMRGaussianPulseSource() VTK_OVERRIDE;
+ ~vtkAMRGaussianPulseSource() override;
/**
* This is called by the superclass.
@@ -122,7 +122,7 @@ protected:
*/
int RequestData(vtkInformation *request,
vtkInformationVector **inputVector,
- vtkInformationVector *outputVector) VTK_OVERRIDE;
+ vtkInformationVector *outputVector) override;
//@{
/**
diff --git a/Filters/AMR/vtkAMRResampleFilter.h b/Filters/AMR/vtkAMRResampleFilter.h
index 7f36be28a4226d00845f46af4da76f629225fe0a..87935a6dbd1177ca90643d51d2cb947b00cb3d98 100644
--- a/Filters/AMR/vtkAMRResampleFilter.h
+++ b/Filters/AMR/vtkAMRResampleFilter.h
@@ -54,7 +54,7 @@ class VTKFILTERSAMR_EXPORT vtkAMRResampleFilter : public vtkMultiBlockDataSetAlg
public:
static vtkAMRResampleFilter *New();
vtkTypeMacro(vtkAMRResampleFilter,vtkMultiBlockDataSetAlgorithm);
- void PrintSelf(ostream &oss, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &oss, vtkIndent indent) override;
//@{
/**
@@ -141,23 +141,23 @@ public:
int RequestInformation(
vtkInformation *rqst,
vtkInformationVector **inputVector,
- vtkInformationVector *outputVector ) VTK_OVERRIDE;
+ vtkInformationVector *outputVector ) override;
int RequestData(
- vtkInformation*,vtkInformationVector**,vtkInformationVector*) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
- int FillOutputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ vtkInformation*,vtkInformationVector**,vtkInformationVector*) override;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
+ int FillOutputPortInformation(int port, vtkInformation *info) override;
/**
* Performs upstream requests to the reader
*/
int RequestUpdateExtent(
- vtkInformation*, vtkInformationVector**, vtkInformationVector* ) VTK_OVERRIDE;
+ vtkInformation*, vtkInformationVector**, vtkInformationVector* ) override;
protected:
vtkAMRResampleFilter();
- ~vtkAMRResampleFilter() VTK_OVERRIDE;
+ ~vtkAMRResampleFilter() override;
vtkOverlappingAMR *AMRMetaData;
vtkMultiBlockDataSet *ROI; // Pointer to the region of interest.
diff --git a/Filters/AMR/vtkAMRSliceFilter.h b/Filters/AMR/vtkAMRSliceFilter.h
index d5d45af272f04b17a3fededdf90cffd9c4c94fea..439027c72a0cbef71836ab538997d8eb6a100a66 100644
--- a/Filters/AMR/vtkAMRSliceFilter.h
+++ b/Filters/AMR/vtkAMRSliceFilter.h
@@ -43,7 +43,7 @@ class VTKFILTERSAMR_EXPORT vtkAMRSliceFilter :
public:
static vtkAMRSliceFilter* New();
vtkTypeMacro( vtkAMRSliceFilter, vtkOverlappingAMRAlgorithm );
- void PrintSelf(ostream &os, vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent ) override;
// Inline Gettters & Setters
vtkSetMacro(OffSetFromOrigin,double);
@@ -95,9 +95,9 @@ public:
// Standard Pipeline methods
int RequestData(
- vtkInformation*,vtkInformationVector**,vtkInformationVector*) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
- int FillOutputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ vtkInformation*,vtkInformationVector**,vtkInformationVector*) override;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
+ int FillOutputPortInformation(int port, vtkInformation *info) override;
/**
* Makes upstream request to a source, typically, a concrete instance of
@@ -106,17 +106,17 @@ public:
int RequestInformation(
vtkInformation *rqst,
vtkInformationVector **inputVector,
- vtkInformationVector *outputVector ) VTK_OVERRIDE;
+ vtkInformationVector *outputVector ) override;
/**
* Performs upstream requests to the reader
*/
int RequestUpdateExtent(
- vtkInformation*, vtkInformationVector**,vtkInformationVector* ) VTK_OVERRIDE;
+ vtkInformation*, vtkInformationVector**,vtkInformationVector* ) override;
protected:
vtkAMRSliceFilter();
- ~vtkAMRSliceFilter() VTK_OVERRIDE;
+ ~vtkAMRSliceFilter() override;
/**
* Returns the cell index w.r.t. the given input grid which contains
diff --git a/Filters/AMR/vtkAMRToMultiBlockFilter.h b/Filters/AMR/vtkAMRToMultiBlockFilter.h
index 4d0615e298bb8e54e53ea4eb6ddd16ca91028509..8ec9ee5f3dabd2148723465da585961eb7f8cfb0 100644
--- a/Filters/AMR/vtkAMRToMultiBlockFilter.h
+++ b/Filters/AMR/vtkAMRToMultiBlockFilter.h
@@ -42,7 +42,7 @@ class VTKFILTERSAMR_EXPORT vtkAMRToMultiBlockFilter :
public:
static vtkAMRToMultiBlockFilter* New();
vtkTypeMacro(vtkAMRToMultiBlockFilter, vtkMultiBlockDataSetAlgorithm );
- void PrintSelf(ostream &oss, vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf(ostream &oss, vtkIndent indent ) override;
//@{
/**
@@ -55,14 +55,14 @@ public:
// Standard pipeline routines
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
- int FillOutputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
+ int FillOutputPortInformation(int port, vtkInformation *info) override;
int RequestData(
- vtkInformation*, vtkInformationVector**, vtkInformationVector* ) VTK_OVERRIDE;
+ vtkInformation*, vtkInformationVector**, vtkInformationVector* ) override;
protected:
vtkAMRToMultiBlockFilter();
- ~vtkAMRToMultiBlockFilter() VTK_OVERRIDE;
+ ~vtkAMRToMultiBlockFilter() override;
//@{
/**
diff --git a/Filters/AMR/vtkImageToAMR.h b/Filters/AMR/vtkImageToAMR.h
index 2953b89bf3ed98b109ee08d6fbfd2d84be2e025b..237ed6d501ff74f900b1f363a67b0ff6c395e133 100644
--- a/Filters/AMR/vtkImageToAMR.h
+++ b/Filters/AMR/vtkImageToAMR.h
@@ -34,7 +34,7 @@ class VTKFILTERSAMR_EXPORT vtkImageToAMR : public vtkOverlappingAMRAlgorithm
public:
static vtkImageToAMR* New();
vtkTypeMacro(vtkImageToAMR, vtkOverlappingAMRAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -63,14 +63,14 @@ public:
protected:
vtkImageToAMR();
- ~vtkImageToAMR() VTK_OVERRIDE;
+ ~vtkImageToAMR() override;
/**
* Fill the input port information objects for this algorithm. This
* is invoked by the first call to GetInputPortInformation for each
* port so subclasses can specify what they can handle.
*/
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
/**
* This is called by the superclass.
@@ -78,7 +78,7 @@ protected:
*/
int RequestData(vtkInformation *request,
vtkInformationVector **inputVector,
- vtkInformationVector *outputVector) VTK_OVERRIDE;
+ vtkInformationVector *outputVector) override;
int NumberOfLevels;
int MaximumNumberOfBlocks;
diff --git a/Filters/AMR/vtkParallelAMRUtilities.h b/Filters/AMR/vtkParallelAMRUtilities.h
index 4d12a59f0709390c4147c56c573f0dac298a86d8..a9d0111706003900dbe8eeb9c07b9b71f1d25508 100644
--- a/Filters/AMR/vtkParallelAMRUtilities.h
+++ b/Filters/AMR/vtkParallelAMRUtilities.h
@@ -39,7 +39,7 @@ class VTKFILTERSAMR_EXPORT vtkParallelAMRUtilities : public vtkAMRUtilities
public:
// Standard Routines
vtkTypeMacro(vtkParallelAMRUtilities,vtkAMRUtilities);
- void PrintSelf(ostream& os, vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent ) override;
/**
* This method detects and strips partially overlapping cells from a
diff --git a/Filters/Core/vtkAppendArcLength.h b/Filters/Core/vtkAppendArcLength.h
index f9a45e339b4e92bc768132b364b319b892c2b722..f0c988f4d6676397210e174f21cfc03f9a3b1168 100644
--- a/Filters/Core/vtkAppendArcLength.h
+++ b/Filters/Core/vtkAppendArcLength.h
@@ -37,7 +37,7 @@ class VTKFILTERSCORE_EXPORT vtkAppendArcLength : public vtkPolyDataAlgorithm
public:
static vtkAppendArcLength* New();
vtkTypeMacro(vtkAppendArcLength, vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkAppendArcLength();
@@ -49,7 +49,7 @@ protected:
* This is the method you should override.
*/
int RequestData(vtkInformation* request, vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
private:
vtkAppendArcLength(const vtkAppendArcLength&) VTK_DELETE_FUNCTION;
diff --git a/Filters/Core/vtkAppendCompositeDataLeaves.h b/Filters/Core/vtkAppendCompositeDataLeaves.h
index f4fa6127978dec396143d9f1fa7c235b98f83a76..d05d5832d65d3bad938124fae118696f0a01651a 100644
--- a/Filters/Core/vtkAppendCompositeDataLeaves.h
+++ b/Filters/Core/vtkAppendCompositeDataLeaves.h
@@ -66,7 +66,7 @@ public:
static vtkAppendCompositeDataLeaves* New();
vtkTypeMacro(vtkAppendCompositeDataLeaves,vtkCompositeDataSetAlgorithm);
- void PrintSelf( ostream& os, vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf( ostream& os, vtkIndent indent ) override;
//@{
/**
@@ -81,23 +81,23 @@ public:
protected:
vtkAppendCompositeDataLeaves();
- ~vtkAppendCompositeDataLeaves() VTK_OVERRIDE;
+ ~vtkAppendCompositeDataLeaves() override;
/**
* Since vtkCompositeDataSet is an abstract class and we output the same types as the input,
* we must override the default implementation.
*/
- int RequestDataObject( vtkInformation*, vtkInformationVector**, vtkInformationVector* ) VTK_OVERRIDE;
+ int RequestDataObject( vtkInformation*, vtkInformationVector**, vtkInformationVector* ) override;
/**
* Iterates over the datasets and appends corresponding notes.
*/
- int RequestData( vtkInformation*, vtkInformationVector**, vtkInformationVector* ) VTK_OVERRIDE;
+ int RequestData( vtkInformation*, vtkInformationVector**, vtkInformationVector* ) override;
/**
* The input is repeatable, so we override the default implementation.
*/
- int FillInputPortInformation( int port, vtkInformation* info ) VTK_OVERRIDE;
+ int FillInputPortInformation( int port, vtkInformation* info ) override;
/**
* When leaf nodes are unstructured grids, this uses a vtkAppendFilter to merge them.
diff --git a/Filters/Core/vtkAppendFilter.h b/Filters/Core/vtkAppendFilter.h
index 6de834c84730fadf67db51f29f98a5872164d022..d215b78808bbd54f087d48d39c678e452ec7ce73 100644
--- a/Filters/Core/vtkAppendFilter.h
+++ b/Filters/Core/vtkAppendFilter.h
@@ -42,7 +42,7 @@ public:
static vtkAppendFilter *New();
vtkTypeMacro(vtkAppendFilter,vtkUnstructuredGridAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Get any input of this filter.
@@ -94,13 +94,13 @@ public:
protected:
vtkAppendFilter();
- ~vtkAppendFilter() VTK_OVERRIDE;
+ ~vtkAppendFilter() override;
// Usual data generation method
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
int RequestUpdateExtent(vtkInformation *,
- vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ vtkInformationVector **, vtkInformationVector *) override;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
// list of data sets to append together.
// Here as a convenience. It is a copy of the input array.
diff --git a/Filters/Core/vtkAppendPolyData.h b/Filters/Core/vtkAppendPolyData.h
index 12a59c7cd8f33764f713b9ee04896384a491eca9..a728479c19919af2c6b3d5bc4713317be010bd0c 100644
--- a/Filters/Core/vtkAppendPolyData.h
+++ b/Filters/Core/vtkAppendPolyData.h
@@ -45,7 +45,7 @@ public:
static vtkAppendPolyData *New();
vtkTypeMacro(vtkAppendPolyData,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -120,7 +120,7 @@ public:
protected:
vtkAppendPolyData();
- ~vtkAppendPolyData() VTK_OVERRIDE;
+ ~vtkAppendPolyData() override;
// Flag for selecting parallel streaming behavior
int ParallelStreaming;
@@ -128,10 +128,10 @@ protected:
// Usual data generation method
int RequestData(vtkInformation *,
- vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector **, vtkInformationVector *) override;
int RequestUpdateExtent(vtkInformation *,
- vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int, vtkInformation *) VTK_OVERRIDE;
+ vtkInformationVector **, vtkInformationVector *) override;
+ int FillInputPortInformation(int, vtkInformation *) override;
// An efficient templated way to append data.
void AppendData(vtkDataArray *dest, vtkDataArray *src, vtkIdType offset);
diff --git a/Filters/Core/vtkAppendSelection.h b/Filters/Core/vtkAppendSelection.h
index 5764cb12cc8e66cd0d326f1b0ddab124d65b72fb..d0878bb052692710a7d2ae1e6b939563621725d0 100644
--- a/Filters/Core/vtkAppendSelection.h
+++ b/Filters/Core/vtkAppendSelection.h
@@ -40,7 +40,7 @@ public:
static vtkAppendSelection *New();
vtkTypeMacro(vtkAppendSelection,vtkSelectionAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -99,12 +99,12 @@ public:
protected:
vtkAppendSelection();
- ~vtkAppendSelection() VTK_OVERRIDE;
+ ~vtkAppendSelection() override;
// Usual data generation method
int RequestData(vtkInformation *,
- vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int, vtkInformation *) VTK_OVERRIDE;
+ vtkInformationVector **, vtkInformationVector *) override;
+ int FillInputPortInformation(int, vtkInformation *) override;
private:
// hide the superclass' AddInput() from the user and the compiler
diff --git a/Filters/Core/vtkArrayCalculator.h b/Filters/Core/vtkArrayCalculator.h
index d9d76b5e509ef4155e71902f454459ce646a5a1b..0edac902a0698ac6e42bf0dc1f2f421ee072a6f8 100644
--- a/Filters/Core/vtkArrayCalculator.h
+++ b/Filters/Core/vtkArrayCalculator.h
@@ -80,7 +80,7 @@ class VTKFILTERSCORE_EXPORT vtkArrayCalculator : public vtkPassInputTypeAlgorith
{
public:
vtkTypeMacro(vtkArrayCalculator,vtkPassInputTypeAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkArrayCalculator *New();
@@ -306,11 +306,11 @@ public:
protected:
vtkArrayCalculator();
- ~vtkArrayCalculator() VTK_OVERRIDE;
+ ~vtkArrayCalculator() override;
- int FillInputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
+ int FillInputPortInformation(int, vtkInformation*) override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
char * Function;
char * ResultArrayName;
diff --git a/Filters/Core/vtkAssignAttribute.h b/Filters/Core/vtkAssignAttribute.h
index 43f86f70f347a73838818c5bad51f66ade972fab..f9c9db037499da6d763cdf13385948b9c2c9476c 100644
--- a/Filters/Core/vtkAssignAttribute.h
+++ b/Filters/Core/vtkAssignAttribute.h
@@ -68,7 +68,7 @@ class VTKFILTERSCORE_EXPORT vtkAssignAttribute : public vtkPassInputTypeAlgorith
{
public:
vtkTypeMacro(vtkAssignAttribute,vtkPassInputTypeAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Create a new vtkAssignAttribute.
@@ -111,11 +111,11 @@ protected:
};
vtkAssignAttribute();
- ~vtkAssignAttribute() VTK_OVERRIDE;
+ ~vtkAssignAttribute() override;
- int RequestInformation(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int, vtkInformation *) VTK_OVERRIDE;
+ int RequestInformation(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int FillInputPortInformation(int, vtkInformation *) override;
char* FieldName;
int FieldTypeAssignment;
diff --git a/Filters/Core/vtkAttributeDataToFieldDataFilter.h b/Filters/Core/vtkAttributeDataToFieldDataFilter.h
index f4b74b2aa1116be3732a453164344f90379bc8b4..c9c6ff27cd2482ad496898cd342e9e942fec28b0 100644
--- a/Filters/Core/vtkAttributeDataToFieldDataFilter.h
+++ b/Filters/Core/vtkAttributeDataToFieldDataFilter.h
@@ -48,7 +48,7 @@
class VTKFILTERSCORE_EXPORT vtkAttributeDataToFieldDataFilter : public vtkDataSetAlgorithm
{
public:
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
vtkTypeMacro(vtkAttributeDataToFieldDataFilter,vtkDataSetAlgorithm);
/**
@@ -68,9 +68,9 @@ public:
protected:
vtkAttributeDataToFieldDataFilter();
- ~vtkAttributeDataToFieldDataFilter() VTK_OVERRIDE {}
+ ~vtkAttributeDataToFieldDataFilter() override {}
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE; //generate output data
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override; //generate output data
int PassAttributeData;
private:
diff --git a/Filters/Core/vtkBinCellDataFilter.h b/Filters/Core/vtkBinCellDataFilter.h
index f5adf94af70127c2ef5b3f51fe5a67fd8252c1fb..ae13d4c2adffa80a612139c2190253e4480de657 100644
--- a/Filters/Core/vtkBinCellDataFilter.h
+++ b/Filters/Core/vtkBinCellDataFilter.h
@@ -44,7 +44,7 @@ public:
typedef vtkContourValues vtkBinValues;
vtkTypeMacro(vtkBinCellDataFilter,vtkDataSetAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct object with initial range (VTK_DOUBLE_MIN, VTK_DOUBLE_MAX) and
@@ -177,7 +177,7 @@ public:
protected:
vtkBinCellDataFilter();
- ~vtkBinCellDataFilter() VTK_OVERRIDE;
+ ~vtkBinCellDataFilter() override;
int SpatialMatch;
@@ -191,11 +191,11 @@ protected:
vtkCellLocator *CellLocator;
int RequestData(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
int RequestInformation(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
int RequestUpdateExtent(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
virtual void CreateDefaultLocator();
diff --git a/Filters/Core/vtkCellDataToPointData.h b/Filters/Core/vtkCellDataToPointData.h
index 98cb35df6eae8ab67fea5cc378f100df7b686a3e..67b1ab23302c8d33b2146f277adf6058141cce8c 100644
--- a/Filters/Core/vtkCellDataToPointData.h
+++ b/Filters/Core/vtkCellDataToPointData.h
@@ -51,7 +51,7 @@ class VTKFILTERSCORE_EXPORT vtkCellDataToPointData : public vtkDataSetAlgorithm
public:
static vtkCellDataToPointData *New();
vtkTypeMacro(vtkCellDataToPointData,vtkDataSetAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/// Options to choose what cells contribute to the calculation
enum ContributingCellEnum {
@@ -82,11 +82,11 @@ public:
protected:
vtkCellDataToPointData();
- ~vtkCellDataToPointData() VTK_OVERRIDE {}
+ ~vtkCellDataToPointData() override {}
int RequestData(vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
//@{
/**
diff --git a/Filters/Core/vtkCenterOfMass.h b/Filters/Core/vtkCenterOfMass.h
index 5b948ed25aa479e2bed296205ff52d3d58eea122..2f8bc9ee58ffc5769698aec51326cd36d35d288e 100644
--- a/Filters/Core/vtkCenterOfMass.h
+++ b/Filters/Core/vtkCenterOfMass.h
@@ -39,7 +39,7 @@ class VTKFILTERSCORE_EXPORT vtkCenterOfMass : public vtkPointSetAlgorithm
public:
static vtkCenterOfMass *New();
vtkTypeMacro(vtkCenterOfMass,vtkPointSetAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -74,7 +74,7 @@ protected:
int RequestData(vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector ) VTK_OVERRIDE;
+ vtkInformationVector* outputVector ) override;
private:
diff --git a/Filters/Core/vtkCleanPolyData.h b/Filters/Core/vtkCleanPolyData.h
index c571b0ed852b05cbe7d6bd3a5f8107883e5d0a12..4777b121fb1faa7725c0850f6a33a15bdce0520f 100644
--- a/Filters/Core/vtkCleanPolyData.h
+++ b/Filters/Core/vtkCleanPolyData.h
@@ -74,7 +74,7 @@ class VTKFILTERSCORE_EXPORT vtkCleanPolyData : public vtkPolyDataAlgorithm
{
public:
static vtkCleanPolyData *New();
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
vtkTypeMacro(vtkCleanPolyData,vtkPolyDataAlgorithm);
//@{
@@ -166,7 +166,7 @@ public:
/**
* Get the MTime of this object also considering the locator.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
/**
* Perform operation on a point
@@ -199,11 +199,11 @@ public:
protected:
vtkCleanPolyData();
- ~vtkCleanPolyData() VTK_OVERRIDE;
+ ~vtkCleanPolyData() override;
// Usual data generation method
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int RequestUpdateExtent(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int RequestUpdateExtent(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
int PointMerging;
double Tolerance;
diff --git a/Filters/Core/vtkClipPolyData.h b/Filters/Core/vtkClipPolyData.h
index 3d7ad626a7d5983802d78f3c48123b7f64a5c043..154aaf3dca77b312efe3c14031cb4ca960359b82 100644
--- a/Filters/Core/vtkClipPolyData.h
+++ b/Filters/Core/vtkClipPolyData.h
@@ -69,7 +69,7 @@ class VTKFILTERSCORE_EXPORT vtkClipPolyData : public vtkPolyDataAlgorithm
{
public:
vtkTypeMacro(vtkClipPolyData,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct with user-specified implicit function; InsideOut turned off;
@@ -167,7 +167,7 @@ public:
/**
* Return the mtime also considering the locator and clip function.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
//@{
/**
@@ -182,9 +182,9 @@ public:
protected:
vtkClipPolyData(vtkImplicitFunction *cf=nullptr);
- ~vtkClipPolyData() VTK_OVERRIDE;
+ ~vtkClipPolyData() override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
vtkImplicitFunction *ClipFunction;
vtkIncrementalPointLocator *Locator;
diff --git a/Filters/Core/vtkCompositeCutter.h b/Filters/Core/vtkCompositeCutter.h
index d17795b83f35a1f5bca2cdc2dfbfd9ea304e2db0..cf0da099857b4a83f0f2c2fed933e5b2780ade89 100644
--- a/Filters/Core/vtkCompositeCutter.h
+++ b/Filters/Core/vtkCompositeCutter.h
@@ -34,14 +34,14 @@ public:
static vtkCompositeCutter *New();
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;;
+ void PrintSelf(ostream& os, vtkIndent indent) override;;
protected:
vtkCompositeCutter(vtkImplicitFunction *cf=nullptr);
- ~vtkCompositeCutter() VTK_OVERRIDE;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int RequestUpdateExtent(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ ~vtkCompositeCutter() override;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int RequestUpdateExtent(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
private:
vtkCompositeCutter(const vtkCompositeCutter&) VTK_DELETE_FUNCTION;
diff --git a/Filters/Core/vtkCompositeDataProbeFilter.h b/Filters/Core/vtkCompositeDataProbeFilter.h
index a132677801d23737a1c059684779962b533487fb..7685b47ae0462be4a65b7d261ce6c6f688a31bed 100644
--- a/Filters/Core/vtkCompositeDataProbeFilter.h
+++ b/Filters/Core/vtkCompositeDataProbeFilter.h
@@ -47,7 +47,7 @@ class VTKFILTERSCORE_EXPORT vtkCompositeDataProbeFilter : public vtkProbeFilter
public:
static vtkCompositeDataProbeFilter* New();
vtkTypeMacro(vtkCompositeDataProbeFilter, vtkProbeFilter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -69,13 +69,13 @@ public:
protected:
vtkCompositeDataProbeFilter();
- ~vtkCompositeDataProbeFilter() VTK_OVERRIDE;
+ ~vtkCompositeDataProbeFilter() override;
/**
* Change input information to accept composite datasets as the input which
* is probed into.
*/
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
/**
* Builds the field list using the composite dataset source.
@@ -85,18 +85,18 @@ protected:
/**
* Initializes output and various arrays which keep track for probing status.
*/
- void InitializeOutputArrays(vtkPointData *outPD, vtkIdType numPts) VTK_OVERRIDE;
+ void InitializeOutputArrays(vtkPointData *outPD, vtkIdType numPts) override;
/**
* Handle composite input.
*/
int RequestData(vtkInformation *,
- vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector **, vtkInformationVector *) override;
/**
* Create a default executive.
*/
- vtkExecutive* CreateDefaultExecutive() VTK_OVERRIDE;
+ vtkExecutive* CreateDefaultExecutive() override;
bool PassPartialArrays;
private:
diff --git a/Filters/Core/vtkConnectivityFilter.h b/Filters/Core/vtkConnectivityFilter.h
index 7142912fc628cc4419e0ba2f0161d9381cbf9a01..d37ecbf748550aaf85f6f2740a5b51b65ac08e9b 100644
--- a/Filters/Core/vtkConnectivityFilter.h
+++ b/Filters/Core/vtkConnectivityFilter.h
@@ -70,7 +70,7 @@ class VTKFILTERSCORE_EXPORT vtkConnectivityFilter : public vtkUnstructuredGridAl
{
public:
vtkTypeMacro(vtkConnectivityFilter,vtkUnstructuredGridAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct with default extraction mode to extract largest regions.
@@ -183,11 +183,11 @@ public:
protected:
vtkConnectivityFilter();
- ~vtkConnectivityFilter() VTK_OVERRIDE;
+ ~vtkConnectivityFilter() override;
// Usual data generation method
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
int ColorRegions; //boolean turns on/off scalar gen for separate regions
int ExtractionMode; //how to extract regions
diff --git a/Filters/Core/vtkContourFilter.h b/Filters/Core/vtkContourFilter.h
index 1ea08cd5d951f3ede86344c50e87c252b1f945d0..80c0e4c9d550f9cf4bf80e8c8ff572a83be80603 100644
--- a/Filters/Core/vtkContourFilter.h
+++ b/Filters/Core/vtkContourFilter.h
@@ -64,7 +64,7 @@ class VTKFILTERSCORE_EXPORT vtkContourFilter : public vtkPolyDataAlgorithm
{
public:
vtkTypeMacro(vtkContourFilter,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct object with initial range (0,1) and single contour value
@@ -89,7 +89,7 @@ public:
/**
* Modified GetMTime Because we delegate to vtkContourValues
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
//@{
/**
@@ -197,17 +197,17 @@ public:
protected:
vtkContourFilter();
- ~vtkContourFilter() VTK_OVERRIDE;
+ ~vtkContourFilter() override;
- void ReportReferences(vtkGarbageCollector*) VTK_OVERRIDE;
+ void ReportReferences(vtkGarbageCollector*) override;
int RequestData(vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
int RequestUpdateExtent(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ vtkInformationVector*) override;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
vtkContourValues *ContourValues;
int ComputeNormals;
diff --git a/Filters/Core/vtkContourGrid.h b/Filters/Core/vtkContourGrid.h
index c2ed7c5d3984a3a5b95534d303275da457d6f898..2722bb6970a55640f9c6a0923e150d8ffc2c4387 100644
--- a/Filters/Core/vtkContourGrid.h
+++ b/Filters/Core/vtkContourGrid.h
@@ -62,7 +62,7 @@ class VTKFILTERSCORE_EXPORT vtkContourGrid : public vtkPolyDataAlgorithm
{
public:
vtkTypeMacro(vtkContourGrid,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct object with initial range (0,1) and single contour value
@@ -87,7 +87,7 @@ public:
/**
* Modified GetMTime Because we delegate to vtkContourValues
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
//@{
/**
@@ -184,10 +184,10 @@ public:
protected:
vtkContourGrid();
- ~vtkContourGrid() VTK_OVERRIDE;
+ ~vtkContourGrid() override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
vtkContourValues *ContourValues;
int ComputeNormals;
diff --git a/Filters/Core/vtkCutter.h b/Filters/Core/vtkCutter.h
index 2abe1d69efeae5cb9cd9772fd93b6e1a708a13b6..cda6bf0df5f438d097d33cdbe151d009d1bddefe 100644
--- a/Filters/Core/vtkCutter.h
+++ b/Filters/Core/vtkCutter.h
@@ -64,7 +64,7 @@ class VTKFILTERSCORE_EXPORT vtkCutter : public vtkPolyDataAlgorithm
{
public:
vtkTypeMacro(vtkCutter,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct with user-specified implicit function; initial value of 0.0; and
@@ -132,7 +132,7 @@ public:
* Override GetMTime because we delegate to vtkContourValues and refer to
* vtkImplicitFunction.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
//@{
/**
@@ -225,11 +225,11 @@ public:
protected:
vtkCutter(vtkImplicitFunction *cf=nullptr);
- ~vtkCutter() VTK_OVERRIDE;
+ ~vtkCutter() override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int RequestUpdateExtent(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int RequestUpdateExtent(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
void UnstructuredGridCutter(vtkDataSet *input, vtkPolyData *output);
void DataSetCutter(vtkDataSet *input, vtkPolyData *output);
void StructuredPointsCutter(vtkDataSet *, vtkPolyData *,
diff --git a/Filters/Core/vtkDataObjectGenerator.h b/Filters/Core/vtkDataObjectGenerator.h
index bc33f19d1da3b0e246c0b7911e494ac9613579ef..11c1d24652f559a576140efc00d575fe2fc96ca4 100644
--- a/Filters/Core/vtkDataObjectGenerator.h
+++ b/Filters/Core/vtkDataObjectGenerator.h
@@ -48,7 +48,7 @@ class VTKFILTERSCORE_EXPORT vtkDataObjectGenerator
public:
static vtkDataObjectGenerator *New();
vtkTypeMacro(vtkDataObjectGenerator,vtkDataObjectAlgorithm);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
//@{
/**
@@ -60,20 +60,20 @@ class VTKFILTERSCORE_EXPORT vtkDataObjectGenerator
protected:
vtkDataObjectGenerator();
- ~vtkDataObjectGenerator() VTK_OVERRIDE;
+ ~vtkDataObjectGenerator() override;
int RequestData(vtkInformation *req,
vtkInformationVector **inV,
- vtkInformationVector *outV) VTK_OVERRIDE;
+ vtkInformationVector *outV) override;
int RequestDataObject(vtkInformation *req,
vtkInformationVector **inV,
- vtkInformationVector *outV) VTK_OVERRIDE;
+ vtkInformationVector *outV) override;
int RequestInformation(vtkInformation *req,
vtkInformationVector **inV,
- vtkInformationVector *outV) VTK_OVERRIDE;
+ vtkInformationVector *outV) override;
int RequestUpdateExtent(vtkInformation *req,
vtkInformationVector **inV,
- vtkInformationVector *outV) VTK_OVERRIDE;
+ vtkInformationVector *outV) override;
//the string to parse to create a structure
char *Program;
diff --git a/Filters/Core/vtkDataObjectToDataSetFilter.h b/Filters/Core/vtkDataObjectToDataSetFilter.h
index 1cb5dfcc1ce141760fb80feab09f7732c85c0b33..d033fe4925fe0320d9455b98718943efaf007fdd 100644
--- a/Filters/Core/vtkDataObjectToDataSetFilter.h
+++ b/Filters/Core/vtkDataObjectToDataSetFilter.h
@@ -83,7 +83,7 @@ class VTKFILTERSCORE_EXPORT vtkDataObjectToDataSetFilter : public vtkDataSetAlgo
public:
static vtkDataObjectToDataSetFilter *New();
vtkTypeMacro(vtkDataObjectToDataSetFilter,vtkDataSetAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Get the input to the filter.
@@ -275,14 +275,14 @@ public:
protected:
vtkDataObjectToDataSetFilter();
- ~vtkDataObjectToDataSetFilter() VTK_OVERRIDE;
+ ~vtkDataObjectToDataSetFilter() override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE; //generate output data
- int RequestInformation(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int RequestUpdateExtent(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override; //generate output data
+ int RequestInformation(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int RequestUpdateExtent(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
int RequestDataObject(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
char Updating;
diff --git a/Filters/Core/vtkDataSetEdgeSubdivisionCriterion.h b/Filters/Core/vtkDataSetEdgeSubdivisionCriterion.h
index 6602ed3165ffaef1e5b3e2e2015150f419b4baa6..00172251cf27e4ae3eee3b9ae831cafa5796de97 100644
--- a/Filters/Core/vtkDataSetEdgeSubdivisionCriterion.h
+++ b/Filters/Core/vtkDataSetEdgeSubdivisionCriterion.h
@@ -47,7 +47,7 @@ class VTKFILTERSCORE_EXPORT vtkDataSetEdgeSubdivisionCriterion : public vtkEdgeS
public:
vtkTypeMacro(vtkDataSetEdgeSubdivisionCriterion,vtkEdgeSubdivisionCriterion);
static vtkDataSetEdgeSubdivisionCriterion* New();
- void PrintSelf( ostream& os, vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf( ostream& os, vtkIndent indent ) override;
virtual void SetMesh( vtkDataSet* );
vtkDataSet* GetMesh();
@@ -63,7 +63,7 @@ class VTKFILTERSCORE_EXPORT vtkDataSetEdgeSubdivisionCriterion : public vtkEdgeS
const vtkCell* GetCell() const;
- bool EvaluateEdge( const double* p0, double* midpt, const double* p1, int field_start ) VTK_OVERRIDE;
+ bool EvaluateEdge( const double* p0, double* midpt, const double* p1, int field_start ) override;
/**
* Evaluate all of the fields that should be output with the
@@ -153,7 +153,7 @@ class VTKFILTERSCORE_EXPORT vtkDataSetEdgeSubdivisionCriterion : public vtkEdgeS
protected:
vtkDataSetEdgeSubdivisionCriterion();
- ~vtkDataSetEdgeSubdivisionCriterion() VTK_OVERRIDE;
+ ~vtkDataSetEdgeSubdivisionCriterion() override;
vtkDataSet* CurrentMesh;
vtkIdType CurrentCellId;
diff --git a/Filters/Core/vtkDataSetToDataObjectFilter.h b/Filters/Core/vtkDataSetToDataObjectFilter.h
index 8015402ea33622f88506d6f47550c9db111a1495..1e527f7dcfc113d12a3af2beecb2385183772ee2 100644
--- a/Filters/Core/vtkDataSetToDataObjectFilter.h
+++ b/Filters/Core/vtkDataSetToDataObjectFilter.h
@@ -56,7 +56,7 @@ class VTKFILTERSCORE_EXPORT vtkDataSetToDataObjectFilter : public vtkDataObjectA
{
public:
vtkTypeMacro(vtkDataSetToDataObjectFilter,vtkDataObjectAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Instantiate the object to transform all data into a data object.
@@ -110,14 +110,14 @@ public:
protected:
vtkDataSetToDataObjectFilter();
- ~vtkDataSetToDataObjectFilter() VTK_OVERRIDE;
+ ~vtkDataSetToDataObjectFilter() override;
int RequestData(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE; //generate output data
+ vtkInformationVector *) override; //generate output data
int RequestUpdateExtent(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
- int FillInputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
+ int FillInputPortInformation(int, vtkInformation*) override;
int Geometry;
int Topology;
diff --git a/Filters/Core/vtkDecimatePolylineFilter.h b/Filters/Core/vtkDecimatePolylineFilter.h
index f4c1a0fa0f502995198c7f02cbd6717ad72a51e8..63a79da0972413c2d254920e7941fe7de5da555c 100644
--- a/Filters/Core/vtkDecimatePolylineFilter.h
+++ b/Filters/Core/vtkDecimatePolylineFilter.h
@@ -53,7 +53,7 @@ public:
* Standard methods for type information and printing.
*/
vtkTypeMacro(vtkDecimatePolylineFilter,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
@@ -83,9 +83,9 @@ public:
protected:
vtkDecimatePolylineFilter();
- ~vtkDecimatePolylineFilter() VTK_OVERRIDE;
+ ~vtkDecimatePolylineFilter() override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
class Polyline;
double ComputeError( vtkPolyData* input,
diff --git a/Filters/Core/vtkDecimatePro.h b/Filters/Core/vtkDecimatePro.h
index a14b86c1788d1215319b3357112a0863d4be79f9..abd559a3c9536815370a1cbf4b9bc872c51e4893 100644
--- a/Filters/Core/vtkDecimatePro.h
+++ b/Filters/Core/vtkDecimatePro.h
@@ -92,7 +92,7 @@ class VTKFILTERSCORE_EXPORT vtkDecimatePro : public vtkPolyDataAlgorithm
{
public:
vtkTypeMacro(vtkDecimatePro,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Create object with specified reduction of 90% and feature angle of
@@ -288,9 +288,9 @@ public:
protected:
vtkDecimatePro();
- ~vtkDecimatePro() VTK_OVERRIDE;
+ ~vtkDecimatePro() override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
double TargetReduction;
double FeatureAngle;
diff --git a/Filters/Core/vtkDelaunay2D.h b/Filters/Core/vtkDelaunay2D.h
index 022d37d2a24eba0cca70fcbb9dc822e97de49c8b..88901dc6dc18d5f27e908a130eceab5ac4b2df89 100644
--- a/Filters/Core/vtkDelaunay2D.h
+++ b/Filters/Core/vtkDelaunay2D.h
@@ -141,7 +141,7 @@ class VTKFILTERSCORE_EXPORT vtkDelaunay2D : public vtkPolyDataAlgorithm
{
public:
vtkTypeMacro(vtkDelaunay2D,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct object with Alpha = 0.0; Tolerance = 0.001; Offset = 1.25;
@@ -243,9 +243,9 @@ public:
protected:
vtkDelaunay2D();
- ~vtkDelaunay2D() VTK_OVERRIDE;
+ ~vtkDelaunay2D() override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
vtkAbstractTransform * ComputeBestFittingPlane(vtkPointSet *input);
@@ -288,7 +288,7 @@ private:
void CheckEdge(vtkIdType ptId, double x[3], vtkIdType p1, vtkIdType p2,
vtkIdType tri, bool recursive);
- int FillInputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
+ int FillInputPortInformation(int, vtkInformation*) override;
private:
vtkDelaunay2D(const vtkDelaunay2D&) VTK_DELETE_FUNCTION;
diff --git a/Filters/Core/vtkDelaunay3D.h b/Filters/Core/vtkDelaunay3D.h
index 35ffa20688186f4fe4ca7c41e6b0af42b17a54f4..07159e488b5adb8ac29e0b2d959c3f62c190f92c 100644
--- a/Filters/Core/vtkDelaunay3D.h
+++ b/Filters/Core/vtkDelaunay3D.h
@@ -108,7 +108,7 @@ class VTKFILTERSCORE_EXPORT vtkDelaunay3D : public vtkUnstructuredGridAlgorithm
{
public:
vtkTypeMacro(vtkDelaunay3D,vtkUnstructuredGridAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct object with Alpha = 0.0; Tolerance = 0.001; Offset = 2.5;
@@ -251,7 +251,7 @@ public:
/**
* Return the MTime also considering the locator.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
//@{
/**
@@ -265,9 +265,9 @@ public:
protected:
vtkDelaunay3D();
- ~vtkDelaunay3D() VTK_OVERRIDE;
+ ~vtkDelaunay3D() override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
double Alpha;
int AlphaTets;
@@ -298,7 +298,7 @@ protected:
vtkIdList *tetras, vtkIdList *faces,
vtkIncrementalPointLocator *Locator);
- int FillInputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
+ int FillInputPortInformation(int, vtkInformation*) override;
private: //members added for performance
vtkIdList *Tetras; //used in InsertPoint
vtkIdList *Faces; //used in InsertPoint
diff --git a/Filters/Core/vtkEdgeSubdivisionCriterion.h b/Filters/Core/vtkEdgeSubdivisionCriterion.h
index 4dfe9c8692768edcc6c90c050382c9a4e531e6b4..ca577cdf182b5aa68c9b3fdc7d3f18bd3169bc37 100644
--- a/Filters/Core/vtkEdgeSubdivisionCriterion.h
+++ b/Filters/Core/vtkEdgeSubdivisionCriterion.h
@@ -43,7 +43,7 @@ class VTKFILTERSCORE_EXPORT vtkEdgeSubdivisionCriterion : public vtkObject
{
public:
vtkTypeMacro(vtkEdgeSubdivisionCriterion,vtkObject);
- void PrintSelf( ostream& os, vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf( ostream& os, vtkIndent indent ) override;
/**
* You must implement this member function in a subclass.
@@ -105,7 +105,7 @@ class VTKFILTERSCORE_EXPORT vtkEdgeSubdivisionCriterion : public vtkObject
protected:
vtkEdgeSubdivisionCriterion();
- ~vtkEdgeSubdivisionCriterion() VTK_OVERRIDE;
+ ~vtkEdgeSubdivisionCriterion() override;
int* FieldIds;
int* FieldOffsets;
diff --git a/Filters/Core/vtkElevationFilter.h b/Filters/Core/vtkElevationFilter.h
index 6215e4bf837639a36a3e9c0c5206948c69834a30..380f74fc83172d9499723ff2ffc1ee282ac85fbb 100644
--- a/Filters/Core/vtkElevationFilter.h
+++ b/Filters/Core/vtkElevationFilter.h
@@ -46,7 +46,7 @@ class VTKFILTERSCORE_EXPORT vtkElevationFilter : public vtkDataSetAlgorithm
public:
static vtkElevationFilter* New();
vtkTypeMacro(vtkElevationFilter, vtkDataSetAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -76,11 +76,11 @@ public:
protected:
vtkElevationFilter();
- ~vtkElevationFilter() VTK_OVERRIDE;
+ ~vtkElevationFilter() override;
int RequestData(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
double LowPoint[3];
double HighPoint[3];
diff --git a/Filters/Core/vtkExecutionTimer.h b/Filters/Core/vtkExecutionTimer.h
index 6687f9975cfe43243954e8ab3ade523f3a1cbc11..0cb04b5e2390c2840a4658bd28482220e2f87be4 100644
--- a/Filters/Core/vtkExecutionTimer.h
+++ b/Filters/Core/vtkExecutionTimer.h
@@ -42,7 +42,7 @@ class VTKFILTERSCORE_EXPORT vtkExecutionTimer : public vtkObject
{
public:
vtkTypeMacro(vtkExecutionTimer, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct a new timer with no attached filter. Use SetFilter()
@@ -81,7 +81,7 @@ public:
protected:
vtkExecutionTimer();
- ~vtkExecutionTimer() VTK_OVERRIDE;
+ ~vtkExecutionTimer() override;
// This is the observer that will catch StartEvent and hand off to
// EventRelay
diff --git a/Filters/Core/vtkFeatureEdges.h b/Filters/Core/vtkFeatureEdges.h
index 23b5abda65125b1238ae08f3d8a004a5869c3778..bc432fa3f4cf5c6e321aac398d163e38ceb902be 100644
--- a/Filters/Core/vtkFeatureEdges.h
+++ b/Filters/Core/vtkFeatureEdges.h
@@ -47,7 +47,7 @@ class VTKFILTERSCORE_EXPORT vtkFeatureEdges : public vtkPolyDataAlgorithm
{
public:
vtkTypeMacro(vtkFeatureEdges,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct object with feature angle = 30; all types of edges extracted
@@ -125,7 +125,7 @@ public:
/**
* Return MTime also considering the locator.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
//@{
/**
@@ -139,11 +139,11 @@ public:
protected:
vtkFeatureEdges();
- ~vtkFeatureEdges() VTK_OVERRIDE;
+ ~vtkFeatureEdges() override;
// Usual data generation method
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int RequestUpdateExtent(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int RequestUpdateExtent(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
double FeatureAngle;
int BoundaryEdges;
diff --git a/Filters/Core/vtkFieldDataToAttributeDataFilter.h b/Filters/Core/vtkFieldDataToAttributeDataFilter.h
index e066736ba2ccdd1b136341a7fad03f1b977f25e3..b99c0ebfa7491b9069922a61106c109e45581013 100644
--- a/Filters/Core/vtkFieldDataToAttributeDataFilter.h
+++ b/Filters/Core/vtkFieldDataToAttributeDataFilter.h
@@ -72,7 +72,7 @@ class vtkFieldData;
class VTKFILTERSCORE_EXPORT vtkFieldDataToAttributeDataFilter : public vtkDataSetAlgorithm
{
public:
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
vtkTypeMacro(vtkFieldDataToAttributeDataFilter,vtkDataSetAlgorithm);
/**
@@ -253,13 +253,13 @@ public:
/**
* If output does not need exact extent, the I do not either.
*/
- int RequestUpdateExtent(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestUpdateExtent(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
protected:
vtkFieldDataToAttributeDataFilter();
- ~vtkFieldDataToAttributeDataFilter() VTK_OVERRIDE;
+ ~vtkFieldDataToAttributeDataFilter() override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE; //generate output data
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override; //generate output data
int InputField;
int OutputAttributeData;
diff --git a/Filters/Core/vtkFlyingEdges2D.h b/Filters/Core/vtkFlyingEdges2D.h
index 74abfb1451fe1702fbecf9aa49db2fde7e787010..53fec8a3b04a03d88b02869ec964958f09d599cf 100644
--- a/Filters/Core/vtkFlyingEdges2D.h
+++ b/Filters/Core/vtkFlyingEdges2D.h
@@ -70,12 +70,12 @@ class VTKFILTERSCORE_EXPORT vtkFlyingEdges2D : public vtkPolyDataAlgorithm
public:
static vtkFlyingEdges2D *New();
vtkTypeMacro(vtkFlyingEdges2D,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Because we delegate to vtkContourValues.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
/**
* Set a particular contour value at contour number i. The index i ranges
@@ -153,11 +153,11 @@ public:
protected:
vtkFlyingEdges2D();
- ~vtkFlyingEdges2D() VTK_OVERRIDE;
+ ~vtkFlyingEdges2D() override;
int RequestData(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ vtkInformationVector *) override;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
vtkContourValues *ContourValues;
int ComputeScalars;
diff --git a/Filters/Core/vtkFlyingEdges3D.h b/Filters/Core/vtkFlyingEdges3D.h
index 25db4988b4d43b6dab1c2687d4417f4f43d49990..5b488bba8ba54f1ce42b50276881228e2fdd0b91 100644
--- a/Filters/Core/vtkFlyingEdges3D.h
+++ b/Filters/Core/vtkFlyingEdges3D.h
@@ -72,12 +72,12 @@ class VTKFILTERSCORE_EXPORT vtkFlyingEdges3D : public vtkPolyDataAlgorithm
public:
static vtkFlyingEdges3D *New();
vtkTypeMacro(vtkFlyingEdges3D,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Because we delegate to vtkContourValues.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
//@{
/**
@@ -189,7 +189,7 @@ public:
protected:
vtkFlyingEdges3D();
- ~vtkFlyingEdges3D() VTK_OVERRIDE;
+ ~vtkFlyingEdges3D() override;
int ComputeNormals;
int ComputeGradients;
@@ -199,10 +199,10 @@ protected:
vtkContourValues *ContourValues;
int RequestData(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
int RequestUpdateExtent(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ vtkInformationVector *) override;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
private:
vtkFlyingEdges3D(const vtkFlyingEdges3D&) VTK_DELETE_FUNCTION;
diff --git a/Filters/Core/vtkFlyingEdgesPlaneCutter.h b/Filters/Core/vtkFlyingEdgesPlaneCutter.h
index fddc9d1fcf2a48e51a412240e103b1f64aeb5c94..9c3509ff78699c0a171d3ac10349c440bcfe7911 100644
--- a/Filters/Core/vtkFlyingEdgesPlaneCutter.h
+++ b/Filters/Core/vtkFlyingEdgesPlaneCutter.h
@@ -64,13 +64,13 @@ public:
*/
static vtkFlyingEdgesPlaneCutter *New();
vtkTypeMacro(vtkFlyingEdgesPlaneCutter,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
* The modified time depends on the delegated cut plane.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
//@{
/**
@@ -113,7 +113,7 @@ public:
protected:
vtkFlyingEdgesPlaneCutter();
- ~vtkFlyingEdgesPlaneCutter() VTK_OVERRIDE;
+ ~vtkFlyingEdgesPlaneCutter() override;
vtkPlane *Plane;
int ComputeNormals;
@@ -121,10 +121,10 @@ protected:
int ArrayComponent;
int RequestData(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
int RequestUpdateExtent(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ vtkInformationVector *) override;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
private:
vtkFlyingEdgesPlaneCutter(const vtkFlyingEdgesPlaneCutter&) VTK_DELETE_FUNCTION;
diff --git a/Filters/Core/vtkGlyph2D.h b/Filters/Core/vtkGlyph2D.h
index 2943d89ed1881e0213abe93a82bd8a771bf2084f..365dea511bd7ba15a940e9765b9b6783a391398e 100644
--- a/Filters/Core/vtkGlyph2D.h
+++ b/Filters/Core/vtkGlyph2D.h
@@ -37,7 +37,7 @@ class VTKFILTERSCORE_EXPORT vtkGlyph2D : public vtkGlyph3D
{
public:
vtkTypeMacro(vtkGlyph2D,vtkGlyph3D);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct object with scaling on, scaling mode is by scalar value,
@@ -49,9 +49,9 @@ public:
protected:
vtkGlyph2D() {}
- ~vtkGlyph2D() VTK_OVERRIDE {}
+ ~vtkGlyph2D() override {}
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
private:
vtkGlyph2D(const vtkGlyph2D&) VTK_DELETE_FUNCTION;
diff --git a/Filters/Core/vtkGlyph3D.h b/Filters/Core/vtkGlyph3D.h
index ef55279173334745497be063af19b1fb88e4a2c0..1dd49934f94cee9adc4b96b713c0ac6666da235a 100644
--- a/Filters/Core/vtkGlyph3D.h
+++ b/Filters/Core/vtkGlyph3D.h
@@ -106,7 +106,7 @@ class VTKFILTERSCORE_EXPORT vtkGlyph3D : public vtkPolyDataAlgorithm
{
public:
vtkTypeMacro(vtkGlyph3D,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct object with scaling on, scaling mode is by scalar value,
@@ -306,7 +306,7 @@ public:
/**
* Overridden to include SourceTransform's MTime.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
//@{
/**
@@ -320,11 +320,11 @@ public:
protected:
vtkGlyph3D();
- ~vtkGlyph3D() VTK_OVERRIDE;
+ ~vtkGlyph3D() override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int RequestUpdateExtent(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int, vtkInformation *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int RequestUpdateExtent(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int FillInputPortInformation(int, vtkInformation *) override;
vtkPolyData* GetSource(int idx, vtkInformationVector *sourceInfo);
diff --git a/Filters/Core/vtkGridSynchronizedTemplates3D.h b/Filters/Core/vtkGridSynchronizedTemplates3D.h
index ecc607a8991acdc825ff270be82a1ae185ca6558..be7e7a20bceade9dd3e430702e0583d2014970ca 100644
--- a/Filters/Core/vtkGridSynchronizedTemplates3D.h
+++ b/Filters/Core/vtkGridSynchronizedTemplates3D.h
@@ -41,12 +41,12 @@ class VTKFILTERSCORE_EXPORT vtkGridSynchronizedTemplates3D : public vtkPolyDataA
public:
static vtkGridSynchronizedTemplates3D *New();
vtkTypeMacro(vtkGridSynchronizedTemplates3D,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Because we delegate to vtkContourValues
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
//@{
/**
@@ -171,11 +171,11 @@ public:
protected:
vtkGridSynchronizedTemplates3D();
- ~vtkGridSynchronizedTemplates3D() VTK_OVERRIDE;
+ ~vtkGridSynchronizedTemplates3D() override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int RequestUpdateExtent(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int RequestUpdateExtent(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
int ComputeNormals;
int ComputeGradients;
diff --git a/Filters/Core/vtkHedgeHog.h b/Filters/Core/vtkHedgeHog.h
index 191a0c965d1b055299bb67ef51fe9aeafe652a8e..8c82c9e9fa5c355855bb049adad29b012c03d484 100644
--- a/Filters/Core/vtkHedgeHog.h
+++ b/Filters/Core/vtkHedgeHog.h
@@ -36,7 +36,7 @@ class VTKFILTERSCORE_EXPORT vtkHedgeHog : public vtkPolyDataAlgorithm
public:
static vtkHedgeHog *New();
vtkTypeMacro(vtkHedgeHog,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -69,10 +69,10 @@ public:
protected:
vtkHedgeHog();
- ~vtkHedgeHog() VTK_OVERRIDE {}
+ ~vtkHedgeHog() override {}
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
double ScaleFactor;
int VectorMode; // Orient/scale via normal or via vector data
int OutputPointsPrecision;
diff --git a/Filters/Core/vtkHull.h b/Filters/Core/vtkHull.h
index 1bc9753228dd677c44eb8f71030dfba4bae490e3..d138cd89873cc98412d315af39de53803cd955a2 100644
--- a/Filters/Core/vtkHull.h
+++ b/Filters/Core/vtkHull.h
@@ -54,7 +54,7 @@ class VTKFILTERSCORE_EXPORT vtkHull : public vtkPolyDataAlgorithm
public:
static vtkHull *New();
vtkTypeMacro(vtkHull,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Remove all planes from the current set of planes.
@@ -165,7 +165,7 @@ public:
protected:
vtkHull();
- ~vtkHull() VTK_OVERRIDE;
+ ~vtkHull() override;
// The planes - 4 doubles per plane for A, B, C, D
double *Planes;
@@ -192,7 +192,7 @@ protected:
void CreateInitialPolygon( double *, int, const double * );
// The method that does it all...
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
private:
vtkHull(const vtkHull&) VTK_DELETE_FUNCTION;
void operator=(const vtkHull&) VTK_DELETE_FUNCTION;
diff --git a/Filters/Core/vtkIdFilter.h b/Filters/Core/vtkIdFilter.h
index 7f4f438889cc61948398cfa81bcb06ce93289596..80dda1d96dcfe94956253edb423a1de2360b1c6b 100644
--- a/Filters/Core/vtkIdFilter.h
+++ b/Filters/Core/vtkIdFilter.h
@@ -37,7 +37,7 @@ class VTKFILTERSCORE_EXPORT vtkIdFilter : public vtkDataSetAlgorithm
{
public:
vtkTypeMacro(vtkIdFilter,vtkDataSetAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct object with PointIds and CellIds on; and ids being generated
@@ -85,9 +85,9 @@ public:
protected:
vtkIdFilter();
- ~vtkIdFilter() VTK_OVERRIDE;
+ ~vtkIdFilter() override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
int PointIds;
int CellIds;
diff --git a/Filters/Core/vtkImageAppend.h b/Filters/Core/vtkImageAppend.h
index 040e156ddc088c8ac1cc870670c743ce1a2dadea..ef9931f435632d6538fba345eda0a4f75bec6bb8 100644
--- a/Filters/Core/vtkImageAppend.h
+++ b/Filters/Core/vtkImageAppend.h
@@ -37,7 +37,7 @@ class VTKFILTERSCORE_EXPORT vtkImageAppend : public vtkThreadedImageAlgorithm
public:
static vtkImageAppend *New();
vtkTypeMacro(vtkImageAppend,vtkThreadedImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Replace one of the input connections with a new input. You can
@@ -101,7 +101,7 @@ public:
protected:
vtkImageAppend();
- ~vtkImageAppend() VTK_OVERRIDE;
+ ~vtkImageAppend() override;
int PreserveExtents;
int AppendAxis;
@@ -110,21 +110,21 @@ protected:
int RequestInformation (vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
int RequestUpdateExtent(vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
void ThreadedRequestData (vtkInformation* request,
vtkInformationVector** inputVector,
vtkInformationVector* outputVector,
vtkImageData ***inData, vtkImageData **outData,
- int ext[6], int id) VTK_OVERRIDE;
+ int ext[6], int id) override;
// see vtkAlgorithm for docs.
- int FillInputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
+ int FillInputPortInformation(int, vtkInformation*) override;
void InitOutput(int outExt[6], vtkImageData *outData);
@@ -134,13 +134,13 @@ protected:
// overridden to allocate all of the output arrays, not just active scalars
void AllocateOutputData(vtkImageData *out,
vtkInformation* outInfo,
- int *uExtent) VTK_OVERRIDE;
+ int *uExtent) override;
vtkImageData *AllocateOutputData(vtkDataObject *out,
- vtkInformation* outInfo) VTK_OVERRIDE;
+ vtkInformation* outInfo) override;
// overridden to prevent shallow copies across, since we have to do it elementwise
void CopyAttributeData(vtkImageData *in, vtkImageData *out,
- vtkInformationVector** inputVector) VTK_OVERRIDE;
+ vtkInformationVector** inputVector) override;
private:
diff --git a/Filters/Core/vtkImplicitPolyDataDistance.h b/Filters/Core/vtkImplicitPolyDataDistance.h
index 9b7912c81a4ee35de479745f7a5c60ffd4bdf895..c299d7877c79ff7ca4d5a475017af1cbb686547a 100644
--- a/Filters/Core/vtkImplicitPolyDataDistance.h
+++ b/Filters/Core/vtkImplicitPolyDataDistance.h
@@ -50,23 +50,23 @@ class VTKFILTERSCORE_EXPORT vtkImplicitPolyDataDistance : public vtkImplicitFunc
public:
static vtkImplicitPolyDataDistance *New();
vtkTypeMacro(vtkImplicitPolyDataDistance,vtkImplicitFunction);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Return the MTime also considering the Input dependency.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
/**
* Evaluate plane equation of nearest triangle to point x[3].
*/
using vtkImplicitFunction::EvaluateFunction;
- double EvaluateFunction(double x[3]) VTK_OVERRIDE;
+ double EvaluateFunction(double x[3]) override;
/**
* Evaluate function gradient of nearest triangle to point x[3].
*/
- void EvaluateGradient(double x[3], double g[3]) VTK_OVERRIDE;
+ void EvaluateGradient(double x[3], double g[3]) override;
/**
* Evaluate plane equation of nearest triangle to point x[3] and provides closest point on an input vtkPolyData.
@@ -118,7 +118,7 @@ public:
protected:
vtkImplicitPolyDataDistance();
- ~vtkImplicitPolyDataDistance() VTK_OVERRIDE;
+ ~vtkImplicitPolyDataDistance() override;
/**
* Create default locator. Used to create one when none is specified.
diff --git a/Filters/Core/vtkMarchingCubes.h b/Filters/Core/vtkMarchingCubes.h
index 835855b72c3989f66aba3a0a30f9822e87584db8..b3344379df461306027f8c62641240278413e4d1 100644
--- a/Filters/Core/vtkMarchingCubes.h
+++ b/Filters/Core/vtkMarchingCubes.h
@@ -45,7 +45,7 @@ class VTKFILTERSCORE_EXPORT vtkMarchingCubes : public vtkPolyDataAlgorithm
public:
static vtkMarchingCubes *New();
vtkTypeMacro(vtkMarchingCubes,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
// Methods to set contour values
void SetValue(int i, double value);
@@ -58,7 +58,7 @@ public:
void GenerateValues(int numContours, double rangeStart, double rangeEnd);
// Because we delegate to vtkContourValues
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
//@{
/**
@@ -112,10 +112,10 @@ public:
protected:
vtkMarchingCubes();
- ~vtkMarchingCubes() VTK_OVERRIDE;
+ ~vtkMarchingCubes() override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
vtkContourValues *ContourValues;
int ComputeNormals;
diff --git a/Filters/Core/vtkMarchingSquares.h b/Filters/Core/vtkMarchingSquares.h
index e71e4ecb860c1099061cc36b331bebbcdb60abbb..1911a7432f7b53eb078f3c22a3855a6c88c7008f 100644
--- a/Filters/Core/vtkMarchingSquares.h
+++ b/Filters/Core/vtkMarchingSquares.h
@@ -52,7 +52,7 @@ class VTKFILTERSCORE_EXPORT vtkMarchingSquares : public vtkPolyDataAlgorithm
public:
static vtkMarchingSquares *New();
vtkTypeMacro(vtkMarchingSquares,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -84,7 +84,7 @@ public:
/**
* Because we delegate to vtkContourValues
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
void SetLocator(vtkIncrementalPointLocator *locator);
vtkGetObjectMacro(Locator,vtkIncrementalPointLocator);
@@ -97,10 +97,10 @@ public:
protected:
vtkMarchingSquares();
- ~vtkMarchingSquares() VTK_OVERRIDE;
+ ~vtkMarchingSquares() override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
vtkContourValues *ContourValues;
int ImageRange[6];
diff --git a/Filters/Core/vtkMaskFields.h b/Filters/Core/vtkMaskFields.h
index b1288fb6499a0adf8fcec3b8a77ce87954d76f24..b64a83a9f405e28d093492c005154d759f589efa 100644
--- a/Filters/Core/vtkMaskFields.h
+++ b/Filters/Core/vtkMaskFields.h
@@ -41,7 +41,7 @@ class VTKFILTERSCORE_EXPORT vtkMaskFields : public vtkDataSetAlgorithm
{
public:
vtkTypeMacro(vtkMaskFields,vtkDataSetAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Create a new vtkMaskFields.
@@ -141,9 +141,9 @@ public:
protected:
vtkMaskFields();
- ~vtkMaskFields() VTK_OVERRIDE;
+ ~vtkMaskFields() override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
struct CopyFieldFlag
{
diff --git a/Filters/Core/vtkMaskPoints.h b/Filters/Core/vtkMaskPoints.h
index 5ed4fccd8a00f3dc059709281d450c8dcf696948..3457eb384c2646058ef7d6af012b1ed59d38a53c 100644
--- a/Filters/Core/vtkMaskPoints.h
+++ b/Filters/Core/vtkMaskPoints.h
@@ -39,7 +39,7 @@ class VTKFILTERSCORE_EXPORT vtkMaskPoints : public vtkPolyDataAlgorithm
public:
static vtkMaskPoints *New();
vtkTypeMacro(vtkMaskPoints,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -154,11 +154,11 @@ public:
protected:
vtkMaskPoints();
- ~vtkMaskPoints() VTK_OVERRIDE {}
+ ~vtkMaskPoints() override {}
int RequestData(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ vtkInformationVector *) override;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
int OnRatio; // every OnRatio point is on; all others are off.
vtkIdType Offset; // offset (or starting point id)
diff --git a/Filters/Core/vtkMaskPolyData.h b/Filters/Core/vtkMaskPolyData.h
index 9d9153872d2c5118d76efaaaefcbcacfc8508687..7f9b51eb04e48cd84d69c0bc53d1b903b5e01d38 100644
--- a/Filters/Core/vtkMaskPolyData.h
+++ b/Filters/Core/vtkMaskPolyData.h
@@ -35,7 +35,7 @@ class VTKFILTERSCORE_EXPORT vtkMaskPolyData : public vtkPolyDataAlgorithm
public:
static vtkMaskPolyData *New();
vtkTypeMacro(vtkMaskPolyData,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -55,9 +55,9 @@ public:
protected:
vtkMaskPolyData();
- ~vtkMaskPolyData() VTK_OVERRIDE {}
+ ~vtkMaskPolyData() override {}
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
int OnRatio; // every OnRatio entity is on; all others are off.
vtkIdType Offset; // offset (or starting point id)
diff --git a/Filters/Core/vtkMassProperties.h b/Filters/Core/vtkMassProperties.h
index 7d77b2782d4f0da2caaeee72d912e4181ad0c307..bd4bae5f6714e0479d85e7e31042f39fbe236fd0 100644
--- a/Filters/Core/vtkMassProperties.h
+++ b/Filters/Core/vtkMassProperties.h
@@ -48,7 +48,7 @@ public:
static vtkMassProperties *New();
vtkTypeMacro(vtkMassProperties,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Compute and return the volume.
@@ -105,11 +105,11 @@ public:
protected:
vtkMassProperties();
- ~vtkMassProperties() VTK_OVERRIDE;
+ ~vtkMassProperties() override;
int RequestData(vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
double SurfaceArea;
double MinCellArea;
diff --git a/Filters/Core/vtkMergeDataObjectFilter.h b/Filters/Core/vtkMergeDataObjectFilter.h
index a8f4dd94e22da0b7eb38d81dcbaa66ea483f62f3..f25661048cb30e766b62593cbe530c15be9d4070 100644
--- a/Filters/Core/vtkMergeDataObjectFilter.h
+++ b/Filters/Core/vtkMergeDataObjectFilter.h
@@ -49,7 +49,7 @@ class VTKFILTERSCORE_EXPORT vtkMergeDataObjectFilter : public vtkDataSetAlgorith
public:
static vtkMergeDataObjectFilter *New();
vtkTypeMacro(vtkMergeDataObjectFilter,vtkDataSetAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -75,11 +75,11 @@ public:
protected:
vtkMergeDataObjectFilter();
- ~vtkMergeDataObjectFilter() VTK_OVERRIDE;
+ ~vtkMergeDataObjectFilter() override;
// Usual data generation method
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
int OutputField; // which output field
diff --git a/Filters/Core/vtkMergeFields.h b/Filters/Core/vtkMergeFields.h
index a2059e730f0b12f1fcfdfba4c2cc9554e05c1a0e..1ab9424ffe99758dff609692033686211dd8fd2f 100644
--- a/Filters/Core/vtkMergeFields.h
+++ b/Filters/Core/vtkMergeFields.h
@@ -55,7 +55,7 @@ class VTKFILTERSCORE_EXPORT vtkMergeFields : public vtkDataSetAlgorithm
{
public:
vtkTypeMacro(vtkMergeFields,vtkDataSetAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Create a new vtkMergeFields.
@@ -126,9 +126,9 @@ protected:
};
vtkMergeFields();
- ~vtkMergeFields() VTK_OVERRIDE;
+ ~vtkMergeFields() override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
char* FieldName;
int FieldLocation;
diff --git a/Filters/Core/vtkMergeFilter.h b/Filters/Core/vtkMergeFilter.h
index 6c656a00a3756323ccc1a6d0bef4bb034162e571..ace43ae9bdaf2b8d54387aa33cc38071e36271a2 100644
--- a/Filters/Core/vtkMergeFilter.h
+++ b/Filters/Core/vtkMergeFilter.h
@@ -35,7 +35,7 @@ class VTKFILTERSCORE_EXPORT vtkMergeFilter : public vtkDataSetAlgorithm
public:
static vtkMergeFilter *New();
vtkTypeMacro(vtkMergeFilter,vtkDataSetAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -168,12 +168,12 @@ public:
protected:
vtkMergeFilter();
- ~vtkMergeFilter() VTK_OVERRIDE;
+ ~vtkMergeFilter() override;
// Usual data generation method
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int RequestUpdateExtent(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int RequestUpdateExtent(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
vtkFieldList* FieldList;
private:
diff --git a/Filters/Core/vtkPlaneCutter.h b/Filters/Core/vtkPlaneCutter.h
index e3210a547722a5314edb11f63251e4d8b92bb4aa..f6968de38cb9fdf220e0c4980266c38533239d43 100644
--- a/Filters/Core/vtkPlaneCutter.h
+++ b/Filters/Core/vtkPlaneCutter.h
@@ -82,13 +82,13 @@ public:
*/
static vtkPlaneCutter* New();
vtkTypeMacro(vtkPlaneCutter, vtkDataSetAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
* The modified time depends on the delegated cut plane.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
//@{
/**
@@ -161,11 +161,11 @@ public:
/**
* See vtkAlgorithm for details.
*/
- int ProcessRequest(vtkInformation*, vtkInformationVector**, vtkInformationVector*) VTK_OVERRIDE;
+ int ProcessRequest(vtkInformation*, vtkInformationVector**, vtkInformationVector*) override;
protected:
vtkPlaneCutter();
- ~vtkPlaneCutter() VTK_OVERRIDE;
+ ~vtkPlaneCutter() override;
vtkPlane* Plane;
bool ComputeNormals;
@@ -180,13 +180,13 @@ protected:
// Pipeline-related methods
int RequestDataObject(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
- int RequestData(vtkInformation*, vtkInformationVector**, vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
+ int RequestData(vtkInformation*, vtkInformationVector**, vtkInformationVector*) override;
int RequestUpdateExtent(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
- int FillOutputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ vtkInformationVector*) override;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
+ int FillOutputPortInformation(int port, vtkInformation* info) override;
virtual int ExecuteDataSet(vtkDataSet* input, vtkSphereTree* tree, vtkMultiPieceDataSet* output);
diff --git a/Filters/Core/vtkPointDataToCellData.h b/Filters/Core/vtkPointDataToCellData.h
index daf059628858f40572b706b3e33670cb067bf4ab..4970b44dc400039d1dfe959b491c569c1044c147 100644
--- a/Filters/Core/vtkPointDataToCellData.h
+++ b/Filters/Core/vtkPointDataToCellData.h
@@ -43,7 +43,7 @@ class VTKFILTERSCORE_EXPORT vtkPointDataToCellData : public vtkDataSetAlgorithm
public:
static vtkPointDataToCellData *New();
vtkTypeMacro(vtkPointDataToCellData,vtkDataSetAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -69,11 +69,11 @@ public:
protected:
vtkPointDataToCellData();
- ~vtkPointDataToCellData() VTK_OVERRIDE {}
+ ~vtkPointDataToCellData() override {}
int RequestData(vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
int PassPointData;
int CategoricalData;
diff --git a/Filters/Core/vtkPolyDataConnectivityFilter.h b/Filters/Core/vtkPolyDataConnectivityFilter.h
index 478921cc7a6e4e0eb0fc0886b46146c0df904f87..28ae68b9b288b0a18bf0b874f1cda3adbfc3616b 100644
--- a/Filters/Core/vtkPolyDataConnectivityFilter.h
+++ b/Filters/Core/vtkPolyDataConnectivityFilter.h
@@ -68,7 +68,7 @@ class VTKFILTERSCORE_EXPORT vtkPolyDataConnectivityFilter : public vtkPolyDataAl
{
public:
vtkTypeMacro(vtkPolyDataConnectivityFilter,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -223,10 +223,10 @@ public:
protected:
vtkPolyDataConnectivityFilter();
- ~vtkPolyDataConnectivityFilter() VTK_OVERRIDE;
+ ~vtkPolyDataConnectivityFilter() override;
// Usual data generation method
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
int ColorRegions; //boolean turns on/off scalar gen for separate regions
int ExtractionMode; //how to extract regions
diff --git a/Filters/Core/vtkPolyDataNormals.h b/Filters/Core/vtkPolyDataNormals.h
index 79edbbca9dd0bfe9773432040f9154155db7a9a4..62c4049d6ba2f53d1fd5522f131fd38192be1f3d 100644
--- a/Filters/Core/vtkPolyDataNormals.h
+++ b/Filters/Core/vtkPolyDataNormals.h
@@ -68,7 +68,7 @@ class VTKFILTERSCORE_EXPORT vtkPolyDataNormals : public vtkPolyDataAlgorithm
{
public:
vtkTypeMacro(vtkPolyDataNormals,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct with feature angle=30, splitting and consistency turned on,
@@ -175,10 +175,10 @@ public:
protected:
vtkPolyDataNormals();
- ~vtkPolyDataNormals() VTK_OVERRIDE {}
+ ~vtkPolyDataNormals() override {}
// Usual data generation method
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
double FeatureAngle;
int Splitting;
diff --git a/Filters/Core/vtkProbeFilter.h b/Filters/Core/vtkProbeFilter.h
index 2244748e10c45bf15c9c6de026022be964a8114c..7eee1d6e1655db71808513e568c8cbbc5fb6eddb 100644
--- a/Filters/Core/vtkProbeFilter.h
+++ b/Filters/Core/vtkProbeFilter.h
@@ -53,7 +53,7 @@ class VTKFILTERSCORE_EXPORT vtkProbeFilter : public vtkDataSetAlgorithm
public:
static vtkProbeFilter *New();
vtkTypeMacro(vtkProbeFilter,vtkDataSetAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -172,7 +172,7 @@ public:
protected:
vtkProbeFilter();
- ~vtkProbeFilter() VTK_OVERRIDE;
+ ~vtkProbeFilter() override;
int CategoricalData;
@@ -186,11 +186,11 @@ protected:
bool ComputeTolerance;
int RequestData(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
int RequestInformation(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
int RequestUpdateExtent(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
/**
* Call at end of RequestData() to pass attribute data respecting the
diff --git a/Filters/Core/vtkQuadricClustering.h b/Filters/Core/vtkQuadricClustering.h
index 87d92f5e8b8eda991fec67e1a48d56551e6a3ed9..91791c737072639706eb905c757cb65e8df118dd 100644
--- a/Filters/Core/vtkQuadricClustering.h
+++ b/Filters/Core/vtkQuadricClustering.h
@@ -102,7 +102,7 @@ public:
* Standard instantition, type and print methods.
*/
vtkTypeMacro(vtkQuadricClustering, vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkQuadricClustering *New();
//@}
@@ -257,10 +257,10 @@ public:
protected:
vtkQuadricClustering();
- ~vtkQuadricClustering() VTK_OVERRIDE;
+ ~vtkQuadricClustering() override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int, vtkInformation *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int FillInputPortInformation(int, vtkInformation *) override;
/**
* Given a point, determine what bin it falls into.
diff --git a/Filters/Core/vtkQuadricDecimation.h b/Filters/Core/vtkQuadricDecimation.h
index ad2d3f99fe6b33b8302c1391e4d58be2b9601aa0..e90f7e58e1049763823971fb1a4a21e2db273973 100644
--- a/Filters/Core/vtkQuadricDecimation.h
+++ b/Filters/Core/vtkQuadricDecimation.h
@@ -69,7 +69,7 @@ class VTKFILTERSCORE_EXPORT vtkQuadricDecimation : public vtkPolyDataAlgorithm
{
public:
vtkTypeMacro(vtkQuadricDecimation, vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkQuadricDecimation *New();
//@{
@@ -158,9 +158,9 @@ public:
protected:
vtkQuadricDecimation();
- ~vtkQuadricDecimation() VTK_OVERRIDE;
+ ~vtkQuadricDecimation() override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
/**
* Do the dirty work of eliminating the edge; return the number of
diff --git a/Filters/Core/vtkRearrangeFields.h b/Filters/Core/vtkRearrangeFields.h
index a168df107df29e00822001c36d75bc5764bb2dcb..b9d9d8cc566453adc1bc1de277d563fae0741d1c 100644
--- a/Filters/Core/vtkRearrangeFields.h
+++ b/Filters/Core/vtkRearrangeFields.h
@@ -69,7 +69,7 @@ class VTKFILTERSCORE_EXPORT vtkRearrangeFields : public vtkDataSetAlgorithm
{
public:
vtkTypeMacro(vtkRearrangeFields,vtkDataSetAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Create a new vtkRearrangeFields with an empty operation list.
@@ -168,9 +168,9 @@ public:
protected:
vtkRearrangeFields();
- ~vtkRearrangeFields() VTK_OVERRIDE;
+ ~vtkRearrangeFields() override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
// Operations are stored as a linked list.
diff --git a/Filters/Core/vtkRectilinearSynchronizedTemplates.h b/Filters/Core/vtkRectilinearSynchronizedTemplates.h
index 22d1920283fcb7f7dfa0df7e9efa5b9784950668..b9428e1bc793655e886b1269ed965eb8d9ff0b1b 100644
--- a/Filters/Core/vtkRectilinearSynchronizedTemplates.h
+++ b/Filters/Core/vtkRectilinearSynchronizedTemplates.h
@@ -44,12 +44,12 @@ public:
static vtkRectilinearSynchronizedTemplates *New();
vtkTypeMacro(vtkRectilinearSynchronizedTemplates,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Because we delegate to vtkContourValues
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
//@{
/**
@@ -166,7 +166,7 @@ public:
protected:
vtkRectilinearSynchronizedTemplates();
- ~vtkRectilinearSynchronizedTemplates() VTK_OVERRIDE;
+ ~vtkRectilinearSynchronizedTemplates() override;
int ComputeNormals;
int ComputeGradients;
@@ -175,9 +175,9 @@ protected:
vtkContourValues *ContourValues;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int RequestUpdateExtent(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int RequestUpdateExtent(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
int ArrayComponent;
diff --git a/Filters/Core/vtkResampleToImage.h b/Filters/Core/vtkResampleToImage.h
index 623ba16f99c875abe72d09cd347a34cb18ae40a3..e4d9b6c3e996efdf2c82b207838492210b4b36dd 100644
--- a/Filters/Core/vtkResampleToImage.h
+++ b/Filters/Core/vtkResampleToImage.h
@@ -38,7 +38,7 @@ class VTKFILTERSCORE_EXPORT vtkResampleToImage : public vtkAlgorithm
{
public:
vtkTypeMacro(vtkResampleToImage, vtkAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkResampleToImage *New();
@@ -76,19 +76,19 @@ public:
protected:
vtkResampleToImage();
- ~vtkResampleToImage() VTK_OVERRIDE;
+ ~vtkResampleToImage() override;
// Usual data generation method
int ProcessRequest(vtkInformation*, vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
virtual int RequestData(vtkInformation *, vtkInformationVector **,
vtkInformationVector *);
virtual int RequestInformation(vtkInformation *, vtkInformationVector **,
vtkInformationVector *);
virtual int RequestUpdateExtent(vtkInformation *, vtkInformationVector **,
vtkInformationVector *);
- int FillInputPortInformation(int, vtkInformation *) VTK_OVERRIDE;
- int FillOutputPortInformation(int, vtkInformation *) VTK_OVERRIDE;
+ int FillInputPortInformation(int, vtkInformation *) override;
+ int FillOutputPortInformation(int, vtkInformation *) override;
/**
* Get the name of the valid-points mask array.
diff --git a/Filters/Core/vtkResampleWithDataSet.h b/Filters/Core/vtkResampleWithDataSet.h
index 6338f3d044314a81da6795d3f6cbfe7ebdd0cc8e..a76ae4b4d715be84b92eca1b778f1319ad936e5f 100644
--- a/Filters/Core/vtkResampleWithDataSet.h
+++ b/Filters/Core/vtkResampleWithDataSet.h
@@ -42,7 +42,7 @@ class VTKFILTERSCORE_EXPORT vtkResampleWithDataSet : public vtkPassInputTypeAlgo
{
public:
vtkTypeMacro(vtkResampleWithDataSet, vtkPassInputTypeAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkResampleWithDataSet *New();
@@ -133,21 +133,21 @@ public:
vtkBooleanMacro(MarkBlankPointsAndCells, bool);
//@}
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
protected:
vtkResampleWithDataSet();
- ~vtkResampleWithDataSet() VTK_OVERRIDE;
+ ~vtkResampleWithDataSet() override;
// Usual data generation method
int RequestData(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
int RequestInformation(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
int RequestUpdateExtent(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int, vtkInformation *) VTK_OVERRIDE;
- int FillOutputPortInformation(int, vtkInformation *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
+ int FillInputPortInformation(int, vtkInformation *) override;
+ int FillOutputPortInformation(int, vtkInformation *) override;
/**
* Get the name of the valid-points mask array.
diff --git a/Filters/Core/vtkReverseSense.h b/Filters/Core/vtkReverseSense.h
index dda7459c8dfc8c2a376b71742d156867da9b1b34..b3e5c8c4f57ac7f04977afccabdd238b1430423e 100644
--- a/Filters/Core/vtkReverseSense.h
+++ b/Filters/Core/vtkReverseSense.h
@@ -38,7 +38,7 @@ class VTKFILTERSCORE_EXPORT vtkReverseSense : public vtkPolyDataAlgorithm
{
public:
vtkTypeMacro(vtkReverseSense,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct object so that behavior is to reverse cell ordering and
@@ -67,10 +67,10 @@ public:
protected:
vtkReverseSense();
- ~vtkReverseSense() VTK_OVERRIDE {}
+ ~vtkReverseSense() override {}
// Usual data generation method
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
int ReverseCells;
int ReverseNormals;
diff --git a/Filters/Core/vtkSimpleElevationFilter.h b/Filters/Core/vtkSimpleElevationFilter.h
index 23df9fdee84dccd9abdd604733eddf8e316e9c91..0cc876eb3553b98689f7f79697fd453d3ea468f6 100644
--- a/Filters/Core/vtkSimpleElevationFilter.h
+++ b/Filters/Core/vtkSimpleElevationFilter.h
@@ -47,7 +47,7 @@ class VTKFILTERSCORE_EXPORT vtkSimpleElevationFilter : public vtkDataSetAlgorith
{
public:
vtkTypeMacro(vtkSimpleElevationFilter,vtkDataSetAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct object with Vector=(0,0,1).
@@ -64,9 +64,9 @@ public:
protected:
vtkSimpleElevationFilter();
- ~vtkSimpleElevationFilter() VTK_OVERRIDE {}
+ ~vtkSimpleElevationFilter() override {}
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
double Vector[3];
private:
vtkSimpleElevationFilter(const vtkSimpleElevationFilter&) VTK_DELETE_FUNCTION;
diff --git a/Filters/Core/vtkSmoothPolyDataFilter.h b/Filters/Core/vtkSmoothPolyDataFilter.h
index d31f1d96c5603322594ed882dda8d8155575460a..77ca2b8d59205c0d2c0c36ca568ddf92326eaaa9 100644
--- a/Filters/Core/vtkSmoothPolyDataFilter.h
+++ b/Filters/Core/vtkSmoothPolyDataFilter.h
@@ -102,7 +102,7 @@ class VTKFILTERSCORE_EXPORT vtkSmoothPolyDataFilter : public vtkPolyDataAlgorith
{
public:
vtkTypeMacro(vtkSmoothPolyDataFilter,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct object with number of iterations 20; relaxation factor .01;
@@ -217,10 +217,10 @@ public:
protected:
vtkSmoothPolyDataFilter();
- ~vtkSmoothPolyDataFilter() VTK_OVERRIDE {}
+ ~vtkSmoothPolyDataFilter() override {}
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
double Convergence;
int NumberOfIterations;
diff --git a/Filters/Core/vtkSphereTreeFilter.h b/Filters/Core/vtkSphereTreeFilter.h
index 17f94e277340ec5b087fc5016690501e16758f78..5274510b09b74c4c549212ef7c284531197c5401 100644
--- a/Filters/Core/vtkSphereTreeFilter.h
+++ b/Filters/Core/vtkSphereTreeFilter.h
@@ -65,7 +65,7 @@ public:
* Standard type related macros and PrintSelf() method.
*/
vtkTypeMacro(vtkSphereTreeFilter,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -152,11 +152,11 @@ public:
/**
* Modified GetMTime because the sphere tree may have changed.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
protected:
vtkSphereTreeFilter();
- ~vtkSphereTreeFilter() VTK_OVERRIDE;
+ ~vtkSphereTreeFilter() override;
vtkSphereTree *SphereTree;
bool TreeHierarchy;
@@ -167,9 +167,9 @@ protected:
double Normal[3];
int RequestData(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
int FillInputPortInformation(int port,
- vtkInformation *info) VTK_OVERRIDE;
+ vtkInformation *info) override;
private:
vtkSphereTreeFilter(const vtkSphereTreeFilter&) VTK_DELETE_FUNCTION;
diff --git a/Filters/Core/vtkStreamerBase.h b/Filters/Core/vtkStreamerBase.h
index 01f6d2aeb85c65ca18f02f4b790db123743366bb..768f0864b868f34270a91a842f5ddba806bd4e97 100644
--- a/Filters/Core/vtkStreamerBase.h
+++ b/Filters/Core/vtkStreamerBase.h
@@ -40,18 +40,18 @@ class VTKFILTERSCORE_EXPORT vtkStreamerBase : public vtkAlgorithm
{
public:
vtkTypeMacro(vtkStreamerBase, vtkAlgorithm);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
/**
* see vtkAlgorithm for details
*/
int ProcessRequest(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
protected:
vtkStreamerBase();
- ~vtkStreamerBase() VTK_OVERRIDE;
+ ~vtkStreamerBase() override;
virtual int RequestInformation(vtkInformation*,
vtkInformationVector**,
diff --git a/Filters/Core/vtkStreamingTessellator.h b/Filters/Core/vtkStreamingTessellator.h
index fedcf754a9c55abc7f32b476a053c1c8c92b88cd..4b1d88484f173bb69d74fb5499d6729b5cacd2dd 100644
--- a/Filters/Core/vtkStreamingTessellator.h
+++ b/Filters/Core/vtkStreamingTessellator.h
@@ -87,7 +87,7 @@ class VTKFILTERSCORE_EXPORT vtkStreamingTessellator : public vtkObject
public:
vtkTypeMacro(vtkStreamingTessellator,vtkObject);
static vtkStreamingTessellator* New();
- void PrintSelf( ostream& os, vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf( ostream& os, vtkIndent indent ) override;
typedef void (*VertexProcessorFunction)( const double*, vtkEdgeSubdivisionCriterion*, void*, const void* );
typedef void (*EdgeProcessorFunction)( const double*, const double*, vtkEdgeSubdivisionCriterion*, void*, const void* );
@@ -332,7 +332,7 @@ class VTKFILTERSCORE_EXPORT vtkStreamingTessellator : public vtkObject
int MaximumNumberOfSubdivisions;
vtkStreamingTessellator();
- ~vtkStreamingTessellator() VTK_OVERRIDE;
+ ~vtkStreamingTessellator() override;
void AdaptivelySample3Facet( double* v0, double* v1, double* v2, double* v3, int maxDepth ) const ;
void AdaptivelySample2Facet( double* v0, double* v1, double* v2, int maxDepth, int move=7 ) const ;
diff --git a/Filters/Core/vtkStripper.h b/Filters/Core/vtkStripper.h
index fa2e9e214c58420c39676dae227ffd5be4ffc345..580e4ccab4a8ff50bd4aca8882001c2c0d45146e 100644
--- a/Filters/Core/vtkStripper.h
+++ b/Filters/Core/vtkStripper.h
@@ -64,7 +64,7 @@ class VTKFILTERSCORE_EXPORT vtkStripper : public vtkPolyDataAlgorithm
{
public:
vtkTypeMacro(vtkStripper,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct object with MaximumLength set to 1000.
@@ -127,10 +127,10 @@ public:
protected:
vtkStripper();
- ~vtkStripper() VTK_OVERRIDE {}
+ ~vtkStripper() override {}
// Usual data generation method
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
int MaximumLength;
int PassCellDataAsFieldData;
diff --git a/Filters/Core/vtkStructuredGridAppend.h b/Filters/Core/vtkStructuredGridAppend.h
index 59309cabfcd50df7a6b0b0d7e6907d9481c73831..6c471b52a129687e9d0b309b42ef1813ca15e4cf 100644
--- a/Filters/Core/vtkStructuredGridAppend.h
+++ b/Filters/Core/vtkStructuredGridAppend.h
@@ -32,7 +32,7 @@ class VTKFILTERSCORE_EXPORT vtkStructuredGridAppend : public vtkStructuredGridAl
public:
static vtkStructuredGridAppend *New();
vtkTypeMacro(vtkStructuredGridAppend,vtkStructuredGridAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Replace one of the input connections with a new input. You can
@@ -71,22 +71,22 @@ class VTKFILTERSCORE_EXPORT vtkStructuredGridAppend : public vtkStructuredGridAl
protected:
vtkStructuredGridAppend();
- ~vtkStructuredGridAppend() VTK_OVERRIDE;
+ ~vtkStructuredGridAppend() override;
int RequestInformation (vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
int RequestUpdateExtent(vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
int RequestData(vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
// see vtkAlgorithm for docs.
- int FillInputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
+ int FillInputPortInformation(int, vtkInformation*) override;
private:
vtkStructuredGridAppend(const vtkStructuredGridAppend&) VTK_DELETE_FUNCTION;
diff --git a/Filters/Core/vtkStructuredGridOutlineFilter.h b/Filters/Core/vtkStructuredGridOutlineFilter.h
index 5b4a8f3dc95b5ed56054b9e206723ca9942fdca9..5af9cef13540e3a49cd6ce35de7a8dd4c5b62e02 100644
--- a/Filters/Core/vtkStructuredGridOutlineFilter.h
+++ b/Filters/Core/vtkStructuredGridOutlineFilter.h
@@ -35,10 +35,10 @@ public:
protected:
vtkStructuredGridOutlineFilter() {}
- ~vtkStructuredGridOutlineFilter() VTK_OVERRIDE {}
+ ~vtkStructuredGridOutlineFilter() override {}
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
private:
vtkStructuredGridOutlineFilter(const vtkStructuredGridOutlineFilter&) VTK_DELETE_FUNCTION;
diff --git a/Filters/Core/vtkSynchronizedTemplates2D.h b/Filters/Core/vtkSynchronizedTemplates2D.h
index b51ad5308cdfa08abf62e85d4498274531b3c8e5..f8a7c03921bca8e4494db1d8ac02b1060959066e 100644
--- a/Filters/Core/vtkSynchronizedTemplates2D.h
+++ b/Filters/Core/vtkSynchronizedTemplates2D.h
@@ -42,12 +42,12 @@ class VTKFILTERSCORE_EXPORT vtkSynchronizedTemplates2D : public vtkPolyDataAlgor
public:
static vtkSynchronizedTemplates2D *New();
vtkTypeMacro(vtkSynchronizedTemplates2D,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Because we delegate to vtkContourValues
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
/**
* Set a particular contour value at contour number i. The index i ranges
@@ -122,10 +122,10 @@ public:
protected:
vtkSynchronizedTemplates2D();
- ~vtkSynchronizedTemplates2D() VTK_OVERRIDE;
+ ~vtkSynchronizedTemplates2D() override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
vtkContourValues *ContourValues;
int ComputeScalars;
diff --git a/Filters/Core/vtkSynchronizedTemplates3D.h b/Filters/Core/vtkSynchronizedTemplates3D.h
index 5229efa50a2f0bb5491240594c6adb070b465368..9cf279b239af252af7765bc2c7cfe00de94cf0e1 100644
--- a/Filters/Core/vtkSynchronizedTemplates3D.h
+++ b/Filters/Core/vtkSynchronizedTemplates3D.h
@@ -43,12 +43,12 @@ public:
static vtkSynchronizedTemplates3D *New();
vtkTypeMacro(vtkSynchronizedTemplates3D,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Because we delegate to vtkContourValues
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
//@{
/**
@@ -173,16 +173,16 @@ public:
protected:
vtkSynchronizedTemplates3D();
- ~vtkSynchronizedTemplates3D() VTK_OVERRIDE;
+ ~vtkSynchronizedTemplates3D() override;
int ComputeNormals;
int ComputeGradients;
int ComputeScalars;
vtkContourValues *ContourValues;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int RequestUpdateExtent(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int RequestUpdateExtent(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
int ArrayComponent;
diff --git a/Filters/Core/vtkSynchronizedTemplatesCutter3D.h b/Filters/Core/vtkSynchronizedTemplatesCutter3D.h
index 128c1f0493864bcad11da9a8d568fae4d6ef2860..edc862a1d35995e373fe761cb778dd926f53151f 100644
--- a/Filters/Core/vtkSynchronizedTemplatesCutter3D.h
+++ b/Filters/Core/vtkSynchronizedTemplatesCutter3D.h
@@ -39,7 +39,7 @@ public:
static vtkSynchronizedTemplatesCutter3D *New();
vtkTypeMacro(vtkSynchronizedTemplatesCutter3D,vtkSynchronizedTemplates3D);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Needed by templated functions.
@@ -66,14 +66,14 @@ public:
protected:
vtkSynchronizedTemplatesCutter3D();
- ~vtkSynchronizedTemplatesCutter3D() VTK_OVERRIDE;
+ ~vtkSynchronizedTemplatesCutter3D() override;
vtkImplicitFunction *CutFunction;
int OutputPointsPrecision;
int RequestData(vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
private:
vtkSynchronizedTemplatesCutter3D(const vtkSynchronizedTemplatesCutter3D&) VTK_DELETE_FUNCTION;
diff --git a/Filters/Core/vtkTensorGlyph.h b/Filters/Core/vtkTensorGlyph.h
index b96b362ded1b7e09dc823ed6cbdd2a12c0f09b63..4e68bc1cae38929476b704765d1b077276723e3b 100644
--- a/Filters/Core/vtkTensorGlyph.h
+++ b/Filters/Core/vtkTensorGlyph.h
@@ -86,7 +86,7 @@ class VTKFILTERSCORE_EXPORT vtkTensorGlyph : public vtkPolyDataAlgorithm
{
public:
vtkTypeMacro(vtkTensorGlyph,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct object with scaling on and scale factor 1.0. Eigenvalues are
@@ -233,11 +233,11 @@ public:
protected:
vtkTensorGlyph();
- ~vtkTensorGlyph() VTK_OVERRIDE;
+ ~vtkTensorGlyph() override;
- int RequestUpdateExtent(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int RequestUpdateExtent(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
int Scaling; // Determine whether scaling of geometry is performed
double ScaleFactor; // Scale factor to use to scale geometry
diff --git a/Filters/Core/vtkThreshold.h b/Filters/Core/vtkThreshold.h
index c72b7cdf12aa4a1b6dd7be350a3c9d4872ed010f..1cbfc67e969fd839979db3cec677d5a778b5ca8b 100644
--- a/Filters/Core/vtkThreshold.h
+++ b/Filters/Core/vtkThreshold.h
@@ -57,7 +57,7 @@ class VTKFILTERSCORE_EXPORT vtkThreshold : public vtkUnstructuredGridAlgorithm
public:
static vtkThreshold *New();
vtkTypeMacro(vtkThreshold,vtkUnstructuredGridAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Criterion is cells whose scalars are less or equal to lower threshold.
@@ -185,12 +185,12 @@ public:
protected:
vtkThreshold();
- ~vtkThreshold() VTK_OVERRIDE;
+ ~vtkThreshold() override;
// Usual data generation method
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
int AllScalars;
diff --git a/Filters/Core/vtkThresholdPoints.h b/Filters/Core/vtkThresholdPoints.h
index 9c43919c195dbb02986234f248d170c8324c0a01..b71aa64e491914133d76ef308565918c142b8eb5 100644
--- a/Filters/Core/vtkThresholdPoints.h
+++ b/Filters/Core/vtkThresholdPoints.h
@@ -35,7 +35,7 @@ class VTKFILTERSCORE_EXPORT vtkThresholdPoints : public vtkPolyDataAlgorithm
public:
static vtkThresholdPoints *New();
vtkTypeMacro(vtkThresholdPoints,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Criterion is cells whose scalars are less or equal to lower threshold.
@@ -81,12 +81,12 @@ public:
protected:
vtkThresholdPoints();
- ~vtkThresholdPoints() VTK_OVERRIDE {}
+ ~vtkThresholdPoints() override {}
// Usual data generation method
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
double LowerThreshold;
double UpperThreshold;
diff --git a/Filters/Core/vtkTransposeTable.h b/Filters/Core/vtkTransposeTable.h
index 458930ddc4659db5c9ea1ae93f7943f95af59b6c..61265871b0a7cc9f717f51d02c277b1a40f807e9 100644
--- a/Filters/Core/vtkTransposeTable.h
+++ b/Filters/Core/vtkTransposeTable.h
@@ -38,7 +38,7 @@ class VTKFILTERSCORE_EXPORT vtkTransposeTable : public vtkTableAlgorithm
public:
static vtkTransposeTable* New();
vtkTypeMacro(vtkTransposeTable, vtkTableAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -73,11 +73,11 @@ public:
protected:
vtkTransposeTable();
- ~vtkTransposeTable() VTK_OVERRIDE;
+ ~vtkTransposeTable() override;
int RequestData(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
bool AddIdColumn;
bool UseIdColumn;
diff --git a/Filters/Core/vtkTriangleFilter.h b/Filters/Core/vtkTriangleFilter.h
index 7fdaed4c3ec4436b9585f92d491d7ccde9c9a1ba..3a8ed673ac5d009b6853b72f84a2edc75063d90b 100644
--- a/Filters/Core/vtkTriangleFilter.h
+++ b/Filters/Core/vtkTriangleFilter.h
@@ -33,7 +33,7 @@ class VTKFILTERSCORE_EXPORT vtkTriangleFilter : public vtkPolyDataAlgorithm
public:
static vtkTriangleFilter *New();
vtkTypeMacro(vtkTriangleFilter,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -61,10 +61,10 @@ public:
protected:
vtkTriangleFilter() : PassVerts(1), PassLines(1) {}
- ~vtkTriangleFilter() VTK_OVERRIDE {}
+ ~vtkTriangleFilter() override {}
// Usual data generation method
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
int PassVerts;
int PassLines;
diff --git a/Filters/Core/vtkTriangleMeshPointNormals.h b/Filters/Core/vtkTriangleMeshPointNormals.h
index c9a2f17ff0fec1f104cd2d59759c4401ef4ba098..d0af8f652049878624f0c59ccc8654973bcb0b29 100644
--- a/Filters/Core/vtkTriangleMeshPointNormals.h
+++ b/Filters/Core/vtkTriangleMeshPointNormals.h
@@ -73,16 +73,16 @@ class VTKFILTERSCORE_EXPORT vtkTriangleMeshPointNormals : public vtkPolyDataAlgo
{
public:
vtkTypeMacro(vtkTriangleMeshPointNormals,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkTriangleMeshPointNormals *New();
protected:
vtkTriangleMeshPointNormals() {}
- ~vtkTriangleMeshPointNormals() VTK_OVERRIDE {}
+ ~vtkTriangleMeshPointNormals() override {}
// Usual data generation method
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
private:
vtkTriangleMeshPointNormals(const vtkTriangleMeshPointNormals&) VTK_DELETE_FUNCTION;
diff --git a/Filters/Core/vtkTubeFilter.h b/Filters/Core/vtkTubeFilter.h
index 22ee45f604dc31cbda0b326751aa90224d3b23f9..97c220e4e515eac697ab468a7bec15a8a64aa0aa 100644
--- a/Filters/Core/vtkTubeFilter.h
+++ b/Filters/Core/vtkTubeFilter.h
@@ -78,7 +78,7 @@ class VTKFILTERSCORE_EXPORT vtkTubeFilter : public vtkPolyDataAlgorithm
{
public:
vtkTypeMacro(vtkTubeFilter,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct object with radius 0.5, radius variation turned off, the
@@ -231,10 +231,10 @@ public:
protected:
vtkTubeFilter();
- ~vtkTubeFilter() VTK_OVERRIDE {}
+ ~vtkTubeFilter() override {}
// Usual data generation method
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
double Radius; //minimum radius of tube
int VaryRadius; //controls radius variation
diff --git a/Filters/Core/vtkUnstructuredGridQuadricDecimation.h b/Filters/Core/vtkUnstructuredGridQuadricDecimation.h
index 1c16c3f1dc2db54230e077ece22b9b65c4b694b3..2d5c2ec6b785529c57d7f5d39d40393f42a59643 100644
--- a/Filters/Core/vtkUnstructuredGridQuadricDecimation.h
+++ b/Filters/Core/vtkUnstructuredGridQuadricDecimation.h
@@ -69,7 +69,7 @@ class VTKFILTERSCORE_EXPORT vtkUnstructuredGridQuadricDecimation : public vtkUns
{
public:
vtkTypeMacro(vtkUnstructuredGridQuadricDecimation, vtkUnstructuredGridAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkUnstructuredGridQuadricDecimation *New();
// The following 3 parameters will control the process of simplification in
@@ -164,10 +164,10 @@ public:
protected:
vtkUnstructuredGridQuadricDecimation();
- ~vtkUnstructuredGridQuadricDecimation() VTK_OVERRIDE;
+ ~vtkUnstructuredGridQuadricDecimation() override;
void ReportError(int err);
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
int NumberOfTetsOutput;
int NumberOfEdgesToDecimate;
diff --git a/Filters/Core/vtkVectorDot.h b/Filters/Core/vtkVectorDot.h
index 2c01687e280dc7a289c3122e88cee25aa742d71d..c35e6cfb34db73561ca676312e8bd5e2c17eaf8e 100644
--- a/Filters/Core/vtkVectorDot.h
+++ b/Filters/Core/vtkVectorDot.h
@@ -42,7 +42,7 @@ class VTKFILTERSCORE_EXPORT vtkVectorDot : public vtkDataSetAlgorithm
{
public:
vtkTypeMacro(vtkVectorDot,vtkDataSetAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct object with scalar range (-1,1).
@@ -81,13 +81,13 @@ public:
protected:
vtkVectorDot();
- ~vtkVectorDot() VTK_OVERRIDE {}
+ ~vtkVectorDot() override {}
int MapScalars;
double ScalarRange[2];
double ActualRange[2];
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
private:
vtkVectorDot(const vtkVectorDot&) VTK_DELETE_FUNCTION;
diff --git a/Filters/Core/vtkVectorNorm.h b/Filters/Core/vtkVectorNorm.h
index 1839258ae2745a491cacd606c91c29eb40fb3444..02f2bb202fdd179eacaf289d0b8996086b8553c9 100644
--- a/Filters/Core/vtkVectorNorm.h
+++ b/Filters/Core/vtkVectorNorm.h
@@ -49,7 +49,7 @@ class VTKFILTERSCORE_EXPORT vtkVectorNorm : public vtkDataSetAlgorithm
{
public:
vtkTypeMacro(vtkVectorNorm,vtkDataSetAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct with normalize flag off.
@@ -86,9 +86,9 @@ public:
protected:
vtkVectorNorm();
- ~vtkVectorNorm() VTK_OVERRIDE {}
+ ~vtkVectorNorm() override {}
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
int Normalize; // normalize 0<=n<=1 if true.
int AttributeMode; //control whether to use point or cell data, or both
diff --git a/Filters/Core/vtkWindowedSincPolyDataFilter.h b/Filters/Core/vtkWindowedSincPolyDataFilter.h
index c1bab53f13b8672783fd12b3c596e0aa68528415..0c4f8cb643cb29017aa4f888a74cbaa120d8dbe6 100644
--- a/Filters/Core/vtkWindowedSincPolyDataFilter.h
+++ b/Filters/Core/vtkWindowedSincPolyDataFilter.h
@@ -146,7 +146,7 @@ class VTKFILTERSCORE_EXPORT vtkWindowedSincPolyDataFilter : public vtkPolyDataAl
{
public:
vtkTypeMacro(vtkWindowedSincPolyDataFilter,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct object with number of iterations 20; passband .1;
@@ -253,9 +253,9 @@ public:
protected:
vtkWindowedSincPolyDataFilter();
- ~vtkWindowedSincPolyDataFilter() VTK_OVERRIDE {}
+ ~vtkWindowedSincPolyDataFilter() override {}
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
int NumberOfIterations;
double PassBand;
diff --git a/Filters/Extraction/vtkConvertSelection.h b/Filters/Extraction/vtkConvertSelection.h
index 3470c3b454da35af9b479e8fc8e781ab03e79e86..58a35fe77af1b7d867829359fed969b6daea9b98 100644
--- a/Filters/Extraction/vtkConvertSelection.h
+++ b/Filters/Extraction/vtkConvertSelection.h
@@ -50,7 +50,7 @@ class VTKFILTERSEXTRACTION_EXPORT vtkConvertSelection : public vtkSelectionAlgor
public:
static vtkConvertSelection *New();
vtkTypeMacro(vtkConvertSelection, vtkSelectionAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* A convenience method for setting the second input (i.e. the data object).
@@ -208,12 +208,12 @@ public:
protected:
vtkConvertSelection();
- ~vtkConvertSelection() VTK_OVERRIDE;
+ ~vtkConvertSelection() override;
int RequestData(
vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
int Convert(
vtkSelection* input,
@@ -239,7 +239,7 @@ protected:
vtkSelection* input, vtkCompositeDataSet* data, vtkSelection* output);
int FillInputPortInformation(
- int port, vtkInformation* info) VTK_OVERRIDE;
+ int port, vtkInformation* info) override;
int OutputType;
int InputFieldType;
diff --git a/Filters/Extraction/vtkExtractArraysOverTime.h b/Filters/Extraction/vtkExtractArraysOverTime.h
index b9d34ee202c910b705ec1e0d96ef82000e8c1ef0..272ddd68b0acb6e46c8414c31dceb37c99de5d9a 100644
--- a/Filters/Extraction/vtkExtractArraysOverTime.h
+++ b/Filters/Extraction/vtkExtractArraysOverTime.h
@@ -50,7 +50,7 @@ class VTKFILTERSEXTRACTION_EXPORT vtkExtractArraysOverTime : public vtkMultiBloc
public:
static vtkExtractArraysOverTime *New();
vtkTypeMacro(vtkExtractArraysOverTime, vtkMultiBlockDataSetAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -101,17 +101,17 @@ public:
protected:
vtkExtractArraysOverTime();
- ~vtkExtractArraysOverTime() VTK_OVERRIDE;
+ ~vtkExtractArraysOverTime() override;
int RequestInformation(vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
int RequestUpdateExtent(vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
int RequestData(vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
virtual void PostExecute(vtkInformation* request,
vtkInformationVector** inputVector,
@@ -128,7 +128,7 @@ protected:
*/
int DetermineSelectionType(vtkSelection*);
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
void ExecuteAtTimeStep(vtkInformationVector** inputV,
vtkInformation* outInfo);
diff --git a/Filters/Extraction/vtkExtractBlock.h b/Filters/Extraction/vtkExtractBlock.h
index 7ddc6005f95423b90e0f3a6ec3e30a7177e49c72..46b1f220db08f659c68a111ac4a88580910bc5b4 100644
--- a/Filters/Extraction/vtkExtractBlock.h
+++ b/Filters/Extraction/vtkExtractBlock.h
@@ -38,7 +38,7 @@ class VTKFILTERSEXTRACTION_EXPORT vtkExtractBlock : public vtkMultiBlockDataSetA
public:
static vtkExtractBlock* New();
vtkTypeMacro(vtkExtractBlock, vtkMultiBlockDataSetAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -78,7 +78,7 @@ public:
protected:
vtkExtractBlock();
- ~vtkExtractBlock() VTK_OVERRIDE;
+ ~vtkExtractBlock() override;
/**
* Internal key, used to avoid pruning of a branch.
@@ -88,7 +88,7 @@ protected:
/// Implementation of the algorithm.
int RequestData(vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
/// Extract subtree
diff --git a/Filters/Extraction/vtkExtractCells.h b/Filters/Extraction/vtkExtractCells.h
index 54343cad54109131f469366dabb99eef63d6180e..81434e62fd738c96e03ec30f7e808369f23a7c47 100644
--- a/Filters/Extraction/vtkExtractCells.h
+++ b/Filters/Extraction/vtkExtractCells.h
@@ -41,7 +41,7 @@ class VTKFILTERSEXTRACTION_EXPORT vtkExtractCells : public vtkUnstructuredGridAl
{
public:
vtkTypeMacro(vtkExtractCells, vtkUnstructuredGridAlgorithm);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
static vtkExtractCells *New();
@@ -69,11 +69,11 @@ public:
protected:
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
vtkExtractCells();
- ~vtkExtractCells() VTK_OVERRIDE;
+ ~vtkExtractCells() override;
private:
diff --git a/Filters/Extraction/vtkExtractDataOverTime.h b/Filters/Extraction/vtkExtractDataOverTime.h
index 5028c7c44438992fa652135876aed8227aaed1e7..f385e77d1c882e766e1908f300f2437584640b9d 100644
--- a/Filters/Extraction/vtkExtractDataOverTime.h
+++ b/Filters/Extraction/vtkExtractDataOverTime.h
@@ -36,7 +36,7 @@ class VTKFILTERSEXTRACTION_EXPORT vtkExtractDataOverTime : public vtkPointSetAlg
public:
static vtkExtractDataOverTime *New();
vtkTypeMacro(vtkExtractDataOverTime,vtkPointSetAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -55,14 +55,14 @@ public:
protected:
vtkExtractDataOverTime();
- ~vtkExtractDataOverTime()VTK_OVERRIDE {}
+ ~vtkExtractDataOverTime() override {}
int RequestInformation( vtkInformation *request,
vtkInformationVector **inputVector, vtkInformationVector *outputVector);
int ProcessRequest(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
int AllocateOutputData(vtkPointSet *input, vtkPointSet *output);
diff --git a/Filters/Extraction/vtkExtractDataSets.h b/Filters/Extraction/vtkExtractDataSets.h
index 2f8220740cd1f6cbedc2e5eb6cfcf3e0596a2813..8734921bd585464e26378e2dc9f96d57c53cc224 100644
--- a/Filters/Extraction/vtkExtractDataSets.h
+++ b/Filters/Extraction/vtkExtractDataSets.h
@@ -38,7 +38,7 @@ class VTKFILTERSEXTRACTION_EXPORT vtkExtractDataSets :
public:
static vtkExtractDataSets* New();
vtkTypeMacro(vtkExtractDataSets, vtkMultiBlockDataSetAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Add a dataset to be extracted.
@@ -52,13 +52,13 @@ public:
protected:
vtkExtractDataSets();
- ~vtkExtractDataSets() VTK_OVERRIDE;
+ ~vtkExtractDataSets() override;
int RequestData(vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
- int FillOutputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ vtkInformationVector *) override;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
+ int FillOutputPortInformation(int port, vtkInformation *info) override;
private:
vtkExtractDataSets(const vtkExtractDataSets&) VTK_DELETE_FUNCTION;
diff --git a/Filters/Extraction/vtkExtractEdges.h b/Filters/Extraction/vtkExtractEdges.h
index 896bf0c2975ca3a4a4048e02c260ac10578b7e5e..339b64cc2aa638148729115dd878618add207d5e 100644
--- a/Filters/Extraction/vtkExtractEdges.h
+++ b/Filters/Extraction/vtkExtractEdges.h
@@ -36,7 +36,7 @@ class VTKFILTERSEXTRACTION_EXPORT vtkExtractEdges : public vtkPolyDataAlgorithm
public:
static vtkExtractEdges *New();
vtkTypeMacro(vtkExtractEdges,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -55,16 +55,16 @@ public:
/**
* Return MTime also considering the locator.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
protected:
vtkExtractEdges();
- ~vtkExtractEdges() VTK_OVERRIDE;
+ ~vtkExtractEdges() override;
// Usual data generation method
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
vtkIncrementalPointLocator *Locator;
private:
diff --git a/Filters/Extraction/vtkExtractGeometry.h b/Filters/Extraction/vtkExtractGeometry.h
index 73b7ad54a073d9d468a2e74a63c9fdeb0be7761a..cc9465de1386bae2e6d2c38ed259006c607a95ee 100644
--- a/Filters/Extraction/vtkExtractGeometry.h
+++ b/Filters/Extraction/vtkExtractGeometry.h
@@ -47,7 +47,7 @@ class VTKFILTERSEXTRACTION_EXPORT vtkExtractGeometry : public vtkUnstructuredGri
{
public:
vtkTypeMacro(vtkExtractGeometry,vtkUnstructuredGridAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct object with ExtractInside turned on.
@@ -57,7 +57,7 @@ public:
/**
* Return the MTime taking into account changes to the implicit function
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
//@{
/**
@@ -93,12 +93,12 @@ public:
protected:
vtkExtractGeometry(vtkImplicitFunction *f=nullptr);
- ~vtkExtractGeometry() VTK_OVERRIDE;
+ ~vtkExtractGeometry() override;
// Usual data generation method
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
vtkImplicitFunction *ImplicitFunction;
int ExtractInside;
diff --git a/Filters/Extraction/vtkExtractGrid.h b/Filters/Extraction/vtkExtractGrid.h
index 6698b16eb3c9eb56a7b95a9941d083897e5374e5..bb6270f8dbcda13f7604cd088615ea673f3dfccc 100644
--- a/Filters/Extraction/vtkExtractGrid.h
+++ b/Filters/Extraction/vtkExtractGrid.h
@@ -51,7 +51,7 @@ class VTKFILTERSEXTRACTION_EXPORT vtkExtractGrid : public vtkStructuredGridAlgor
public:
static vtkExtractGrid *New();
vtkTypeMacro(vtkExtractGrid,vtkStructuredGridAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -91,11 +91,11 @@ public:
protected:
vtkExtractGrid();
- ~vtkExtractGrid() VTK_OVERRIDE;
+ ~vtkExtractGrid() override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int RequestInformation(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int RequestUpdateExtent(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int RequestInformation(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int RequestUpdateExtent(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
/**
* Implementation for RequestData using a specified VOI. This is because the
diff --git a/Filters/Extraction/vtkExtractLevel.h b/Filters/Extraction/vtkExtractLevel.h
index 27ce1e082853a6df754de7dcc0465ea555a30bdc..8bb880f88d159a09e7284bcddcd9873aca92bb65 100644
--- a/Filters/Extraction/vtkExtractLevel.h
+++ b/Filters/Extraction/vtkExtractLevel.h
@@ -33,7 +33,7 @@ class VTKFILTERSEXTRACTION_EXPORT vtkExtractLevel :
public:
static vtkExtractLevel* New();
vtkTypeMacro(vtkExtractLevel, vtkMultiBlockDataSetAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
@@ -48,17 +48,17 @@ public:
protected:
vtkExtractLevel();
- ~vtkExtractLevel() VTK_OVERRIDE;
+ ~vtkExtractLevel() override;
- int RequestUpdateExtent(vtkInformation*, vtkInformationVector**,vtkInformationVector* ) VTK_OVERRIDE;
+ int RequestUpdateExtent(vtkInformation*, vtkInformationVector**,vtkInformationVector* ) override;
/// Implementation of the algorithm.
int RequestData(vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
- int FillInputPortInformation(int port,vtkInformation *info) VTK_OVERRIDE;
- int FillOutputPortInformation(int port,vtkInformation *info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port,vtkInformation *info) override;
+ int FillOutputPortInformation(int port,vtkInformation *info) override;
private:
vtkExtractLevel(const vtkExtractLevel&) VTK_DELETE_FUNCTION;
diff --git a/Filters/Extraction/vtkExtractPolyDataGeometry.h b/Filters/Extraction/vtkExtractPolyDataGeometry.h
index b6aafbefa87d0d7169eff68a91e2a2b1a54dcf30..122628eb46a3e1566a795a805f309cfdfaec3481 100644
--- a/Filters/Extraction/vtkExtractPolyDataGeometry.h
+++ b/Filters/Extraction/vtkExtractPolyDataGeometry.h
@@ -52,7 +52,7 @@ class VTKFILTERSEXTRACTION_EXPORT vtkExtractPolyDataGeometry : public vtkPolyDat
{
public:
vtkTypeMacro(vtkExtractPolyDataGeometry,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct object with ExtractInside turned on.
@@ -62,7 +62,7 @@ public:
/**
* Return the MTime taking into account changes to the implicit function
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
//@{
/**
@@ -105,10 +105,10 @@ public:
protected:
vtkExtractPolyDataGeometry(vtkImplicitFunction *f=nullptr);
- ~vtkExtractPolyDataGeometry() VTK_OVERRIDE;
+ ~vtkExtractPolyDataGeometry() override;
// Usual data generation method
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
vtkImplicitFunction *ImplicitFunction;
int ExtractInside;
diff --git a/Filters/Extraction/vtkExtractRectilinearGrid.h b/Filters/Extraction/vtkExtractRectilinearGrid.h
index e1d9c391014db6a49f2ade4517abacfee8222a45..5b681f02f843e41dd6f6670397d633ab7e897f05 100644
--- a/Filters/Extraction/vtkExtractRectilinearGrid.h
+++ b/Filters/Extraction/vtkExtractRectilinearGrid.h
@@ -40,7 +40,7 @@ class VTKFILTERSEXTRACTION_EXPORT vtkExtractRectilinearGrid : public vtkRectilin
public:
static vtkExtractRectilinearGrid *New();
vtkTypeMacro(vtkExtractRectilinearGrid,vtkRectilinearGridAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -80,11 +80,11 @@ public:
protected:
vtkExtractRectilinearGrid();
- ~vtkExtractRectilinearGrid() VTK_OVERRIDE;
+ ~vtkExtractRectilinearGrid() override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int RequestInformation(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int RequestUpdateExtent(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int RequestInformation(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int RequestUpdateExtent(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
/**
* Implementation for RequestData using a specified VOI. This is because the
diff --git a/Filters/Extraction/vtkExtractSelectedBlock.h b/Filters/Extraction/vtkExtractSelectedBlock.h
index 262f5f6642d0b04b731dc42a33dfd01d1245f3c4..2bd68ae27e40b0fa25a6542cba2aefd17d53f1d8 100644
--- a/Filters/Extraction/vtkExtractSelectedBlock.h
+++ b/Filters/Extraction/vtkExtractSelectedBlock.h
@@ -38,24 +38,24 @@ class VTKFILTERSEXTRACTION_EXPORT vtkExtractSelectedBlock : public vtkExtractSel
public:
static vtkExtractSelectedBlock* New();
vtkTypeMacro(vtkExtractSelectedBlock, vtkExtractSelectionBase);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkExtractSelectedBlock();
- ~vtkExtractSelectedBlock() VTK_OVERRIDE;
+ ~vtkExtractSelectedBlock() override;
// Generate the output.
int RequestData(vtkInformation *,
- vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector **, vtkInformationVector *) override;
/**
* Sets up empty output dataset
*/
int RequestDataObject(vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
private:
vtkExtractSelectedBlock(const vtkExtractSelectedBlock&) VTK_DELETE_FUNCTION;
void operator=(const vtkExtractSelectedBlock&) VTK_DELETE_FUNCTION;
diff --git a/Filters/Extraction/vtkExtractSelectedIds.h b/Filters/Extraction/vtkExtractSelectedIds.h
index 79c3c5f45282a6ac158bd390f6115aec01e08518..64cebc7ec00952f68b0e5156a43222497cb8c8f3 100644
--- a/Filters/Extraction/vtkExtractSelectedIds.h
+++ b/Filters/Extraction/vtkExtractSelectedIds.h
@@ -42,19 +42,19 @@ class VTKFILTERSEXTRACTION_EXPORT vtkExtractSelectedIds : public vtkExtractSelec
public:
static vtkExtractSelectedIds *New();
vtkTypeMacro(vtkExtractSelectedIds, vtkExtractSelectionBase);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkExtractSelectedIds();
- ~vtkExtractSelectedIds() VTK_OVERRIDE;
+ ~vtkExtractSelectedIds() override;
// Overridden to indicate that the input must be a vtkDataSet.
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
// Usual data generation method
int RequestData(vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
int ExtractCells(vtkSelectionNode *sel, vtkDataSet *input,
diff --git a/Filters/Extraction/vtkExtractSelectedLocations.h b/Filters/Extraction/vtkExtractSelectedLocations.h
index e5c86e73854f30af7fb022e6611e2baada0627d7..14cdfe7db8d9ade40dd6b04e535180ea0022022f 100644
--- a/Filters/Extraction/vtkExtractSelectedLocations.h
+++ b/Filters/Extraction/vtkExtractSelectedLocations.h
@@ -40,16 +40,16 @@ class VTKFILTERSEXTRACTION_EXPORT vtkExtractSelectedLocations : public vtkExtrac
public:
static vtkExtractSelectedLocations *New();
vtkTypeMacro(vtkExtractSelectedLocations, vtkExtractSelectionBase);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkExtractSelectedLocations();
- ~vtkExtractSelectedLocations() VTK_OVERRIDE;
+ ~vtkExtractSelectedLocations() override;
// Usual data generation method
int RequestData(vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
int ExtractCells(vtkSelectionNode *sel, vtkDataSet *input,
vtkDataSet *output);
diff --git a/Filters/Extraction/vtkExtractSelectedPolyDataIds.h b/Filters/Extraction/vtkExtractSelectedPolyDataIds.h
index a1946ed89749809a6885c424b524f4c4036176eb..915c72abee79921667460b971ff65ac89e23cbd2 100644
--- a/Filters/Extraction/vtkExtractSelectedPolyDataIds.h
+++ b/Filters/Extraction/vtkExtractSelectedPolyDataIds.h
@@ -34,19 +34,19 @@ class VTKFILTERSEXTRACTION_EXPORT vtkExtractSelectedPolyDataIds : public vtkPoly
{
public:
vtkTypeMacro(vtkExtractSelectedPolyDataIds,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkExtractSelectedPolyDataIds *New();
protected:
vtkExtractSelectedPolyDataIds();
- ~vtkExtractSelectedPolyDataIds() VTK_OVERRIDE;
+ ~vtkExtractSelectedPolyDataIds() override;
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
// Usual data generation method
int RequestData(vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
private:
vtkExtractSelectedPolyDataIds(const vtkExtractSelectedPolyDataIds&) VTK_DELETE_FUNCTION;
diff --git a/Filters/Extraction/vtkExtractSelectedRows.h b/Filters/Extraction/vtkExtractSelectedRows.h
index 056437a617a229cb3a3337b22e65ae8d06694a01..2a725f8034fa95163656d73517cd9323529a9d71 100644
--- a/Filters/Extraction/vtkExtractSelectedRows.h
+++ b/Filters/Extraction/vtkExtractSelectedRows.h
@@ -41,7 +41,7 @@ class VTKFILTERSEXTRACTION_EXPORT vtkExtractSelectedRows : public vtkTableAlgori
public:
static vtkExtractSelectedRows* New();
vtkTypeMacro(vtkExtractSelectedRows,vtkTableAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* A convenience method for setting the second input (i.e. the selection).
@@ -56,7 +56,7 @@ public:
/**
* Specify the first vtkGraph input and the second vtkSelection input.
*/
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
//@{
/**
@@ -70,12 +70,12 @@ public:
protected:
vtkExtractSelectedRows();
- ~vtkExtractSelectedRows() VTK_OVERRIDE;
+ ~vtkExtractSelectedRows() override;
int RequestData(
vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
bool AddOriginalRowIdsArray;
private:
diff --git a/Filters/Extraction/vtkExtractSelectedThresholds.h b/Filters/Extraction/vtkExtractSelectedThresholds.h
index 29a961fc59f497b19f968fd9bccb47add286d617..159371d9d3ac4340eab4b3ee3b632b765343bca2 100644
--- a/Filters/Extraction/vtkExtractSelectedThresholds.h
+++ b/Filters/Extraction/vtkExtractSelectedThresholds.h
@@ -46,7 +46,7 @@ class VTKFILTERSEXTRACTION_EXPORT vtkExtractSelectedThresholds : public vtkExtra
{
public:
vtkTypeMacro(vtkExtractSelectedThresholds, vtkExtractSelectionBase);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Constructor
@@ -101,12 +101,12 @@ public:
protected:
vtkExtractSelectedThresholds();
- ~vtkExtractSelectedThresholds() VTK_OVERRIDE;
+ ~vtkExtractSelectedThresholds() override;
// Usual data generation method
int RequestData(vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
int ExtractCells(vtkSelectionNode *sel, vtkDataSet *input,
vtkDataSet *output,
diff --git a/Filters/Extraction/vtkExtractSelection.h b/Filters/Extraction/vtkExtractSelection.h
index e30c36946c37e1b96c1938a094e00c415c0aa5b1..fa19c098823f10f4818f1ecb77e763342aaee732 100644
--- a/Filters/Extraction/vtkExtractSelection.h
+++ b/Filters/Extraction/vtkExtractSelection.h
@@ -49,7 +49,7 @@ class VTKFILTERSEXTRACTION_EXPORT vtkExtractSelection : public vtkExtractSelecti
public:
static vtkExtractSelection *New();
vtkTypeMacro(vtkExtractSelection, vtkExtractSelectionBase);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -74,19 +74,19 @@ public:
protected:
vtkExtractSelection();
- ~vtkExtractSelection() VTK_OVERRIDE;
+ ~vtkExtractSelection() override;
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
//sets up empty output dataset
int RequestDataObject(vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
// runs the algorithm and fills the output with results
int RequestData(vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
// used for composite, non-hierarhical input.
vtkDataObject* RequestDataInternal(
diff --git a/Filters/Extraction/vtkExtractTemporalFieldData.h b/Filters/Extraction/vtkExtractTemporalFieldData.h
index e886f00a92ba04be0961e73ffda1c6ee824446be..a6a422f32b1934ca64d4867facbb3be8f09ec714 100644
--- a/Filters/Extraction/vtkExtractTemporalFieldData.h
+++ b/Filters/Extraction/vtkExtractTemporalFieldData.h
@@ -52,7 +52,7 @@ class VTKFILTERSEXTRACTION_EXPORT vtkExtractTemporalFieldData : public vtkDataOb
public:
static vtkExtractTemporalFieldData *New();
vtkTypeMacro(vtkExtractTemporalFieldData,vtkDataObjectAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Get the number of time steps
@@ -72,18 +72,18 @@ public:
protected:
vtkExtractTemporalFieldData();
- ~vtkExtractTemporalFieldData() VTK_OVERRIDE;
+ ~vtkExtractTemporalFieldData() override;
int RequestDataObject(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
int RequestInformation(vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
int RequestData(vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
/**
* This looks at the arrays in the vtkFieldData of input and copies them
diff --git a/Filters/Extraction/vtkExtractTensorComponents.h b/Filters/Extraction/vtkExtractTensorComponents.h
index e188485c5dcd5f88b693c79757aaf502f41b6c6b..35c16a44ca8a4d53c86bcfa61ed9d5be7a9ad6aa 100644
--- a/Filters/Extraction/vtkExtractTensorComponents.h
+++ b/Filters/Extraction/vtkExtractTensorComponents.h
@@ -54,7 +54,7 @@ class VTKFILTERSEXTRACTION_EXPORT vtkExtractTensorComponents : public vtkDataSet
{
public:
vtkTypeMacro(vtkExtractTensorComponents,vtkDataSetAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct object to extract nothing and to not pass tensor data
@@ -187,9 +187,9 @@ public:
protected:
vtkExtractTensorComponents();
- ~vtkExtractTensorComponents()VTK_OVERRIDE {}
+ ~vtkExtractTensorComponents() override {}
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
int PassTensorsToOutput;
diff --git a/Filters/Extraction/vtkExtractTimeSteps.h b/Filters/Extraction/vtkExtractTimeSteps.h
index 37dd387b95bd1150c99fdea23530c43f2458919f..26585ed6b12dd39cec33e59119fd4172a1ee7ba7 100644
--- a/Filters/Extraction/vtkExtractTimeSteps.h
+++ b/Filters/Extraction/vtkExtractTimeSteps.h
@@ -45,7 +45,7 @@ class VTKFILTERSEXTRACTION_EXPORT vtkExtractTimeSteps : public vtkPassInputTypeA
{
public:
vtkTypeMacro(vtkExtractTimeSteps, vtkPassInputTypeAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkExtractTimeSteps *New();
@@ -136,14 +136,14 @@ public:
protected:
vtkExtractTimeSteps();
- ~vtkExtractTimeSteps()VTK_OVERRIDE {};
+ ~vtkExtractTimeSteps() override {};
int RequestData(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
int RequestInformation(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
int RequestUpdateExtent(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
std::set<int> TimeStepIndices;
bool UseRange;
diff --git a/Filters/Extraction/vtkExtractUnstructuredGrid.h b/Filters/Extraction/vtkExtractUnstructuredGrid.h
index d1cf3079f5b036692c5e1057f201ccc29cbc4ee5..88f5760b7783bb3003f6dfd82300061300de8b7f 100644
--- a/Filters/Extraction/vtkExtractUnstructuredGrid.h
+++ b/Filters/Extraction/vtkExtractUnstructuredGrid.h
@@ -48,7 +48,7 @@ class VTKFILTERSEXTRACTION_EXPORT vtkExtractUnstructuredGrid : public vtkUnstruc
{
public:
vtkTypeMacro(vtkExtractUnstructuredGrid,vtkUnstructuredGridAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct with all types of clipping turned off.
@@ -156,13 +156,13 @@ public:
/**
* Return the MTime also considering the locator.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
protected:
vtkExtractUnstructuredGrid();
- ~vtkExtractUnstructuredGrid()VTK_OVERRIDE {}
+ ~vtkExtractUnstructuredGrid() override {}
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
vtkIdType PointMinimum;
vtkIdType PointMaximum;
diff --git a/Filters/Extraction/vtkExtractVectorComponents.h b/Filters/Extraction/vtkExtractVectorComponents.h
index f8ac6189c99e421b71640a34cd6ca642fe5cb1c9..d309cf1951a7639ab5df89cff74780533fbd1256 100644
--- a/Filters/Extraction/vtkExtractVectorComponents.h
+++ b/Filters/Extraction/vtkExtractVectorComponents.h
@@ -44,7 +44,7 @@ class VTKFILTERSEXTRACTION_EXPORT vtkExtractVectorComponents : public vtkDataSet
public:
static vtkExtractVectorComponents *New();
vtkTypeMacro(vtkExtractVectorComponents,vtkDataSetAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Specify the input data or filter.
@@ -89,9 +89,9 @@ public:
protected:
vtkExtractVectorComponents();
- ~vtkExtractVectorComponents() VTK_OVERRIDE;
+ ~vtkExtractVectorComponents() override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
int ExtractToFieldData;
int OutputsInitialized;
private:
diff --git a/Filters/Extraction/vtkHierarchicalDataExtractDataSets.h b/Filters/Extraction/vtkHierarchicalDataExtractDataSets.h
index df79b3eb3e33dc0b1530e6447320f6ecf7fa812c..e81b11142b0f56ba098beda5a7312e4ad2102020 100644
--- a/Filters/Extraction/vtkHierarchicalDataExtractDataSets.h
+++ b/Filters/Extraction/vtkHierarchicalDataExtractDataSets.h
@@ -35,12 +35,12 @@ class VTKFILTERSEXTRACTION_EXPORT vtkHierarchicalDataExtractDataSets :
{
public:
vtkTypeMacro(vtkHierarchicalDataExtractDataSets,vtkExtractDataSets);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkHierarchicalDataExtractDataSets *New();
protected:
vtkHierarchicalDataExtractDataSets();
- ~vtkHierarchicalDataExtractDataSets() VTK_OVERRIDE;
+ ~vtkHierarchicalDataExtractDataSets() override;
private:
vtkHierarchicalDataExtractDataSets(const vtkHierarchicalDataExtractDataSets&) VTK_DELETE_FUNCTION;
diff --git a/Filters/Extraction/vtkHierarchicalDataExtractLevel.h b/Filters/Extraction/vtkHierarchicalDataExtractLevel.h
index edf8d2d8babc18cf0aeebe24cf6a80e4d7e37fef..039790db99614e17d2c952337f268a7e8bb9b634 100644
--- a/Filters/Extraction/vtkHierarchicalDataExtractLevel.h
+++ b/Filters/Extraction/vtkHierarchicalDataExtractLevel.h
@@ -29,13 +29,13 @@ class VTKFILTERSEXTRACTION_EXPORT vtkHierarchicalDataExtractLevel : public vtkEx
{
public:
vtkTypeMacro(vtkHierarchicalDataExtractLevel,vtkExtractLevel);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkHierarchicalDataExtractLevel *New();
protected:
vtkHierarchicalDataExtractLevel();
- ~vtkHierarchicalDataExtractLevel() VTK_OVERRIDE;
+ ~vtkHierarchicalDataExtractLevel() override;
private:
vtkHierarchicalDataExtractLevel(const vtkHierarchicalDataExtractLevel&) VTK_DELETE_FUNCTION;
diff --git a/Filters/Extraction/vtkProbeSelectedLocations.h b/Filters/Extraction/vtkProbeSelectedLocations.h
index f88ccf77b841cb60ab209d213a5c10bf9ebba6e2..4a38b919448343fb2d6b667517ab683f1b54029a 100644
--- a/Filters/Extraction/vtkProbeSelectedLocations.h
+++ b/Filters/Extraction/vtkProbeSelectedLocations.h
@@ -36,21 +36,21 @@ class VTKFILTERSEXTRACTION_EXPORT vtkProbeSelectedLocations : public vtkExtractS
public:
static vtkProbeSelectedLocations* New();
vtkTypeMacro(vtkProbeSelectedLocations, vtkExtractSelectionBase);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkProbeSelectedLocations();
- ~vtkProbeSelectedLocations() VTK_OVERRIDE;
+ ~vtkProbeSelectedLocations() override;
/**
* Sets up empty output dataset
*/
int RequestDataObject(vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
int RequestData(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
private:
vtkProbeSelectedLocations(const vtkProbeSelectedLocations&) VTK_DELETE_FUNCTION;
diff --git a/Filters/FlowPaths/Testing/Cxx/TestParticleTracers.cxx b/Filters/FlowPaths/Testing/Cxx/TestParticleTracers.cxx
index d3b74596034eda219f08891b0cb34900b84fc3b8..c8cc9f11b5b1736b91ceee4937a1189409702572 100644
--- a/Filters/FlowPaths/Testing/Cxx/TestParticleTracers.cxx
+++ b/Filters/FlowPaths/Testing/Cxx/TestParticleTracers.cxx
@@ -91,13 +91,13 @@ protected:
dx[i] = (this->BoundingBox[2*i+1]- this->BoundingBox[2*i]) / (this->Extent[2*i+1] - this->Extent[2*i]);
}
}
- ~TestTimeSource() VTK_OVERRIDE
+ ~TestTimeSource() override
{
}
int ProcessRequest(vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE
+ vtkInformationVector* outputVector) override
{
// generate the data
if(request->Has(vtkDemandDrivenPipeline::REQUEST_DATA()))
@@ -113,7 +113,7 @@ protected:
return this->Superclass::ProcessRequest(request, inputVector, outputVector);
}
-int FillOutputPortInformation(int, vtkInformation *info) VTK_OVERRIDE
+int FillOutputPortInformation(int, vtkInformation *info) override
{
info->Set(vtkDataObject::DATA_TYPE_NAME(), "vtkImageData");
return 1;
diff --git a/Filters/FlowPaths/vtkAMRInterpolatedVelocityField.h b/Filters/FlowPaths/vtkAMRInterpolatedVelocityField.h
index 87f2d6f670291378ba7817bcb5305fa2c064a53a..4af64d484d7ad1e2ddf672686c4e2d1d50221b8a 100644
--- a/Filters/FlowPaths/vtkAMRInterpolatedVelocityField.h
+++ b/Filters/FlowPaths/vtkAMRInterpolatedVelocityField.h
@@ -47,12 +47,12 @@ public:
bool SetLastDataSet(int level, int id);
- void SetLastCellId( vtkIdType c, int dataindex ) VTK_OVERRIDE;
+ void SetLastCellId( vtkIdType c, int dataindex ) override;
/**
* Set the cell id cached by the last evaluation.
*/
- void SetLastCellId( vtkIdType c ) VTK_OVERRIDE
+ void SetLastCellId( vtkIdType c ) override
{ this->Superclass::SetLastCellId( c ); }
/**
@@ -66,9 +66,9 @@ public:
* still valid
*/
- int FunctionValues( double * x, double * f ) VTK_OVERRIDE;
+ int FunctionValues( double * x, double * f ) override;
- void PrintSelf( ostream & os, vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf( ostream & os, vtkIndent indent ) override;
// Descriptino:
// Point location routine.
@@ -80,8 +80,8 @@ protected:
int LastId;
vtkAMRInterpolatedVelocityField();
- ~vtkAMRInterpolatedVelocityField() VTK_OVERRIDE;
- int FunctionValues( vtkDataSet * ds, double * x, double * f ) VTK_OVERRIDE
+ ~vtkAMRInterpolatedVelocityField() override;
+ int FunctionValues( vtkDataSet * ds, double * x, double * f ) override
{ return this->Superclass::FunctionValues( ds, x, f ); }
private:
diff --git a/Filters/FlowPaths/vtkAbstractInterpolatedVelocityField.h b/Filters/FlowPaths/vtkAbstractInterpolatedVelocityField.h
index e54990d0548bedfd254eee6ca78b24d75479b6b4..03d47571e85de8505ea524efbd29c45a33630e1f 100644
--- a/Filters/FlowPaths/vtkAbstractInterpolatedVelocityField.h
+++ b/Filters/FlowPaths/vtkAbstractInterpolatedVelocityField.h
@@ -85,7 +85,7 @@ class VTKFILTERSFLOWPATHS_EXPORT vtkAbstractInterpolatedVelocityField : public v
{
public:
vtkTypeMacro( vtkAbstractInterpolatedVelocityField, vtkFunctionSet );
- void PrintSelf( ostream & os, vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf( ostream & os, vtkIndent indent ) override;
//@{
/**
@@ -188,7 +188,7 @@ public:
/**
* Evaluate the velocity field f at point (x, y, z).
*/
- int FunctionValues( double * x, double * f ) VTK_OVERRIDE = 0;
+ int FunctionValues( double * x, double * f ) override = 0;
/**
* Set the last cell id to -1 to incur a global cell search for the next point.
@@ -206,7 +206,7 @@ public:
protected:
vtkAbstractInterpolatedVelocityField();
- ~vtkAbstractInterpolatedVelocityField() VTK_OVERRIDE;
+ ~vtkAbstractInterpolatedVelocityField() override;
static const double TOLERANCE_SCALE;
static const double SURFACE_TOLERANCE_SCALE;
diff --git a/Filters/FlowPaths/vtkCachingInterpolatedVelocityField.h b/Filters/FlowPaths/vtkCachingInterpolatedVelocityField.h
index 76f758ba82cca8435a1a8f475eae3cb373898498..cea493287d4aa2447f3255bdc0c72113650a575f 100644
--- a/Filters/FlowPaths/vtkCachingInterpolatedVelocityField.h
+++ b/Filters/FlowPaths/vtkCachingInterpolatedVelocityField.h
@@ -66,7 +66,7 @@ class VTKFILTERSFLOWPATHS_EXPORT vtkCachingInterpolatedVelocityField : public vt
{
public:
vtkTypeMacro(vtkCachingInterpolatedVelocityField,vtkFunctionSet);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct a vtkCachingInterpolatedVelocityField with no initial data set.
@@ -79,7 +79,7 @@ public:
* Evaluate the velocity field, f={u,v,w}, at {x, y, z}.
* returns 1 if valid, 0 if test failed
*/
- int FunctionValues(double* x, double* f) VTK_OVERRIDE;
+ int FunctionValues(double* x, double* f) override;
virtual int InsideTest(double* x);
//@}
@@ -133,7 +133,7 @@ public:
protected:
vtkCachingInterpolatedVelocityField();
- ~vtkCachingInterpolatedVelocityField() VTK_OVERRIDE;
+ ~vtkCachingInterpolatedVelocityField() override;
vtkGenericCell *TempCell;
int CellCacheHit;
diff --git a/Filters/FlowPaths/vtkCellLocatorInterpolatedVelocityField.h b/Filters/FlowPaths/vtkCellLocatorInterpolatedVelocityField.h
index 8e07ef4c0d5517384dff38fff6bb2255e008cba0..0fd95312a71db55dc9b53a26245dbd7b83958ee7 100644
--- a/Filters/FlowPaths/vtkCellLocatorInterpolatedVelocityField.h
+++ b/Filters/FlowPaths/vtkCellLocatorInterpolatedVelocityField.h
@@ -60,7 +60,7 @@ class VTKFILTERSFLOWPATHS_EXPORT vtkCellLocatorInterpolatedVelocityField : publi
public:
vtkTypeMacro( vtkCellLocatorInterpolatedVelocityField,
vtkCompositeInterpolatedVelocityField );
- void PrintSelf( ostream & os, vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf( ostream & os, vtkIndent indent ) override;
/**
* Construct a vtkCellLocatorInterpolatedVelocityField without an initial
@@ -92,7 +92,7 @@ public:
/**
* Import parameters. Sub-classes can add more after chaining.
*/
- void CopyParameters( vtkAbstractInterpolatedVelocityField * from ) VTK_OVERRIDE;
+ void CopyParameters( vtkAbstractInterpolatedVelocityField * from ) override;
/**
* Add a dataset coupled with a cell locator (of type vtkAbstractCellLocator)
* for vector function evaluation. Note the use of a vtkAbstractCellLocator
@@ -100,27 +100,27 @@ public:
* evaluation point is searched in all until a match is found. THIS FUNCTION
* DOES NOT CHANGE THE REFERENCE COUNT OF dataset FOR THREAD SAFETY REASONS.
*/
- void AddDataSet( vtkDataSet * dataset ) VTK_OVERRIDE;
+ void AddDataSet( vtkDataSet * dataset ) override;
/**
* Evaluate the velocity field f at point (x, y, z).
*/
- int FunctionValues( double * x, double * f ) VTK_OVERRIDE;
+ int FunctionValues( double * x, double * f ) override;
/**
* Set the cell id cached by the last evaluation within a specified dataset.
*/
- void SetLastCellId( vtkIdType c, int dataindex ) VTK_OVERRIDE;
+ void SetLastCellId( vtkIdType c, int dataindex ) override;
/**
* Set the cell id cached by the last evaluation.
*/
- void SetLastCellId( vtkIdType c ) VTK_OVERRIDE
+ void SetLastCellId( vtkIdType c ) override
{ this->Superclass::SetLastCellId( c ); }
protected:
vtkCellLocatorInterpolatedVelocityField();
- ~vtkCellLocatorInterpolatedVelocityField() VTK_OVERRIDE;
+ ~vtkCellLocatorInterpolatedVelocityField() override;
/**
* Evaluate the velocity field f at point (x, y, z) in a specified dataset
@@ -136,7 +136,7 @@ protected:
* (of type vtkImageData or vtkRectilinearGrid only) by invoking FindCell()
* to locate the next cell if the given point is outside the current cell.
*/
- int FunctionValues( vtkDataSet * ds, double * x, double * f ) VTK_OVERRIDE
+ int FunctionValues( vtkDataSet * ds, double * x, double * f ) override
{ return this->Superclass::FunctionValues( ds, x, f ); }
private:
diff --git a/Filters/FlowPaths/vtkCompositeInterpolatedVelocityField.h b/Filters/FlowPaths/vtkCompositeInterpolatedVelocityField.h
index 88a767d4347e74703b12d1f0b47543620fbc91f5..cffb39f541c431ace685d02088072c252a77b0d6 100644
--- a/Filters/FlowPaths/vtkCompositeInterpolatedVelocityField.h
+++ b/Filters/FlowPaths/vtkCompositeInterpolatedVelocityField.h
@@ -84,7 +84,7 @@ class VTKFILTERSFLOWPATHS_EXPORT vtkCompositeInterpolatedVelocityField : public
{
public:
vtkTypeMacro( vtkCompositeInterpolatedVelocityField, vtkAbstractInterpolatedVelocityField);
- void PrintSelf( ostream & os, vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf( ostream & os, vtkIndent indent ) override;
//@{
/**
@@ -109,7 +109,7 @@ public:
protected:
vtkCompositeInterpolatedVelocityField();
- ~vtkCompositeInterpolatedVelocityField() VTK_OVERRIDE;
+ ~vtkCompositeInterpolatedVelocityField() override;
int LastDataSetIndex;
vtkCompositeInterpolatedVelocityFieldDataSetsType * DataSets;
diff --git a/Filters/FlowPaths/vtkEvenlySpacedStreamlines2D.h b/Filters/FlowPaths/vtkEvenlySpacedStreamlines2D.h
index b6cc1cc72a363773c746434f8e72421415851fcf..e96d01656e19f83d6d09be389d1e8c25b3bcf283 100644
--- a/Filters/FlowPaths/vtkEvenlySpacedStreamlines2D.h
+++ b/Filters/FlowPaths/vtkEvenlySpacedStreamlines2D.h
@@ -114,7 +114,7 @@ class VTKFILTERSFLOWPATHS_EXPORT vtkEvenlySpacedStreamlines2D : public vtkPolyDa
{
public:
vtkTypeMacro(vtkEvenlySpacedStreamlines2D,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct object to start from position (0,0,0), with forward
@@ -280,7 +280,7 @@ public:
protected:
vtkEvenlySpacedStreamlines2D();
- ~vtkEvenlySpacedStreamlines2D() VTK_OVERRIDE;
+ ~vtkEvenlySpacedStreamlines2D() override;
/**
* Do we test for separating distance or a ratio of the separating distance.
@@ -297,8 +297,8 @@ protected:
}
int RequestData(vtkInformation *,
- vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int, vtkInformation *) VTK_OVERRIDE;
+ vtkInformationVector **, vtkInformationVector *) override;
+ int FillInputPortInformation(int, vtkInformation *) override;
int SetupOutput(vtkInformation* inInfo, vtkInformation* outInfo);
int CheckInputs(vtkAbstractInterpolatedVelocityField*& func,
diff --git a/Filters/FlowPaths/vtkInterpolatedVelocityField.h b/Filters/FlowPaths/vtkInterpolatedVelocityField.h
index 49d0931ad6136452fd69874f33d4dbace0866451..9ef877ff4f87b307d9657d82c299b823e474ed8a 100644
--- a/Filters/FlowPaths/vtkInterpolatedVelocityField.h
+++ b/Filters/FlowPaths/vtkInterpolatedVelocityField.h
@@ -63,7 +63,7 @@ class VTKFILTERSFLOWPATHS_EXPORT vtkInterpolatedVelocityField
public:
vtkTypeMacro( vtkInterpolatedVelocityField,
vtkCompositeInterpolatedVelocityField );
- void PrintSelf( ostream & os, vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf( ostream & os, vtkIndent indent ) override;
/**
* Construct a vtkInterpolatedVelocityField without an initial dataset.
@@ -77,12 +77,12 @@ public:
* match is found. THIS FUNCTION DOES NOT CHANGE THE REFERENCE COUNT OF
* DATASET FOR THREAD SAFETY REASONS.
*/
- void AddDataSet( vtkDataSet * dataset ) VTK_OVERRIDE;
+ void AddDataSet( vtkDataSet * dataset ) override;
/**
* Evaluate the velocity field f at point (x, y, z).
*/
- int FunctionValues( double * x, double * f ) VTK_OVERRIDE;
+ int FunctionValues( double * x, double * f ) override;
/**
* Project the provided point on current cell, current dataset.
@@ -92,17 +92,17 @@ public:
/**
* Set the cell id cached by the last evaluation within a specified dataset.
*/
- void SetLastCellId( vtkIdType c, int dataindex ) VTK_OVERRIDE;
+ void SetLastCellId( vtkIdType c, int dataindex ) override;
/**
* Set the cell id cached by the last evaluation.
*/
- void SetLastCellId( vtkIdType c ) VTK_OVERRIDE
+ void SetLastCellId( vtkIdType c ) override
{ this->Superclass::SetLastCellId( c ); }
protected:
vtkInterpolatedVelocityField() { }
- ~vtkInterpolatedVelocityField() VTK_OVERRIDE { }
+ ~vtkInterpolatedVelocityField() override { }
/**
* Evaluate the velocity field f at point (x, y, z) in a specified dataset
@@ -111,7 +111,7 @@ protected:
* invoking vtkImageData/vtkRectilinearGrid::FindCell() to fulfill the same
* task if the point is outside the current cell.
*/
- int FunctionValues( vtkDataSet * ds, double * x, double * f ) VTK_OVERRIDE
+ int FunctionValues( vtkDataSet * ds, double * x, double * f ) override
{ return this->Superclass::FunctionValues( ds, x, f ); }
private:
diff --git a/Filters/FlowPaths/vtkLagrangianBasicIntegrationModel.h b/Filters/FlowPaths/vtkLagrangianBasicIntegrationModel.h
index 17b7885e48447a1f1eefb9d849643c8bc7eddeb4..5dade323c7e140a2e862048d0cd9c4c8da281e0e 100644
--- a/Filters/FlowPaths/vtkLagrangianBasicIntegrationModel.h
+++ b/Filters/FlowPaths/vtkLagrangianBasicIntegrationModel.h
@@ -84,7 +84,7 @@ class VTKFILTERSFLOWPATHS_EXPORT vtkLagrangianBasicIntegrationModel :
{
public:
vtkTypeMacro(vtkLagrangianBasicIntegrationModel, vtkFunctionSet);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
typedef enum SurfaceType
{
@@ -111,7 +111,7 @@ public:
* in found this will call
* FunctionValues(vtkDataSet* detaSet, vtkIdType cellId, double* x, double* f)
*/
- int FunctionValues(double* x, double* f) VTK_OVERRIDE;
+ int FunctionValues(double* x, double* f) override;
//@{
/**
@@ -373,7 +373,7 @@ public:
protected:
vtkLagrangianBasicIntegrationModel();
- ~vtkLagrangianBasicIntegrationModel() VTK_OVERRIDE;
+ ~vtkLagrangianBasicIntegrationModel() override;
/**
* Actually compute the integration model velocity field
diff --git a/Filters/FlowPaths/vtkLagrangianMatidaIntegrationModel.h b/Filters/FlowPaths/vtkLagrangianMatidaIntegrationModel.h
index a65d845d4a921df75a0848b7fcb3ebb0992754de..3b037fc402992ae0d30f60c67482a05162d9a6ce 100644
--- a/Filters/FlowPaths/vtkLagrangianMatidaIntegrationModel.h
+++ b/Filters/FlowPaths/vtkLagrangianMatidaIntegrationModel.h
@@ -44,7 +44,7 @@ class VTKFILTERSFLOWPATHS_EXPORT vtkLagrangianMatidaIntegrationModel :
{
public:
vtkTypeMacro(vtkLagrangianMatidaIntegrationModel, vtkLagrangianBasicIntegrationModel);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkLagrangianMatidaIntegrationModel* New();
// Needed for multiple signatures polymorphism
@@ -55,11 +55,11 @@ public:
* f at position x, using data from cell in dataSet with index cellId
*/
int FunctionValues(vtkDataSet* dataSet, vtkIdType cellId,
- double* weights, double* x, double* f) VTK_OVERRIDE;
+ double* weights, double* x, double* f) override;
protected:
vtkLagrangianMatidaIntegrationModel();
- ~vtkLagrangianMatidaIntegrationModel() VTK_OVERRIDE;
+ ~vtkLagrangianMatidaIntegrationModel() override;
static double GetRelaxationTime(double dynVisc, double diameter, double density);
diff --git a/Filters/FlowPaths/vtkLagrangianParticleTracker.h b/Filters/FlowPaths/vtkLagrangianParticleTracker.h
index cb6167cec6c04219ea60d1769180d94025702bcb..51fd32f1cc399921b745d585ccc8cfa7ac27c09f 100644
--- a/Filters/FlowPaths/vtkLagrangianParticleTracker.h
+++ b/Filters/FlowPaths/vtkLagrangianParticleTracker.h
@@ -112,7 +112,7 @@ class VTKFILTERSFLOWPATHS_EXPORT vtkLagrangianParticleTracker :
public:
vtkTypeMacro(vtkLagrangianParticleTracker, vtkDataObjectAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkLagrangianParticleTracker *New();
typedef enum CellLengthComputation{
@@ -273,32 +273,32 @@ public:
/**
* Declare input port type
*/
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
/**
* Declare output port type
*/
- int FillOutputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillOutputPortInformation(int port, vtkInformation* info) override;
/**
* Create outputs objects.
*/
int RequestDataObject(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
/**
* Process inputs to integrate particle and generate output.
*/
int RequestData(vtkInformation *request,
vtkInformationVector **inputVector,
- vtkInformationVector *outputVector) VTK_OVERRIDE;
+ vtkInformationVector *outputVector) override;
/**
* Get the tracker modified time taking into account the integration model
* and the integrator.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
/**
* Get an unique id for a particle
@@ -307,7 +307,7 @@ public:
protected:
vtkLagrangianParticleTracker();
- ~vtkLagrangianParticleTracker() VTK_OVERRIDE;
+ ~vtkLagrangianParticleTracker() override;
virtual bool InitializeInputs(vtkInformationVector **inputVector,
vtkDataObject*& flow, vtkDataObject*& seeds, vtkDataObject*& surfaces,
diff --git a/Filters/FlowPaths/vtkModifiedBSPTree.h b/Filters/FlowPaths/vtkModifiedBSPTree.h
index aef3f48e104fcdf5bea952abcce1c0b36255d7c6..580b503ebf95c05628dcedae217469443cc98f3f 100644
--- a/Filters/FlowPaths/vtkModifiedBSPTree.h
+++ b/Filters/FlowPaths/vtkModifiedBSPTree.h
@@ -160,7 +160,7 @@ class VTKFILTERSFLOWPATHS_EXPORT vtkModifiedBSPTree : public vtkAbstractCellLoca
* Standard Type-Macro
*/
vtkTypeMacro(vtkModifiedBSPTree,vtkAbstractCellLocator);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
@@ -175,17 +175,17 @@ class VTKFILTERSFLOWPATHS_EXPORT vtkModifiedBSPTree : public vtkAbstractCellLoca
/**
* Free tree memory
*/
- void FreeSearchStructure() VTK_OVERRIDE;
+ void FreeSearchStructure() override;
/**
* Build Tree
*/
- void BuildLocator() VTK_OVERRIDE;
+ void BuildLocator() override;
/**
* Generate BBox representation of Nth level
*/
- void GenerateRepresentation(int level, vtkPolyData *pd) VTK_OVERRIDE;
+ void GenerateRepresentation(int level, vtkPolyData *pd) override;
/**
* Generate BBox representation of all leaf nodes
@@ -198,7 +198,7 @@ class VTKFILTERSFLOWPATHS_EXPORT vtkModifiedBSPTree : public vtkAbstractCellLoca
*/
int IntersectWithLine(
double p1[3], double p2[3], double tol, double &t, double x[3],
- double pcoords[3], int &subId, vtkIdType &cellId) VTK_OVERRIDE;
+ double pcoords[3], int &subId, vtkIdType &cellId) override;
/**
* Return intersection point (if any) AND the cell which was intersected by
@@ -206,7 +206,7 @@ class VTKFILTERSFLOWPATHS_EXPORT vtkModifiedBSPTree : public vtkAbstractCellLoca
*/
int IntersectWithLine(
double p1[3], double p2[3], double tol, double &t, double x[3],
- double pcoords[3], int &subId, vtkIdType &cellId, vtkGenericCell *cell) VTK_OVERRIDE;
+ double pcoords[3], int &subId, vtkIdType &cellId, vtkGenericCell *cell) override;
/**
* Take the passed line segment and intersect it with the data set.
@@ -225,9 +225,9 @@ class VTKFILTERSFLOWPATHS_EXPORT vtkModifiedBSPTree : public vtkAbstractCellLoca
* or -1 if not.
*/
vtkIdType FindCell(double x[3], double tol2, vtkGenericCell *GenCell,
- double pcoords[3], double *weights) VTK_OVERRIDE;
+ double pcoords[3], double *weights) override;
- bool InsideCellBounds(double x[3], vtkIdType cell_ID) VTK_OVERRIDE;
+ bool InsideCellBounds(double x[3], vtkIdType cell_ID) override;
/**
* After subdivision has completed, one may wish to query the tree to find
@@ -238,7 +238,7 @@ class VTKFILTERSFLOWPATHS_EXPORT vtkModifiedBSPTree : public vtkAbstractCellLoca
protected:
vtkModifiedBSPTree();
- ~vtkModifiedBSPTree() VTK_OVERRIDE;
+ ~vtkModifiedBSPTree() override;
//
BSPNode *mRoot; // bounding box root node
int npn;
diff --git a/Filters/FlowPaths/vtkParticlePathFilter.h b/Filters/FlowPaths/vtkParticlePathFilter.h
index 280e1f0bfe5daa37c41b4d0013e0189d078b778e..9e0a0823f72ffe70dc79d9fddbcb96b02b4baf33 100644
--- a/Filters/FlowPaths/vtkParticlePathFilter.h
+++ b/Filters/FlowPaths/vtkParticlePathFilter.h
@@ -61,22 +61,22 @@ class VTKFILTERSFLOWPATHS_EXPORT vtkParticlePathFilter: public vtkParticleTracer
{
public:
vtkTypeMacro(vtkParticlePathFilter,vtkParticleTracerBase)
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkParticlePathFilter *New();
protected:
vtkParticlePathFilter();
- ~vtkParticlePathFilter() VTK_OVERRIDE;
+ ~vtkParticlePathFilter() override;
vtkParticlePathFilter(const vtkParticlePathFilter&) VTK_DELETE_FUNCTION;
void operator=(const vtkParticlePathFilter&) VTK_DELETE_FUNCTION;
- void ResetCache() VTK_OVERRIDE;
- int OutputParticles(vtkPolyData* poly) VTK_OVERRIDE;
- void InitializeExtraPointDataArrays(vtkPointData* outputPD) VTK_OVERRIDE;
- void AppendToExtraPointDataArrays(vtkParticleTracerBaseNamespace::ParticleInformation &) VTK_OVERRIDE;
+ void ResetCache() override;
+ int OutputParticles(vtkPolyData* poly) override;
+ void InitializeExtraPointDataArrays(vtkPointData* outputPD) override;
+ void AppendToExtraPointDataArrays(vtkParticleTracerBaseNamespace::ParticleInformation &) override;
- void Finalize() VTK_OVERRIDE;
+ void Finalize() override;
ParticlePathFilterInternal It;
diff --git a/Filters/FlowPaths/vtkParticleTracer.h b/Filters/FlowPaths/vtkParticleTracer.h
index 9d461e8350dbab548a192f858b3386362a4eceef..4cee924ad3faa274548b60f125da4c04e0558738 100644
--- a/Filters/FlowPaths/vtkParticleTracer.h
+++ b/Filters/FlowPaths/vtkParticleTracer.h
@@ -34,16 +34,16 @@ class VTKFILTERSFLOWPATHS_EXPORT vtkParticleTracer: public vtkParticleTracerBase
{
public:
vtkTypeMacro(vtkParticleTracer,vtkParticleTracerBase)
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkParticleTracer *New();
protected:
vtkParticleTracer();
- ~vtkParticleTracer() VTK_OVERRIDE{}
+ ~vtkParticleTracer() override{}
vtkParticleTracer(const vtkParticleTracer&) VTK_DELETE_FUNCTION;
void operator=(const vtkParticleTracer&) VTK_DELETE_FUNCTION;
- int OutputParticles(vtkPolyData* poly) VTK_OVERRIDE;
+ int OutputParticles(vtkPolyData* poly) override;
};
diff --git a/Filters/FlowPaths/vtkParticleTracerBase.h b/Filters/FlowPaths/vtkParticleTracerBase.h
index dadf8c490e5c22296617de06b3ff4e126108082b..14c4ce71c0b1e64a6afceb319ca003046b6f9c50 100644
--- a/Filters/FlowPaths/vtkParticleTracerBase.h
+++ b/Filters/FlowPaths/vtkParticleTracerBase.h
@@ -105,7 +105,7 @@ public:
};
vtkTypeMacro(vtkParticleTracerBase,vtkPolyDataAlgorithm)
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
void PrintParticleHistories();
//@{
@@ -280,19 +280,19 @@ public:
//@}
vtkParticleTracerBase();
- ~vtkParticleTracerBase() VTK_OVERRIDE;
+ ~vtkParticleTracerBase() override;
//
// Make sure the pipeline knows what type we expect as input
//
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
//
// The usual suspects
//
int ProcessRequest(vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
//
// Store any information we need in the output and fetch what we can
@@ -300,21 +300,21 @@ public:
//
int RequestInformation(vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
//
// Compute input time steps given the output step
//
int RequestUpdateExtent(vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
//
// what the pipeline calls for each time step
//
int RequestData(vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
//
// these routines are internally called to actually generate the output
diff --git a/Filters/FlowPaths/vtkStreaklineFilter.h b/Filters/FlowPaths/vtkStreaklineFilter.h
index 6b68180a904cfe74f872749700c9046cb4b0e283..f26d4572f1052b8ac016f3705d9d22404fa3ec2f 100644
--- a/Filters/FlowPaths/vtkStreaklineFilter.h
+++ b/Filters/FlowPaths/vtkStreaklineFilter.h
@@ -49,17 +49,17 @@ class VTKFILTERSFLOWPATHS_EXPORT vtkStreaklineFilter: public vtkParticleTracerBa
{
public:
vtkTypeMacro(vtkStreaklineFilter,vtkParticleTracerBase)
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkStreaklineFilter *New();
protected:
vtkStreaklineFilter();
- ~vtkStreaklineFilter() VTK_OVERRIDE{}
+ ~vtkStreaklineFilter() override{}
vtkStreaklineFilter(const vtkStreaklineFilter&) VTK_DELETE_FUNCTION;
void operator=(const vtkStreaklineFilter&) VTK_DELETE_FUNCTION;
- int OutputParticles(vtkPolyData* poly) VTK_OVERRIDE;
- void Finalize() VTK_OVERRIDE;
+ int OutputParticles(vtkPolyData* poly) override;
+ void Finalize() override;
StreaklineFilterInternal It;
};
diff --git a/Filters/FlowPaths/vtkStreamTracer.h b/Filters/FlowPaths/vtkStreamTracer.h
index f9fd567129440b689a08d3c4e90fc0b525021d7a..af5393662d50e1f093373f990830594ed0232a65 100644
--- a/Filters/FlowPaths/vtkStreamTracer.h
+++ b/Filters/FlowPaths/vtkStreamTracer.h
@@ -102,7 +102,7 @@ class VTKFILTERSFLOWPATHS_EXPORT vtkStreamTracer : public vtkPolyDataAlgorithm
{
public:
vtkTypeMacro(vtkStreamTracer,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct object to start from position (0,0,0), with forward
@@ -385,17 +385,17 @@ public:
protected:
vtkStreamTracer();
- ~vtkStreamTracer() VTK_OVERRIDE;
+ ~vtkStreamTracer() override;
// Create a default executive.
- vtkExecutive* CreateDefaultExecutive() VTK_OVERRIDE;
+ vtkExecutive* CreateDefaultExecutive() override;
// hide the superclass' AddInput() from the user and the compiler
void AddInput(vtkDataObject *)
{ vtkErrorMacro( << "AddInput() must be called with a vtkDataSet not a vtkDataObject."); };
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int, vtkInformation *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int FillInputPortInformation(int, vtkInformation *) override;
void CalculateVorticity( vtkGenericCell* cell, double pcoords[3],
vtkDoubleArray* cellVectors, double vorticity[3] );
diff --git a/Filters/FlowPaths/vtkTemporalInterpolatedVelocityField.h b/Filters/FlowPaths/vtkTemporalInterpolatedVelocityField.h
index 69cd5030062798fcb79a6c7083b123460c34c791..d052fd68c149b512b2afa1735cdc677f78cd6afa 100644
--- a/Filters/FlowPaths/vtkTemporalInterpolatedVelocityField.h
+++ b/Filters/FlowPaths/vtkTemporalInterpolatedVelocityField.h
@@ -69,7 +69,7 @@ class VTKFILTERSFLOWPATHS_EXPORT vtkTemporalInterpolatedVelocityField : public v
{
public:
vtkTypeMacro(vtkTemporalInterpolatedVelocityField,vtkFunctionSet);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct a vtkTemporalInterpolatedVelocityField with no initial data set.
@@ -82,7 +82,7 @@ public:
* Evaluate the velocity field, f, at (x, y, z, t).
* For now, t is ignored.
*/
- int FunctionValues(double* x, double* u) VTK_OVERRIDE;
+ int FunctionValues(double* x, double* u) override;
int FunctionValuesAtT(int T, double* x, double* u);
//@}
@@ -157,7 +157,7 @@ public:
protected:
vtkTemporalInterpolatedVelocityField();
- ~vtkTemporalInterpolatedVelocityField() VTK_OVERRIDE;
+ ~vtkTemporalInterpolatedVelocityField() override;
int FunctionValues(vtkDataSet* ds, double* x, double* f);
virtual void SetVectorsSelection(const char *v);
diff --git a/Filters/FlowPaths/vtkTemporalStreamTracer.h b/Filters/FlowPaths/vtkTemporalStreamTracer.h
index 799c634ef30152425e7fc2e47d8d1f0522b9ab1f..187c8edcf3023df254b4848fed9cb404e68cfb77 100644
--- a/Filters/FlowPaths/vtkTemporalStreamTracer.h
+++ b/Filters/FlowPaths/vtkTemporalStreamTracer.h
@@ -86,7 +86,7 @@ class VTKFILTERSFLOWPATHS_EXPORT vtkTemporalStreamTracer : public vtkStreamTrace
public:
vtkTypeMacro(vtkTemporalStreamTracer,vtkStreamTracer);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct object using 2nd order Runge Kutta
@@ -238,19 +238,19 @@ public:
protected:
vtkTemporalStreamTracer();
- ~vtkTemporalStreamTracer() VTK_OVERRIDE;
+ ~vtkTemporalStreamTracer() override;
//
// Make sure the pipeline knows what type we expect as input
//
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
//
// The usual suspects
//
int ProcessRequest(vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
//
// Store any information we need in the output and fetch what we can
@@ -258,21 +258,21 @@ public:
//
int RequestInformation(vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
//
// Compute input time steps given the output step
//
int RequestUpdateExtent(vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
//
// what the pipeline calls for each time step
//
int RequestData(vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
//
// these routines are internally called to actually generate the output
diff --git a/Filters/General/Testing/Cxx/TestTessellator.cxx b/Filters/General/Testing/Cxx/TestTessellator.cxx
index 181931a1691ceca2718976e7b9b2d5618a5afa9d..946da2cf4b2759f99a8125149a6e0cea1cd9e99a 100644
--- a/Filters/General/Testing/Cxx/TestTessellator.cxx
+++ b/Filters/General/Testing/Cxx/TestTessellator.cxx
@@ -2505,9 +2505,9 @@ class vtkTestTessellatorSubdivision
public:
vtkTypeMacro(vtkTestTessellatorSubdivision,vtkEdgeSubdivisionCriterion);
static vtkTestTessellatorSubdivision* New();
- void PrintSelf( ostream& os, vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf( ostream& os, vtkIndent indent ) override;
- bool EvaluateEdge( const double* p0, double* midpt, const double* p1, int field_start ) VTK_OVERRIDE;
+ bool EvaluateEdge( const double* p0, double* midpt, const double* p1, int field_start ) override;
static double* TestPoints;
static double* TestPointsCanAmbig;
@@ -2542,7 +2542,7 @@ class vtkTestTessellatorSubdivision
protected:
vtkTestTessellatorSubdivision();
- ~vtkTestTessellatorSubdivision() VTK_OVERRIDE;
+ ~vtkTestTessellatorSubdivision() override;
int AmbiguousTests;
int CurrentTest;
@@ -3119,7 +3119,7 @@ public:
vtkTessellatorScreenShot() { this->RenderWindow = nullptr; this->FileName = nullptr; }
vtkRenderWindow* RenderWindow;
char* FileName;
- void Execute( vtkObject* vtkNotUsed(caller), unsigned long vtkNotUsed(event), void* vtkNotUsed(junk) ) VTK_OVERRIDE
+ void Execute( vtkObject* vtkNotUsed(caller), unsigned long vtkNotUsed(event), void* vtkNotUsed(junk) ) override
{
if ( (! this->RenderWindow) || (! this->FileName) )
return;
diff --git a/Filters/General/vtkAnnotationLink.cxx b/Filters/General/vtkAnnotationLink.cxx
index da58f88533edff38dc75fe3d9c9fdaa8cc65af90..3e61c15825fef4652cb5ddbfa6100b281d87f6b7 100644
--- a/Filters/General/vtkAnnotationLink.cxx
+++ b/Filters/General/vtkAnnotationLink.cxx
@@ -40,7 +40,7 @@ class vtkAnnotationLink::Command : public vtkCommand
public:
static Command* New() { return new Command(); }
void Execute(vtkObject *caller, unsigned long eventId,
- void *callData) VTK_OVERRIDE
+ void *callData) override
{
if (this->Target)
{
diff --git a/Filters/General/vtkAnnotationLink.h b/Filters/General/vtkAnnotationLink.h
index 4e9912adfafd1e07ebd1a99b06b4badb976c708c..6f4a2064fcad4f88be76d31688bdd62fcfd95cb0 100644
--- a/Filters/General/vtkAnnotationLink.h
+++ b/Filters/General/vtkAnnotationLink.h
@@ -59,7 +59,7 @@ class VTKFILTERSGENERAL_EXPORT vtkAnnotationLink : public vtkAnnotationLayersAlg
public:
static vtkAnnotationLink *New();
vtkTypeMacro(vtkAnnotationLink, vtkAnnotationLayersAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -91,11 +91,11 @@ public:
/**
* Get the mtime of this object.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
protected:
vtkAnnotationLink();
- ~vtkAnnotationLink() VTK_OVERRIDE;
+ ~vtkAnnotationLink() override;
/**
* Called to process modified events from its vtkAnnotationLayers.
@@ -106,12 +106,12 @@ protected:
/**
* Set up input ports.
*/
- int FillInputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
+ int FillInputPortInformation(int, vtkInformation*) override;
/**
* Set up output ports.
*/
- int FillOutputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
+ int FillOutputPortInformation(int, vtkInformation*) override;
/**
* Copy the data to the output objects.
@@ -127,7 +127,7 @@ protected:
int RequestData(
vtkInformation *info,
vtkInformationVector **inVector,
- vtkInformationVector *outVector) VTK_OVERRIDE;
+ vtkInformationVector *outVector) override;
/**
* The shared selection.
diff --git a/Filters/General/vtkAppendPoints.h b/Filters/General/vtkAppendPoints.h
index dc44320234a4babea7fa0fff387521af62c58fc5..fbafed193f2138bf9228b41fed10bf53135301a9 100644
--- a/Filters/General/vtkAppendPoints.h
+++ b/Filters/General/vtkAppendPoints.h
@@ -36,7 +36,7 @@ class VTKFILTERSGENERAL_EXPORT vtkAppendPoints : public vtkPolyDataAlgorithm
public:
static vtkAppendPoints *New();
vtkTypeMacro(vtkAppendPoints,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -64,12 +64,12 @@ public:
protected:
vtkAppendPoints();
- ~vtkAppendPoints() VTK_OVERRIDE;
+ ~vtkAppendPoints() override;
// Usual data generation method
int RequestData(vtkInformation *,
- vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int, vtkInformation *) VTK_OVERRIDE;
+ vtkInformationVector **, vtkInformationVector *) override;
+ int FillInputPortInformation(int, vtkInformation *) override;
char* InputIdArrayName;
int OutputPointsPrecision;
diff --git a/Filters/General/vtkApproximatingSubdivisionFilter.h b/Filters/General/vtkApproximatingSubdivisionFilter.h
index 9532a2ce15f95644ea98c2c540ac67a00b4e55a4..7234f9b4e623f0b21eda5876162a817733a3c208 100644
--- a/Filters/General/vtkApproximatingSubdivisionFilter.h
+++ b/Filters/General/vtkApproximatingSubdivisionFilter.h
@@ -41,13 +41,13 @@ class VTKFILTERSGENERAL_EXPORT vtkApproximatingSubdivisionFilter : public vtkSub
{
public:
vtkTypeMacro(vtkApproximatingSubdivisionFilter, vtkSubdivisionFilter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkApproximatingSubdivisionFilter();
- ~vtkApproximatingSubdivisionFilter() VTK_OVERRIDE {}
+ ~vtkApproximatingSubdivisionFilter() override {}
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
virtual int GenerateSubdivisionPoints (vtkPolyData *inputDS,
vtkIntArray *edgeData,
vtkPoints *outputPts,
diff --git a/Filters/General/vtkAreaContourSpectrumFilter.h b/Filters/General/vtkAreaContourSpectrumFilter.h
index acac1ead2339b4cf50358065111fb0b052861b98..f903a4f52e55aff469a6ca8e0f9d9da7079997bc 100644
--- a/Filters/General/vtkAreaContourSpectrumFilter.h
+++ b/Filters/General/vtkAreaContourSpectrumFilter.h
@@ -55,7 +55,7 @@ class VTKFILTERSGENERAL_EXPORT vtkAreaContourSpectrumFilter :
public:
static vtkAreaContourSpectrumFilter* New();
vtkTypeMacro(vtkAreaContourSpectrumFilter, vtkDataObjectAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -88,16 +88,16 @@ public:
protected:
vtkAreaContourSpectrumFilter();
- ~vtkAreaContourSpectrumFilter() VTK_OVERRIDE;
+ ~vtkAreaContourSpectrumFilter() override;
vtkIdType ArcId, FieldId;
int NumberOfSamples;
- int FillInputPortInformation(int portNumber, vtkInformation *) VTK_OVERRIDE;
- int FillOutputPortInformation(int portNumber, vtkInformation *info) VTK_OVERRIDE;
+ int FillInputPortInformation(int portNumber, vtkInformation *) override;
+ int FillOutputPortInformation(int portNumber, vtkInformation *info) override;
int RequestData(vtkInformation *request,
- vtkInformationVector **inputVector, vtkInformationVector *outputVector) VTK_OVERRIDE;
+ vtkInformationVector **inputVector, vtkInformationVector *outputVector) override;
private:
vtkAreaContourSpectrumFilter(const vtkAreaContourSpectrumFilter&) VTK_DELETE_FUNCTION;
diff --git a/Filters/General/vtkAxes.h b/Filters/General/vtkAxes.h
index 54d3d3d76e0ac1040b76428082fb2147767c5880..16104f0748bdc429840bcbe5c3c7a91382cf2a49 100644
--- a/Filters/General/vtkAxes.h
+++ b/Filters/General/vtkAxes.h
@@ -34,7 +34,7 @@ public:
static vtkAxes *New();
vtkTypeMacro(vtkAxes,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -72,9 +72,9 @@ public:
protected:
vtkAxes();
- ~vtkAxes() VTK_OVERRIDE {}
+ ~vtkAxes() override {}
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
// This source does not know how to generate pieces yet.
int ComputeDivisionExtents(vtkDataObject *output,
int idx, int numDivisions);
diff --git a/Filters/General/vtkBlankStructuredGrid.h b/Filters/General/vtkBlankStructuredGrid.h
index f0ef3b6455eef0c41b873157fd7e30c16b814242..b171e44e7cc8e3c3520569c16796e12509f8baea 100644
--- a/Filters/General/vtkBlankStructuredGrid.h
+++ b/Filters/General/vtkBlankStructuredGrid.h
@@ -41,7 +41,7 @@ class VTKFILTERSGENERAL_EXPORT vtkBlankStructuredGrid : public vtkStructuredGrid
public:
static vtkBlankStructuredGrid *New();
vtkTypeMacro(vtkBlankStructuredGrid,vtkStructuredGridAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -92,9 +92,9 @@ public:
protected:
vtkBlankStructuredGrid();
- ~vtkBlankStructuredGrid() VTK_OVERRIDE;
+ ~vtkBlankStructuredGrid() override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
double MinBlankingValue;
double MaxBlankingValue;
diff --git a/Filters/General/vtkBlankStructuredGridWithImage.h b/Filters/General/vtkBlankStructuredGridWithImage.h
index 8dd8a57f9c7b3f7898121197da0136059a0998c7..a7c47f9062cf1282ba399801d7bbd5f41b82997b 100644
--- a/Filters/General/vtkBlankStructuredGridWithImage.h
+++ b/Filters/General/vtkBlankStructuredGridWithImage.h
@@ -42,7 +42,7 @@ class VTKFILTERSGENERAL_EXPORT vtkBlankStructuredGridWithImage : public vtkStruc
public:
static vtkBlankStructuredGridWithImage *New();
vtkTypeMacro(vtkBlankStructuredGridWithImage,vtkStructuredGridAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -54,10 +54,10 @@ public:
protected:
vtkBlankStructuredGridWithImage();
- ~vtkBlankStructuredGridWithImage() VTK_OVERRIDE;
+ ~vtkBlankStructuredGridWithImage() override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
private:
vtkBlankStructuredGridWithImage(const vtkBlankStructuredGridWithImage&) VTK_DELETE_FUNCTION;
diff --git a/Filters/General/vtkBlockIdScalars.h b/Filters/General/vtkBlockIdScalars.h
index 5f7549434fbae08bb97d4bd281f66325234f72a5..3d37460fe3ff0178ec67b04b60cae4c12abe10e9 100644
--- a/Filters/General/vtkBlockIdScalars.h
+++ b/Filters/General/vtkBlockIdScalars.h
@@ -32,15 +32,15 @@ class VTKFILTERSGENERAL_EXPORT vtkBlockIdScalars : public vtkMultiBlockDataSetAl
public:
static vtkBlockIdScalars* New();
vtkTypeMacro(vtkBlockIdScalars, vtkMultiBlockDataSetAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkBlockIdScalars();
- ~vtkBlockIdScalars() VTK_OVERRIDE;
+ ~vtkBlockIdScalars() override;
int RequestData(vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
vtkDataObject* ColorBlock(vtkDataObject* input, int group);
diff --git a/Filters/General/vtkBooleanOperationPolyDataFilter.h b/Filters/General/vtkBooleanOperationPolyDataFilter.h
index 18d846ac50684d6cc8023facac30827f4ae134df..f172262d25a3367e1cced9cb25c287d38603d327 100644
--- a/Filters/General/vtkBooleanOperationPolyDataFilter.h
+++ b/Filters/General/vtkBooleanOperationPolyDataFilter.h
@@ -52,7 +52,7 @@ public:
vtkTypeMacro(vtkBooleanOperationPolyDataFilter,
vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
enum OperationType
{
@@ -96,7 +96,7 @@ public:
protected:
vtkBooleanOperationPolyDataFilter();
- ~vtkBooleanOperationPolyDataFilter() VTK_OVERRIDE;
+ ~vtkBooleanOperationPolyDataFilter() override;
/**
* Labels triangles in mesh as part of the intersection or union surface.
@@ -104,8 +104,8 @@ protected:
void SortPolyData(vtkPolyData* input, vtkIdList* intersectionList,
vtkIdList* unionList);
- int RequestData(vtkInformation*, vtkInformationVector**, vtkInformationVector*) VTK_OVERRIDE;
- int FillInputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
+ int RequestData(vtkInformation*, vtkInformationVector**, vtkInformationVector*) override;
+ int FillInputPortInformation(int, vtkInformation*) override;
private:
vtkBooleanOperationPolyDataFilter(const vtkBooleanOperationPolyDataFilter&) VTK_DELETE_FUNCTION;
diff --git a/Filters/General/vtkBoxClipDataSet.h b/Filters/General/vtkBoxClipDataSet.h
index a3fe799ca4cb743020294460c03f58267cc4b83b..950a1697e437c34f03dce6b62ecbd0f6143ccc07 100644
--- a/Filters/General/vtkBoxClipDataSet.h
+++ b/Filters/General/vtkBoxClipDataSet.h
@@ -66,7 +66,7 @@ class VTKFILTERSGENERAL_EXPORT vtkBoxClipDataSet : public vtkUnstructuredGridAlg
{
public:
vtkTypeMacro(vtkBoxClipDataSet,vtkUnstructuredGridAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Constructor of the clipping box. The initial box is (0,1,0,1,0,1).
@@ -148,7 +148,7 @@ public:
/**
* Return the mtime also considering the locator.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
//@{
/**
@@ -252,10 +252,10 @@ public:
vtkIdType cellId, vtkCellData **outCD);
protected:
vtkBoxClipDataSet();
- ~vtkBoxClipDataSet() VTK_OVERRIDE;
+ ~vtkBoxClipDataSet() override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
vtkIncrementalPointLocator *Locator;
int GenerateClipScalars;
diff --git a/Filters/General/vtkBrownianPoints.h b/Filters/General/vtkBrownianPoints.h
index 1d06bb7feda2f2c32ab81c6dc689412947a37829..3e800321ac7b6a0e1b3b81f31ed2a682c5cfe42d 100644
--- a/Filters/General/vtkBrownianPoints.h
+++ b/Filters/General/vtkBrownianPoints.h
@@ -39,7 +39,7 @@ public:
static vtkBrownianPoints *New();
vtkTypeMacro(vtkBrownianPoints,vtkDataSetAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -59,9 +59,9 @@ public:
protected:
vtkBrownianPoints();
- ~vtkBrownianPoints() VTK_OVERRIDE {}
+ ~vtkBrownianPoints() override {}
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
double MinimumSpeed;
double MaximumSpeed;
private:
diff --git a/Filters/General/vtkCellCenters.h b/Filters/General/vtkCellCenters.h
index 913e9ed38b5221cc2c16b1ede6ed98f3c72f54e7..885c655cb6182e67afdaa7c31085ac80c5ecce34 100644
--- a/Filters/General/vtkCellCenters.h
+++ b/Filters/General/vtkCellCenters.h
@@ -42,7 +42,7 @@ class VTKFILTERSGENERAL_EXPORT vtkCellCenters : public vtkPolyDataAlgorithm
{
public:
vtkTypeMacro(vtkCellCenters,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct object with vertex cell generation turned off.
@@ -61,10 +61,10 @@ public:
protected:
vtkCellCenters();
- ~vtkCellCenters() VTK_OVERRIDE {}
+ ~vtkCellCenters() override {}
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
int VertexCells;
private:
diff --git a/Filters/General/vtkCellDerivatives.h b/Filters/General/vtkCellDerivatives.h
index 9e7daeda6ca1afc23846d7e9308c95c8634dd1c0..b59e49c00f12140c876601d5d667e94f31310dd7 100644
--- a/Filters/General/vtkCellDerivatives.h
+++ b/Filters/General/vtkCellDerivatives.h
@@ -64,7 +64,7 @@ class VTKFILTERSGENERAL_EXPORT vtkCellDerivatives : public vtkDataSetAlgorithm
{
public:
vtkTypeMacro(vtkCellDerivatives,vtkDataSetAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct to compute the gradient of the scalars and vectors.
@@ -114,8 +114,8 @@ public:
protected:
vtkCellDerivatives();
- ~vtkCellDerivatives() VTK_OVERRIDE {}
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ ~vtkCellDerivatives() override {}
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
int VectorMode;
int TensorMode;
diff --git a/Filters/General/vtkCellTreeLocator.h b/Filters/General/vtkCellTreeLocator.h
index 93cce98b2908fad17b628b920cfcb8b2e363fd14..5e0113b82bfba5f2488464307dd792d89b33c9ab 100644
--- a/Filters/General/vtkCellTreeLocator.h
+++ b/Filters/General/vtkCellTreeLocator.h
@@ -52,7 +52,7 @@ class VTKFILTERSGENERAL_EXPORT vtkCellTreeLocator : public vtkAbstractCellLocato
class vtkCellTreeNode;
vtkTypeMacro(vtkCellTreeLocator,vtkAbstractCellLocator);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Constructor sets the maximum number of cells in a leaf to 8
@@ -65,7 +65,7 @@ class VTKFILTERSGENERAL_EXPORT vtkCellTreeLocator : public vtkAbstractCellLocato
* or -1 if not.
*/
vtkIdType FindCell(double pos[3], double vtkNotUsed, vtkGenericCell *cell, double pcoords[3],
- double* weights ) VTK_OVERRIDE;
+ double* weights ) override;
/**
* Return intersection point (if any) AND the cell which was intersected by
@@ -74,14 +74,14 @@ class VTKFILTERSGENERAL_EXPORT vtkCellTreeLocator : public vtkAbstractCellLocato
int IntersectWithLine(double a0[3], double a1[3], double tol,
double& t, double x[3], double pcoords[3],
int &subId, vtkIdType &cellId,
- vtkGenericCell *cell) VTK_OVERRIDE;
+ vtkGenericCell *cell) override;
/**
* Return a list of unique cell ids inside of a given bounding box. The
* user must provide the vtkIdList to populate. This method returns data
* only after the locator has been built.
*/
- void FindCellsWithinBounds(double *bbox, vtkIdList *cells) VTK_OVERRIDE;
+ void FindCellsWithinBounds(double *bbox, vtkIdList *cells) override;
/*
if the borland compiler is ever removed, we can use these declarations
@@ -96,7 +96,7 @@ class VTKFILTERSGENERAL_EXPORT vtkCellTreeLocator : public vtkAbstractCellLocato
*/
int IntersectWithLine(
double p1[3], double p2[3], double tol, double& t, double x[3],
- double pcoords[3], int &subId) VTK_OVERRIDE
+ double pcoords[3], int &subId) override
{
return this->Superclass::IntersectWithLine(p1, p2, tol, t, x, pcoords, subId);
}
@@ -109,14 +109,14 @@ class VTKFILTERSGENERAL_EXPORT vtkCellTreeLocator : public vtkAbstractCellLocato
*/
int IntersectWithLine(
double p1[3], double p2[3], double tol, double &t, double x[3],
- double pcoords[3], int &subId, vtkIdType &cellId) VTK_OVERRIDE;
+ double pcoords[3], int &subId, vtkIdType &cellId) override;
/**
* reimplemented from vtkAbstractCellLocator to support bad compilers
*/
int IntersectWithLine(
const double p1[3], const double p2[3],
- vtkPoints *points, vtkIdList *cellIds) VTK_OVERRIDE
+ vtkPoints *points, vtkIdList *cellIds) override
{
return this->Superclass::IntersectWithLine(p1, p2, points, cellIds);
}
@@ -124,19 +124,19 @@ class VTKFILTERSGENERAL_EXPORT vtkCellTreeLocator : public vtkAbstractCellLocato
/**
* reimplemented from vtkAbstractCellLocator to support bad compilers
*/
- vtkIdType FindCell(double x[3]) VTK_OVERRIDE
+ vtkIdType FindCell(double x[3]) override
{ return this->Superclass::FindCell(x); }
//@{
/**
* Satisfy vtkLocator abstract interface.
*/
- void FreeSearchStructure() VTK_OVERRIDE;
- void GenerateRepresentation(int level, vtkPolyData *pd) VTK_OVERRIDE;
+ void FreeSearchStructure() override;
+ void GenerateRepresentation(int level, vtkPolyData *pd) override;
virtual void BuildLocatorInternal();
virtual void BuildLocatorIfNeeded();
virtual void ForceBuildLocator();
- void BuildLocator() VTK_OVERRIDE;
+ void BuildLocator() override;
//@}
//@{
@@ -201,7 +201,7 @@ class VTKFILTERSGENERAL_EXPORT vtkCellTreeLocator : public vtkAbstractCellLocato
protected:
vtkCellTreeLocator();
- ~vtkCellTreeLocator() VTK_OVERRIDE;
+ ~vtkCellTreeLocator() override;
// Test ray against node BBox : clip t values to extremes
bool RayMinMaxT(const double origin[3],
diff --git a/Filters/General/vtkClipClosedSurface.h b/Filters/General/vtkClipClosedSurface.h
index bc3c89319bba9cc61f7d4e7e69a49b47a0e07b56..d9410517084a3dcc594042dc8986f8ca961ac65a 100644
--- a/Filters/General/vtkClipClosedSurface.h
+++ b/Filters/General/vtkClipClosedSurface.h
@@ -74,7 +74,7 @@ class VTKFILTERSGENERAL_EXPORT vtkClipClosedSurface : public vtkPolyDataAlgorith
public:
static vtkClipClosedSurface *New();
vtkTypeMacro(vtkClipClosedSurface,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -201,7 +201,7 @@ public:
protected:
vtkClipClosedSurface();
- ~vtkClipClosedSurface() VTK_OVERRIDE;
+ ~vtkClipClosedSurface() override;
vtkPlaneCollection *ClippingPlanes;
@@ -223,11 +223,11 @@ protected:
int ComputePipelineMTime(
vtkInformation* request, vtkInformationVector** inputVector,
vtkInformationVector* outputVector, int requestFromOutputPort,
- vtkMTimeType* mtime) VTK_OVERRIDE;
+ vtkMTimeType* mtime) override;
int RequestData(
vtkInformation* request, vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
/**
* Method for clipping lines and copying the scalar data.
diff --git a/Filters/General/vtkClipConvexPolyData.h b/Filters/General/vtkClipConvexPolyData.h
index 14ef1eaf0b5b595092a5281e45c61c22b5746240..ff3e9962cb331b721b12c1ff4589fabe3569c904 100644
--- a/Filters/General/vtkClipConvexPolyData.h
+++ b/Filters/General/vtkClipConvexPolyData.h
@@ -36,7 +36,7 @@ class VTKFILTERSGENERAL_EXPORT vtkClipConvexPolyData : public vtkPolyDataAlgorit
public:
static vtkClipConvexPolyData *New();
vtkTypeMacro(vtkClipConvexPolyData,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -51,16 +51,16 @@ public:
* Redefines this method, as this filter depends on time of its components
* (planes)
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
protected:
vtkClipConvexPolyData();
- ~vtkClipConvexPolyData() VTK_OVERRIDE;
+ ~vtkClipConvexPolyData() override;
// The method that does it all...
int RequestData(vtkInformation *request,
vtkInformationVector **inputVector,
- vtkInformationVector *outputVector) VTK_OVERRIDE;
+ vtkInformationVector *outputVector) override;
/**
* Clip the input with a given plane `p'.
diff --git a/Filters/General/vtkClipDataSet.h b/Filters/General/vtkClipDataSet.h
index 3ed3b91cfebaa1d50ee30a7f14420ebf6f9ee341..2fc1635be030d351ff5dd995212373ac92bbedd2 100644
--- a/Filters/General/vtkClipDataSet.h
+++ b/Filters/General/vtkClipDataSet.h
@@ -71,7 +71,7 @@ class VTKFILTERSGENERAL_EXPORT vtkClipDataSet : public vtkUnstructuredGridAlgori
{
public:
vtkTypeMacro(vtkClipDataSet,vtkUnstructuredGridAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct with user-specified implicit function; InsideOut turned off;
@@ -181,7 +181,7 @@ public:
/**
* Return the mtime also considering the locator and clip function.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
//@{
/**
@@ -195,10 +195,10 @@ public:
protected:
vtkClipDataSet(vtkImplicitFunction *cf=nullptr);
- ~vtkClipDataSet() VTK_OVERRIDE;
+ ~vtkClipDataSet() override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
vtkImplicitFunction *ClipFunction;
vtkIncrementalPointLocator *Locator;
diff --git a/Filters/General/vtkClipVolume.h b/Filters/General/vtkClipVolume.h
index 4212cd7aab5144921b627ec452b8a6ea6817c316..2e147007196c3676f7929060a9ed9431a0bf08cb 100644
--- a/Filters/General/vtkClipVolume.h
+++ b/Filters/General/vtkClipVolume.h
@@ -84,7 +84,7 @@ class VTKFILTERSGENERAL_EXPORT vtkClipVolume : public vtkUnstructuredGridAlgorit
{
public:
vtkTypeMacro(vtkClipVolume,vtkUnstructuredGridAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct with user-specified implicit function; InsideOut turned off;
@@ -192,16 +192,16 @@ public:
/**
* Return the mtime also considering the locator and clip function.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
protected:
vtkClipVolume(vtkImplicitFunction *cf=nullptr);
- ~vtkClipVolume() VTK_OVERRIDE;
+ ~vtkClipVolume() override;
- void ReportReferences(vtkGarbageCollector*) VTK_OVERRIDE;
+ void ReportReferences(vtkGarbageCollector*) override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
void ClipTets(double value, vtkTetra *clipTetra, vtkDataArray *clipScalars,
vtkDataArray *cellScalars, vtkIdList *tetraIds,
diff --git a/Filters/General/vtkCoincidentPoints.h b/Filters/General/vtkCoincidentPoints.h
index 7e680f0381ce8e4d3f6e881f572c9db1912633fc..91839cf0332600ae72018f95dbe7884cfadb566c 100644
--- a/Filters/General/vtkCoincidentPoints.h
+++ b/Filters/General/vtkCoincidentPoints.h
@@ -41,7 +41,7 @@ class VTKFILTERSGENERAL_EXPORT vtkCoincidentPoints : public vtkObject
public:
static vtkCoincidentPoints* New();
vtkTypeMacro(vtkCoincidentPoints,vtkObject);
- void PrintSelf( ostream& os, vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf( ostream& os, vtkIndent indent ) override;
/**
* Accumulates a set of Ids in a map where the point coordinate
@@ -93,7 +93,7 @@ public:
protected:
vtkCoincidentPoints();
- ~vtkCoincidentPoints() VTK_OVERRIDE;
+ ~vtkCoincidentPoints() override;
private:
vtkCoincidentPoints( const vtkCoincidentPoints& ) VTK_DELETE_FUNCTION;
diff --git a/Filters/General/vtkContourTriangulator.h b/Filters/General/vtkContourTriangulator.h
index 629cd00185ce31dcfab0a90fd0199bf7ac4a41b1..288775d0e983ef0d572ead7c0e6d305e6ff52a03 100644
--- a/Filters/General/vtkContourTriangulator.h
+++ b/Filters/General/vtkContourTriangulator.h
@@ -45,7 +45,7 @@ class VTKFILTERSGENERAL_EXPORT vtkContourTriangulator : public vtkPolyDataAlgori
public:
static vtkContourTriangulator *New();
vtkTypeMacro(vtkContourTriangulator,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -85,11 +85,11 @@ public:
protected:
vtkContourTriangulator();
- ~vtkContourTriangulator() VTK_OVERRIDE;
+ ~vtkContourTriangulator() override;
int RequestData(
vtkInformation* request, vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
int TriangulationError;
int TriangulationErrorDisplay;
diff --git a/Filters/General/vtkCountFaces.h b/Filters/General/vtkCountFaces.h
index 257e9ec8cea5b9e33311f5ff308d38801fbac572..31f96e2632c05b0d9030506fdae5a4ca27b3b9bb 100644
--- a/Filters/General/vtkCountFaces.h
+++ b/Filters/General/vtkCountFaces.h
@@ -33,7 +33,7 @@ class VTKFILTERSGENERAL_EXPORT vtkCountFaces: public vtkPassInputTypeAlgorithm
public:
static vtkCountFaces* New();
vtkTypeMacro(vtkCountFaces, vtkPassInputTypeAlgorithm)
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
//@{
/**
@@ -45,13 +45,13 @@ public:
protected:
vtkCountFaces();
- ~vtkCountFaces() VTK_OVERRIDE;
+ ~vtkCountFaces() override;
int RequestData(vtkInformation* request, vtkInformationVector **inInfoVec,
- vtkInformationVector *outInfoVec) VTK_OVERRIDE;
+ vtkInformationVector *outInfoVec) override;
- int FillOutputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillOutputPortInformation(int port, vtkInformation* info) override;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
char *OutputArrayName;
diff --git a/Filters/General/vtkCountVertices.h b/Filters/General/vtkCountVertices.h
index af71a529bd88c74da2327397a5beff5a3aa59b42..8be614d7f9223c8c82d481f84a256d2065e2b2e3 100644
--- a/Filters/General/vtkCountVertices.h
+++ b/Filters/General/vtkCountVertices.h
@@ -34,7 +34,7 @@ class VTKFILTERSGENERAL_EXPORT vtkCountVertices: public vtkPassInputTypeAlgorith
public:
static vtkCountVertices* New();
vtkTypeMacro(vtkCountVertices, vtkPassInputTypeAlgorithm)
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
//@{
/**
@@ -46,13 +46,13 @@ public:
protected:
vtkCountVertices();
- ~vtkCountVertices() VTK_OVERRIDE;
+ ~vtkCountVertices() override;
int RequestData(vtkInformation* request, vtkInformationVector **inInfoVec,
- vtkInformationVector *outInfoVec) VTK_OVERRIDE;
+ vtkInformationVector *outInfoVec) override;
- int FillOutputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillOutputPortInformation(int port, vtkInformation* info) override;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
char *OutputArrayName;
diff --git a/Filters/General/vtkCursor2D.h b/Filters/General/vtkCursor2D.h
index 9a8d65d92067407fa18de81542366a0b212eeda2..b89acb152b54ea0c2b6c3729c5276efb93368d6e 100644
--- a/Filters/General/vtkCursor2D.h
+++ b/Filters/General/vtkCursor2D.h
@@ -38,7 +38,7 @@ class VTKFILTERSGENERAL_EXPORT vtkCursor2D : public vtkPolyDataAlgorithm
{
public:
vtkTypeMacro(vtkCursor2D,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct with model bounds = (-10,10,-10,10), focal point = (0,0),
@@ -144,9 +144,9 @@ public:
protected:
vtkCursor2D();
- ~vtkCursor2D() VTK_OVERRIDE {}
+ ~vtkCursor2D() override {}
- int RequestData(vtkInformation*, vtkInformationVector**, vtkInformationVector*) VTK_OVERRIDE;
+ int RequestData(vtkInformation*, vtkInformationVector**, vtkInformationVector*) override;
double ModelBounds[6];
double FocalPoint[3];
diff --git a/Filters/General/vtkCursor3D.h b/Filters/General/vtkCursor3D.h
index 2493d9f70a65fc5ace529875259c6e1e003c9c7c..57d6de1253303633b1a7bc7a4b888758f3d9810a 100644
--- a/Filters/General/vtkCursor3D.h
+++ b/Filters/General/vtkCursor3D.h
@@ -37,7 +37,7 @@ class VTKFILTERSGENERAL_EXPORT vtkCursor3D : public vtkPolyDataAlgorithm
{
public:
vtkTypeMacro(vtkCursor3D,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct with model bounds = (-1,1,-1,1,-1,1), focal point = (0,0,0),
@@ -155,9 +155,9 @@ public:
protected:
vtkCursor3D();
- ~vtkCursor3D() VTK_OVERRIDE;
+ ~vtkCursor3D() override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
vtkPolyData *Focus;
double ModelBounds[6];
diff --git a/Filters/General/vtkCurvatures.h b/Filters/General/vtkCurvatures.h
index 13dcaecf354c8c417c54f9004b95f6e366973e46..163bc0a8155b2e090a531a79beb0b036c347b561 100644
--- a/Filters/General/vtkCurvatures.h
+++ b/Filters/General/vtkCurvatures.h
@@ -75,7 +75,7 @@ class VTKFILTERSGENERAL_EXPORT vtkCurvatures : public vtkPolyDataAlgorithm
{
public:
vtkTypeMacro(vtkCurvatures,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct with curvature type set to Gauss
@@ -116,7 +116,7 @@ protected:
vtkCurvatures();
// Usual data generation method
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
/**
* discrete Gauss curvature (K) computation,
diff --git a/Filters/General/vtkDataSetGradient.h b/Filters/General/vtkDataSetGradient.h
index ab8e110f7e4864c029143b983663778cd0a48a48..d8d630ad2365674fdfde0cd7c38cd7374d70bf3f 100644
--- a/Filters/General/vtkDataSetGradient.h
+++ b/Filters/General/vtkDataSetGradient.h
@@ -39,7 +39,7 @@ class VTKFILTERSGENERAL_EXPORT vtkDataSetGradient : public vtkDataSetAlgorithm
public:
static vtkDataSetGradient* New();
vtkTypeMacro(vtkDataSetGradient,vtkDataSetAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -51,9 +51,9 @@ class VTKFILTERSGENERAL_EXPORT vtkDataSetGradient : public vtkDataSetAlgorithm
protected:
vtkDataSetGradient ();
- ~vtkDataSetGradient() VTK_OVERRIDE;
+ ~vtkDataSetGradient() override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
char* ResultArrayName;
diff --git a/Filters/General/vtkDataSetGradientPrecompute.h b/Filters/General/vtkDataSetGradientPrecompute.h
index c454c608746bd17ba4739b5cefc522a6db988dff..232e499b0dc0f5c2b996389867ce6dcffa62e9f8 100644
--- a/Filters/General/vtkDataSetGradientPrecompute.h
+++ b/Filters/General/vtkDataSetGradientPrecompute.h
@@ -38,15 +38,15 @@ class VTKFILTERSGENERAL_EXPORT vtkDataSetGradientPrecompute : public vtkDataSetA
public:
static vtkDataSetGradientPrecompute* New();
vtkTypeMacro(vtkDataSetGradientPrecompute,vtkDataSetAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static int GradientPrecompute(vtkDataSet* ds);
protected:
vtkDataSetGradientPrecompute ();
- ~vtkDataSetGradientPrecompute () VTK_OVERRIDE;
+ ~vtkDataSetGradientPrecompute () override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
private:
vtkDataSetGradientPrecompute(const vtkDataSetGradientPrecompute&) VTK_DELETE_FUNCTION;
diff --git a/Filters/General/vtkDataSetTriangleFilter.h b/Filters/General/vtkDataSetTriangleFilter.h
index 18708c3452231752971440bce5282ab1a698a6a5..3f826b7bc9a4719c6c60796ffb8dfffb732445bb 100644
--- a/Filters/General/vtkDataSetTriangleFilter.h
+++ b/Filters/General/vtkDataSetTriangleFilter.h
@@ -44,7 +44,7 @@ class VTKFILTERSGENERAL_EXPORT vtkDataSetTriangleFilter : public vtkUnstructured
public:
static vtkDataSetTriangleFilter *New();
vtkTypeMacro(vtkDataSetTriangleFilter,vtkUnstructuredGridAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -58,12 +58,12 @@ public:
protected:
vtkDataSetTriangleFilter();
- ~vtkDataSetTriangleFilter() VTK_OVERRIDE;
+ ~vtkDataSetTriangleFilter() override;
// Usual data generation method
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
// Used to triangulate 3D cells
vtkOrderedTriangulator *Triangulator;
diff --git a/Filters/General/vtkDeformPointSet.h b/Filters/General/vtkDeformPointSet.h
index 3231b6ab14e1c2e8c8a2f881035bb9a3c6825b8a..9868cb51193afe774f16eee021fc1f010a41e9e0 100644
--- a/Filters/General/vtkDeformPointSet.h
+++ b/Filters/General/vtkDeformPointSet.h
@@ -80,7 +80,7 @@ public:
*/
static vtkDeformPointSet *New();
vtkTypeMacro(vtkDeformPointSet,vtkPointSetAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -114,7 +114,7 @@ public:
protected:
vtkDeformPointSet();
- ~vtkDeformPointSet() VTK_OVERRIDE;
+ ~vtkDeformPointSet() override;
int InitializeWeights;
@@ -126,7 +126,7 @@ protected:
vtkSmartPointer<vtkDoubleArray> Weights;
int RequestData(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
private:
vtkDeformPointSet(const vtkDeformPointSet&) VTK_DELETE_FUNCTION;
diff --git a/Filters/General/vtkDensifyPolyData.h b/Filters/General/vtkDensifyPolyData.h
index 113665c1c695d09fc852bb9f83586c191cc98ebf..0261581d5c4fa85b73a860b15e13b978c6306979 100644
--- a/Filters/General/vtkDensifyPolyData.h
+++ b/Filters/General/vtkDensifyPolyData.h
@@ -40,7 +40,7 @@ class VTKFILTERSGENERAL_EXPORT vtkDensifyPolyData : public vtkPolyDataAlgorithm
{
public:
vtkTypeMacro(vtkDensifyPolyData,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkDensifyPolyData *New();
//@{
@@ -53,16 +53,16 @@ public:
protected:
vtkDensifyPolyData();
- ~vtkDensifyPolyData() VTK_OVERRIDE;
+ ~vtkDensifyPolyData() override;
int RequestData(vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
unsigned int NumberOfSubdivisions;
private:
- int FillInputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
+ int FillInputPortInformation(int, vtkInformation*) override;
vtkDensifyPolyData(const vtkDensifyPolyData&) VTK_DELETE_FUNCTION;
void operator=(const vtkDensifyPolyData&) VTK_DELETE_FUNCTION;
diff --git a/Filters/General/vtkDicer.h b/Filters/General/vtkDicer.h
index 2eb9ba37cc2342596d0b64edca0d7a612862a98a..8d26fe7dddb2a8725ba6955fb93efa54bbae3b95 100644
--- a/Filters/General/vtkDicer.h
+++ b/Filters/General/vtkDicer.h
@@ -55,7 +55,7 @@ class VTKFILTERSGENERAL_EXPORT vtkDicer : public vtkDataSetAlgorithm
{
public:
vtkTypeMacro(vtkDicer,vtkDataSetAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -130,7 +130,7 @@ public:
protected:
vtkDicer();
- ~vtkDicer() VTK_OVERRIDE {}
+ ~vtkDicer() override {}
virtual void UpdatePieceMeasures(vtkDataSet *input);
diff --git a/Filters/General/vtkDiscreteMarchingCubes.h b/Filters/General/vtkDiscreteMarchingCubes.h
index fdbde085f2194afebff56b3cce5acb44f3bcec43..3e7322960d4663e0e14569a28de3bc9b1247196b 100644
--- a/Filters/General/vtkDiscreteMarchingCubes.h
+++ b/Filters/General/vtkDiscreteMarchingCubes.h
@@ -87,10 +87,10 @@ public:
protected:
vtkDiscreteMarchingCubes();
- ~vtkDiscreteMarchingCubes() VTK_OVERRIDE;
+ ~vtkDiscreteMarchingCubes() override;
int RequestData(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
int ComputeAdjacentScalars;
private:
diff --git a/Filters/General/vtkDistancePolyDataFilter.h b/Filters/General/vtkDistancePolyDataFilter.h
index c7537722333a10a4375846496edece115d1cecb4..afa7b3a305dcf06a2ac0b2183dbe21be77179c2e 100644
--- a/Filters/General/vtkDistancePolyDataFilter.h
+++ b/Filters/General/vtkDistancePolyDataFilter.h
@@ -45,7 +45,7 @@ class VTKFILTERSGENERAL_EXPORT vtkDistancePolyDataFilter : public vtkPolyDataAlg
public:
static vtkDistancePolyDataFilter *New();
vtkTypeMacro(vtkDistancePolyDataFilter, vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -87,9 +87,9 @@ public:
protected:
vtkDistancePolyDataFilter();
- ~vtkDistancePolyDataFilter() VTK_OVERRIDE;
+ ~vtkDistancePolyDataFilter() override;
- int RequestData(vtkInformation*, vtkInformationVector**, vtkInformationVector*) VTK_OVERRIDE;
+ int RequestData(vtkInformation*, vtkInformationVector**, vtkInformationVector*) override;
void GetPolyDataDistance(vtkPolyData*, vtkPolyData*);
private:
diff --git a/Filters/General/vtkEdgePoints.h b/Filters/General/vtkEdgePoints.h
index dec0cc6d1ab59ece3f9a35df5a6103bdf2b0d335..9b94ab37224e215623f5d4b8c6c307ecbdb3f6c3 100644
--- a/Filters/General/vtkEdgePoints.h
+++ b/Filters/General/vtkEdgePoints.h
@@ -39,7 +39,7 @@ class VTKFILTERSGENERAL_EXPORT vtkEdgePoints : public vtkPolyDataAlgorithm
{
public:
vtkTypeMacro(vtkEdgePoints,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct object with contour value of 0.0.
@@ -56,10 +56,10 @@ public:
protected:
vtkEdgePoints();
- ~vtkEdgePoints() VTK_OVERRIDE;
+ ~vtkEdgePoints() override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
double Value;
vtkMergePoints *Locator;
diff --git a/Filters/General/vtkExtractArray.h b/Filters/General/vtkExtractArray.h
index 742d3e85c9cea3b9047eef9a9b9438afcf0db53b..d5003713948fd13acbe6d9e60b0a1a957f58921b 100644
--- a/Filters/General/vtkExtractArray.h
+++ b/Filters/General/vtkExtractArray.h
@@ -40,7 +40,7 @@ class VTKFILTERSGENERAL_EXPORT vtkExtractArray : public vtkArrayDataAlgorithm
public:
static vtkExtractArray* New();
vtkTypeMacro(vtkExtractArray, vtkArrayDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -52,14 +52,14 @@ public:
protected:
vtkExtractArray();
- ~vtkExtractArray() VTK_OVERRIDE;
+ ~vtkExtractArray() override;
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
int RequestData(
vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
private:
vtkExtractArray(const vtkExtractArray&) VTK_DELETE_FUNCTION;
diff --git a/Filters/General/vtkExtractSelectedFrustum.h b/Filters/General/vtkExtractSelectedFrustum.h
index b939e75d3bf2de38b18b4574068788aaa35da85e..5c482aab91e8d654266f1665d9aede665f44b142 100644
--- a/Filters/General/vtkExtractSelectedFrustum.h
+++ b/Filters/General/vtkExtractSelectedFrustum.h
@@ -51,12 +51,12 @@ class VTKFILTERSGENERAL_EXPORT vtkExtractSelectedFrustum : public vtkExtractSele
public:
static vtkExtractSelectedFrustum *New();
vtkTypeMacro(vtkExtractSelectedFrustum, vtkExtractSelectionBase);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Return the MTime taking into account changes to the Frustum
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
//@{
/**
@@ -128,16 +128,16 @@ public:
protected:
vtkExtractSelectedFrustum(vtkPlanes *f=nullptr);
- ~vtkExtractSelectedFrustum() VTK_OVERRIDE;
+ ~vtkExtractSelectedFrustum() override;
// sets up output dataset
int RequestDataObject(vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
//execution
int RequestData(vtkInformation *,
- vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector **, vtkInformationVector *) override;
int ABoxFrustumIsect(double bounds[], vtkCell *cell);
int FrustumClipPolygon(int nverts,
double *ivlist, double *wvlist, double *ovlist);
diff --git a/Filters/General/vtkExtractSelectionBase.h b/Filters/General/vtkExtractSelectionBase.h
index 286be513f4ebb6896492ee4475bee28391cdefd7..d41a528f64cf8c4535253e357fd6b03558a98aa0 100644
--- a/Filters/General/vtkExtractSelectionBase.h
+++ b/Filters/General/vtkExtractSelectionBase.h
@@ -31,7 +31,7 @@ class VTKFILTERSGENERAL_EXPORT vtkExtractSelectionBase : public vtkDataObjectAlg
{
public:
vtkTypeMacro(vtkExtractSelectionBase, vtkDataObjectAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Convenience method to specify the selection connection (2nd input
@@ -55,16 +55,16 @@ public:
protected:
vtkExtractSelectionBase();
- ~vtkExtractSelectionBase() VTK_OVERRIDE;
+ ~vtkExtractSelectionBase() override;
/**
* Sets up empty output dataset
*/
int RequestDataObject(vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
int PreserveTopology;
private:
diff --git a/Filters/General/vtkGradientFilter.h b/Filters/General/vtkGradientFilter.h
index 1aec999e347ce9485b4c835ce56de92e96c4b249..6b3a5cf7aa457955cea18cd37ea9cd015bb687ca 100644
--- a/Filters/General/vtkGradientFilter.h
+++ b/Filters/General/vtkGradientFilter.h
@@ -51,7 +51,7 @@ class VTKFILTERSGENERAL_EXPORT vtkGradientFilter : public vtkDataSetAlgorithm
{
public:
vtkTypeMacro(vtkGradientFilter, vtkDataSetAlgorithm);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
/// Options to choose what cells contribute to the gradient calculation
enum ContributingCellEnum {
@@ -206,13 +206,13 @@ public:
protected:
vtkGradientFilter();
- ~vtkGradientFilter() VTK_OVERRIDE;
+ ~vtkGradientFilter() override;
int RequestUpdateExtent(vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
int RequestData(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
/**
* Compute the gradients for grids that are not a vtkImageData,
diff --git a/Filters/General/vtkGraphLayoutFilter.h b/Filters/General/vtkGraphLayoutFilter.h
index a695f85a7e7f0dfe15c19cc719d3c79817039a5b..e38245cdc1afcf7d61379e7b3c310ce9646c0ab9 100644
--- a/Filters/General/vtkGraphLayoutFilter.h
+++ b/Filters/General/vtkGraphLayoutFilter.h
@@ -43,7 +43,7 @@ public:
static vtkGraphLayoutFilter *New();
vtkTypeMacro(vtkGraphLayoutFilter,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -95,9 +95,9 @@ public:
protected:
vtkGraphLayoutFilter();
- ~vtkGraphLayoutFilter() VTK_OVERRIDE {}
+ ~vtkGraphLayoutFilter() override {}
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
double GraphBounds[6];
int AutomaticBoundsComputation; //Boolean controls automatic bounds calc.
diff --git a/Filters/General/vtkGraphToPoints.h b/Filters/General/vtkGraphToPoints.h
index d8018ed35799742ada5fdabaca4d4efc9342df76..80b0998cc3bed0b2bd728df2d5ee0f44b68d2980 100644
--- a/Filters/General/vtkGraphToPoints.h
+++ b/Filters/General/vtkGraphToPoints.h
@@ -39,21 +39,21 @@ class VTKFILTERSGENERAL_EXPORT vtkGraphToPoints : public vtkPolyDataAlgorithm
public:
static vtkGraphToPoints *New();
vtkTypeMacro(vtkGraphToPoints,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkGraphToPoints();
- ~vtkGraphToPoints() VTK_OVERRIDE {}
+ ~vtkGraphToPoints() override {}
/**
* Convert the vtkGraph into vtkPolyData.
*/
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
/**
* Set the input type of the algorithm to vtkGraph.
*/
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
private:
vtkGraphToPoints(const vtkGraphToPoints&) VTK_DELETE_FUNCTION;
diff --git a/Filters/General/vtkGraphWeightEuclideanDistanceFilter.h b/Filters/General/vtkGraphWeightEuclideanDistanceFilter.h
index 1b3fe8d88711054d42ffcd3bff96d18d7dc79ea7..76428333274496e79fe01347381930e515aab080 100644
--- a/Filters/General/vtkGraphWeightEuclideanDistanceFilter.h
+++ b/Filters/General/vtkGraphWeightEuclideanDistanceFilter.h
@@ -34,22 +34,22 @@ class VTKFILTERSGENERAL_EXPORT vtkGraphWeightEuclideanDistanceFilter : public vt
public:
static vtkGraphWeightEuclideanDistanceFilter *New();
vtkTypeMacro(vtkGraphWeightEuclideanDistanceFilter, vtkGraphWeightFilter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkGraphWeightEuclideanDistanceFilter(){}
- ~vtkGraphWeightEuclideanDistanceFilter() VTK_OVERRIDE {}
+ ~vtkGraphWeightEuclideanDistanceFilter() override {}
/**
* Compute the Euclidean distance between the Points defined for the
* verticies of a specified 'edge'.
*/
- float ComputeWeight(vtkGraph* const graph, const vtkEdgeType& edge) const VTK_OVERRIDE;
+ float ComputeWeight(vtkGraph* const graph, const vtkEdgeType& edge) const override;
/**
* Ensure that 'graph' has Points defined.
*/
- bool CheckRequirements(vtkGraph* const graph) const VTK_OVERRIDE;
+ bool CheckRequirements(vtkGraph* const graph) const override;
private:
vtkGraphWeightEuclideanDistanceFilter(const vtkGraphWeightEuclideanDistanceFilter&) VTK_DELETE_FUNCTION;
diff --git a/Filters/General/vtkGraphWeightFilter.h b/Filters/General/vtkGraphWeightFilter.h
index cdfc4a499bb6e4aca16ea90c6f1317b88ad61b1b..9bd6d312231a85a29488de50b6c11dcd33c2a090 100644
--- a/Filters/General/vtkGraphWeightFilter.h
+++ b/Filters/General/vtkGraphWeightFilter.h
@@ -40,15 +40,15 @@ class VTKFILTERSGENERAL_EXPORT vtkGraphWeightFilter : public vtkGraphAlgorithm
{
public:
vtkTypeMacro(vtkGraphWeightFilter, vtkGraphAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkGraphWeightFilter(){}
- ~vtkGraphWeightFilter() VTK_OVERRIDE {}
+ ~vtkGraphWeightFilter() override {}
int RequestData(vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
/**
* Compute the weight on the 'graph' for a particular 'edge'.
diff --git a/Filters/General/vtkHierarchicalDataLevelFilter.h b/Filters/General/vtkHierarchicalDataLevelFilter.h
index d642319b9bcceb973b3cfc2f760ef4330082b2bf..22c731bf94341ce57126ae61c4c91df002ec4390 100644
--- a/Filters/General/vtkHierarchicalDataLevelFilter.h
+++ b/Filters/General/vtkHierarchicalDataLevelFilter.h
@@ -32,7 +32,7 @@ class VTKFILTERSGENERAL_EXPORT vtkHierarchicalDataLevelFilter : public vtkLevelI
{
public:
vtkTypeMacro(vtkHierarchicalDataLevelFilter,vtkLevelIdScalars);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct object with PointIds and CellIds on; and ids being generated
@@ -42,7 +42,7 @@ public:
protected:
vtkHierarchicalDataLevelFilter();
- ~vtkHierarchicalDataLevelFilter() VTK_OVERRIDE;
+ ~vtkHierarchicalDataLevelFilter() override;
private:
vtkHierarchicalDataLevelFilter(const vtkHierarchicalDataLevelFilter&) VTK_DELETE_FUNCTION;
diff --git a/Filters/General/vtkHyperStreamline.h b/Filters/General/vtkHyperStreamline.h
index 4f88b8235f3a1a1fbcd82dccf14828f99073924d..707feb50ade7ce6238c724c512d6e24b1a23eb81 100644
--- a/Filters/General/vtkHyperStreamline.h
+++ b/Filters/General/vtkHyperStreamline.h
@@ -66,7 +66,7 @@ class VTKFILTERSGENERAL_EXPORT vtkHyperStreamline : public vtkPolyDataAlgorithm
{
public:
vtkTypeMacro(vtkHyperStreamline,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct object with initial starting position (0,0,0); integration
@@ -246,13 +246,13 @@ public:
protected:
vtkHyperStreamline();
- ~vtkHyperStreamline() VTK_OVERRIDE;
+ ~vtkHyperStreamline() override;
// Integrate data
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
int BuildTube(vtkDataSet *input, vtkPolyData *output);
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
// Flag indicates where streamlines start from (either position or location)
int StartFrom;
diff --git a/Filters/General/vtkIconGlyphFilter.h b/Filters/General/vtkIconGlyphFilter.h
index 0b91f0d4adf63e1379424a72eed2cf673eeb57dc..9b110fd64ff9e2a143e6a5a8f22878cf3a90f961 100644
--- a/Filters/General/vtkIconGlyphFilter.h
+++ b/Filters/General/vtkIconGlyphFilter.h
@@ -65,7 +65,7 @@ public:
*/
static vtkIconGlyphFilter *New();
vtkTypeMacro(vtkIconGlyphFilter,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -161,11 +161,11 @@ public:
protected:
vtkIconGlyphFilter();
- ~vtkIconGlyphFilter() VTK_OVERRIDE;
+ ~vtkIconGlyphFilter() override;
int RequestData(vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
int IconSize[2]; // Size in pixels of an icon in an icon sheet
int IconSheetSize[2]; // Size in pixels of the icon sheet
diff --git a/Filters/General/vtkImageDataToPointSet.h b/Filters/General/vtkImageDataToPointSet.h
index fa6bd67567f485e643f7cacd5a2abf3bf904e40b..57e8ebbbf234fe75af7ef600b8b2b84aaa5b788f 100644
--- a/Filters/General/vtkImageDataToPointSet.h
+++ b/Filters/General/vtkImageDataToPointSet.h
@@ -43,19 +43,19 @@ class VTKFILTERSGENERAL_EXPORT vtkImageDataToPointSet : public vtkStructuredGrid
{
public:
vtkTypeMacro(vtkImageDataToPointSet, vtkStructuredGridAlgorithm);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
static vtkImageDataToPointSet *New();
protected:
vtkImageDataToPointSet();
- ~vtkImageDataToPointSet() VTK_OVERRIDE;
+ ~vtkImageDataToPointSet() override;
int RequestData(vtkInformation *request,
vtkInformationVector **inputVector,
- vtkInformationVector *outputVector) VTK_OVERRIDE;
+ vtkInformationVector *outputVector) override;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
private:
vtkImageDataToPointSet(const vtkImageDataToPointSet &) VTK_DELETE_FUNCTION;
diff --git a/Filters/General/vtkImageMarchingCubes.h b/Filters/General/vtkImageMarchingCubes.h
index 38706502c7a6f9644506dfa9a71637b70806e732..ee98585276c675592731a053457818b52de29bae 100644
--- a/Filters/General/vtkImageMarchingCubes.h
+++ b/Filters/General/vtkImageMarchingCubes.h
@@ -51,7 +51,7 @@ class VTKFILTERSGENERAL_EXPORT vtkImageMarchingCubes : public vtkPolyDataAlgorit
public:
static vtkImageMarchingCubes *New();
vtkTypeMacro(vtkImageMarchingCubes,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -70,7 +70,7 @@ public:
/**
* Because we delegate to vtkContourValues & refer to vtkImplicitFunction
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
//@{
/**
@@ -133,7 +133,7 @@ public:
protected:
vtkImageMarchingCubes();
- ~vtkImageMarchingCubes() VTK_OVERRIDE;
+ ~vtkImageMarchingCubes() override;
int NumberOfSlicesPerChunk;
vtkIdType InputMemoryLimit;
@@ -146,8 +146,8 @@ protected:
int LocatorMinX;
int LocatorMinY;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
void March(vtkImageData *inData, int chunkMin, int chunkMax,
int numContours, double *values);
diff --git a/Filters/General/vtkInterpolateDataSetAttributes.h b/Filters/General/vtkInterpolateDataSetAttributes.h
index f149ee56a0086ff6a96b6a0cf7fce1eadb1a13f7..cacddbf21e374d852dc2ab1e11d687671d944838 100644
--- a/Filters/General/vtkInterpolateDataSetAttributes.h
+++ b/Filters/General/vtkInterpolateDataSetAttributes.h
@@ -43,7 +43,7 @@ class VTKFILTERSGENERAL_EXPORT vtkInterpolateDataSetAttributes : public vtkDataS
public:
static vtkInterpolateDataSetAttributes *New();
vtkTypeMacro(vtkInterpolateDataSetAttributes,vtkDataSetAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Return the list of inputs to this filter.
@@ -60,12 +60,12 @@ public:
protected:
vtkInterpolateDataSetAttributes();
- ~vtkInterpolateDataSetAttributes() VTK_OVERRIDE;
+ ~vtkInterpolateDataSetAttributes() override;
- void ReportReferences(vtkGarbageCollector*) VTK_OVERRIDE;
+ void ReportReferences(vtkGarbageCollector*) override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
vtkDataSetCollection *InputList; // list of data sets to interpolate
double T; // interpolation parameter
diff --git a/Filters/General/vtkInterpolatingSubdivisionFilter.h b/Filters/General/vtkInterpolatingSubdivisionFilter.h
index 548981c246458d8bc070c08b3ba0d2f5b93a7ff4..c35533de1218cce23ff9b5a6a35b02dbc987437e 100644
--- a/Filters/General/vtkInterpolatingSubdivisionFilter.h
+++ b/Filters/General/vtkInterpolatingSubdivisionFilter.h
@@ -45,13 +45,13 @@ class VTKFILTERSGENERAL_EXPORT vtkInterpolatingSubdivisionFilter : public vtkSub
{
public:
vtkTypeMacro(vtkInterpolatingSubdivisionFilter, vtkSubdivisionFilter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkInterpolatingSubdivisionFilter();
- ~vtkInterpolatingSubdivisionFilter() VTK_OVERRIDE {}
+ ~vtkInterpolatingSubdivisionFilter() override {}
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
virtual int GenerateSubdivisionPoints (vtkPolyData *inputDS, vtkIntArray *edgeData, vtkPoints *outputPts, vtkPointData *outputPD) = 0;
void GenerateSubdivisionCells (vtkPolyData *inputDS, vtkIntArray *edgeData, vtkCellArray *outputPolys, vtkCellData *outputCD);
int FindEdge (vtkPolyData *mesh, vtkIdType cellId, vtkIdType p1,
diff --git a/Filters/General/vtkIntersectionPolyDataFilter.h b/Filters/General/vtkIntersectionPolyDataFilter.h
index 704e5dd9a5398ebc00db86c4bbd35d29d302d532..87c53f5bb0dae76a3fda21cbbb674abbe0fd58ba 100644
--- a/Filters/General/vtkIntersectionPolyDataFilter.h
+++ b/Filters/General/vtkIntersectionPolyDataFilter.h
@@ -69,7 +69,7 @@ class VTKFILTERSGENERAL_EXPORT vtkIntersectionPolyDataFilter :
public:
static vtkIntersectionPolyDataFilter *New();
vtkTypeMacro(vtkIntersectionPolyDataFilter, vtkPolyDataAlgorithm);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
//@{
/**
@@ -177,11 +177,11 @@ public:
protected:
vtkIntersectionPolyDataFilter(); //Constructor
- ~vtkIntersectionPolyDataFilter() VTK_OVERRIDE; //Destructor
+ ~vtkIntersectionPolyDataFilter() override; //Destructor
int RequestData(vtkInformation*, vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE; //Update
- int FillInputPortInformation(int, vtkInformation*) VTK_OVERRIDE; //Input,Output
+ vtkInformationVector*) override; //Update
+ int FillInputPortInformation(int, vtkInformation*) override; //Input,Output
private:
vtkIntersectionPolyDataFilter(const vtkIntersectionPolyDataFilter&) VTK_DELETE_FUNCTION;
diff --git a/Filters/General/vtkLevelIdScalars.h b/Filters/General/vtkLevelIdScalars.h
index 922c8c6655be16ae8f734920b86ace4ac513f757..bf97859eaad1386b797d811c3e32932d900cee8f 100644
--- a/Filters/General/vtkLevelIdScalars.h
+++ b/Filters/General/vtkLevelIdScalars.h
@@ -31,11 +31,11 @@ class VTKFILTERSGENERAL_EXPORT vtkLevelIdScalars :
public:
static vtkLevelIdScalars* New();
vtkTypeMacro(vtkLevelIdScalars,vtkOverlappingAMRLevelIdScalars);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkLevelIdScalars();
- ~vtkLevelIdScalars() VTK_OVERRIDE;
+ ~vtkLevelIdScalars() override;
private:
vtkLevelIdScalars(const vtkLevelIdScalars&) VTK_DELETE_FUNCTION;
diff --git a/Filters/General/vtkLinkEdgels.h b/Filters/General/vtkLinkEdgels.h
index 41883f631a6ad9994c6de4653b62794fb3c0f375..d4e29dad851e0e834b382e81ffb84a161eea2b99 100644
--- a/Filters/General/vtkLinkEdgels.h
+++ b/Filters/General/vtkLinkEdgels.h
@@ -60,7 +60,7 @@ class VTKFILTERSGENERAL_EXPORT vtkLinkEdgels : public vtkPolyDataAlgorithm
{
public:
vtkTypeMacro(vtkLinkEdgels,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct instance of vtkLinkEdgels with GradientThreshold set to
@@ -94,10 +94,10 @@ public:
protected:
vtkLinkEdgels();
- ~vtkLinkEdgels() VTK_OVERRIDE {}
+ ~vtkLinkEdgels() override {}
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
void LinkEdgels(int xdim, int ydim,double *image, vtkDataArray *inVectors,
vtkCellArray *newLines, vtkPoints *newPts,
diff --git a/Filters/General/vtkLoopBooleanPolyDataFilter.h b/Filters/General/vtkLoopBooleanPolyDataFilter.h
index b799e19cf41ac9ab19771908f4fc73b86b41b8a3..6b07da8662bb58faa8a3daa6b1d9b69c0faad1d3 100644
--- a/Filters/General/vtkLoopBooleanPolyDataFilter.h
+++ b/Filters/General/vtkLoopBooleanPolyDataFilter.h
@@ -55,7 +55,7 @@ public:
vtkTypeMacro(vtkLoopBooleanPolyDataFilter,
vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -125,11 +125,11 @@ public:
protected:
vtkLoopBooleanPolyDataFilter();
- ~vtkLoopBooleanPolyDataFilter() VTK_OVERRIDE;
+ ~vtkLoopBooleanPolyDataFilter() override;
int RequestData(vtkInformation*, vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
- int FillInputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
+ int FillInputPortInformation(int, vtkInformation*) override;
private:
vtkLoopBooleanPolyDataFilter(const vtkLoopBooleanPolyDataFilter&) VTK_DELETE_FUNCTION;
diff --git a/Filters/General/vtkMarchingContourFilter.h b/Filters/General/vtkMarchingContourFilter.h
index cda447995810b378b76df700ece229e9a3344f2b..0aa4353de686e5aa798072114eca05731d98f715 100644
--- a/Filters/General/vtkMarchingContourFilter.h
+++ b/Filters/General/vtkMarchingContourFilter.h
@@ -66,7 +66,7 @@ class VTKFILTERSGENERAL_EXPORT vtkMarchingContourFilter : public vtkPolyDataAlgo
{
public:
vtkTypeMacro(vtkMarchingContourFilter,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct object with initial range (0,1) and single contour value
@@ -91,7 +91,7 @@ public:
/**
* Modified GetMTime Because we delegate to vtkContourValues
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
//@{
/**
@@ -154,10 +154,10 @@ public:
protected:
vtkMarchingContourFilter();
- ~vtkMarchingContourFilter() VTK_OVERRIDE;
+ ~vtkMarchingContourFilter() override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
vtkContourValues *ContourValues;
int ComputeNormals;
diff --git a/Filters/General/vtkMatricizeArray.h b/Filters/General/vtkMatricizeArray.h
index d32abde811689ede3fdfae1480e5b9783fb638c5..193c1b1e6be229b8f18d10f78ba655f6055b9a60 100644
--- a/Filters/General/vtkMatricizeArray.h
+++ b/Filters/General/vtkMatricizeArray.h
@@ -44,7 +44,7 @@ class VTKFILTERSGENERAL_EXPORT vtkMatricizeArray : public vtkArrayDataAlgorithm
public:
static vtkMatricizeArray* New();
vtkTypeMacro(vtkMatricizeArray, vtkArrayDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -62,12 +62,12 @@ public:
protected:
vtkMatricizeArray();
- ~vtkMatricizeArray() VTK_OVERRIDE;
+ ~vtkMatricizeArray() override;
int RequestData(
vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
private:
vtkMatricizeArray(const vtkMatricizeArray&) VTK_DELETE_FUNCTION;
diff --git a/Filters/General/vtkMergeCells.h b/Filters/General/vtkMergeCells.h
index c2223ea2b33e07ea48167fd642f7cb2c93aba6c6..b20a1667c457d2a1f77b51dcb9187ccdac796ac1 100644
--- a/Filters/General/vtkMergeCells.h
+++ b/Filters/General/vtkMergeCells.h
@@ -59,7 +59,7 @@ class VTKFILTERSGENERAL_EXPORT vtkMergeCells : public vtkObject
{
public:
vtkTypeMacro(vtkMergeCells, vtkObject);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
static vtkMergeCells *New();
@@ -157,7 +157,7 @@ public:
protected:
vtkMergeCells();
- ~vtkMergeCells() VTK_OVERRIDE;
+ ~vtkMergeCells() override;
private:
diff --git a/Filters/General/vtkMultiBlockDataGroupFilter.h b/Filters/General/vtkMultiBlockDataGroupFilter.h
index 21e124d0e413900ececdb42fcbb31e7642f8a60f..069e7f98f5028b9227a47ee0cc39769d06d59119 100644
--- a/Filters/General/vtkMultiBlockDataGroupFilter.h
+++ b/Filters/General/vtkMultiBlockDataGroupFilter.h
@@ -33,7 +33,7 @@ class VTKFILTERSGENERAL_EXPORT vtkMultiBlockDataGroupFilter : public vtkMultiBlo
{
public:
vtkTypeMacro(vtkMultiBlockDataGroupFilter,vtkMultiBlockDataSetAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct object with PointIds and CellIds on; and ids being generated
@@ -53,19 +53,19 @@ public:
protected:
vtkMultiBlockDataGroupFilter();
- ~vtkMultiBlockDataGroupFilter() VTK_OVERRIDE;
+ ~vtkMultiBlockDataGroupFilter() override;
int RequestInformation(vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
int RequestUpdateExtent(vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
int RequestData(vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
private:
vtkMultiBlockDataGroupFilter(const vtkMultiBlockDataGroupFilter&) VTK_DELETE_FUNCTION;
diff --git a/Filters/General/vtkMultiBlockFromTimeSeriesFilter.h b/Filters/General/vtkMultiBlockFromTimeSeriesFilter.h
index 79b4f783d0fced24e1170e4d8e4a10b1b35b2f36..dea50eeae823b967a95c9e110b9d8f4ffd75d767 100644
--- a/Filters/General/vtkMultiBlockFromTimeSeriesFilter.h
+++ b/Filters/General/vtkMultiBlockFromTimeSeriesFilter.h
@@ -37,25 +37,25 @@ class VTKFILTERSGENERAL_EXPORT vtkMultiBlockFromTimeSeriesFilter : public vtkMul
{
public:
vtkTypeMacro(vtkMultiBlockFromTimeSeriesFilter,vtkMultiBlockDataSetAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkMultiBlockFromTimeSeriesFilter *New();
protected:
vtkMultiBlockFromTimeSeriesFilter();
- ~vtkMultiBlockFromTimeSeriesFilter() VTK_OVERRIDE;
+ ~vtkMultiBlockFromTimeSeriesFilter() override;
- int FillInputPortInformation(int, vtkInformation *) VTK_OVERRIDE;
+ int FillInputPortInformation(int, vtkInformation *) override;
int RequestInformation(vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
int RequestUpdateExtent(vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
int RequestData(vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
private:
vtkMultiBlockFromTimeSeriesFilter(const vtkMultiBlockFromTimeSeriesFilter&) VTK_DELETE_FUNCTION;
diff --git a/Filters/General/vtkMultiBlockMergeFilter.h b/Filters/General/vtkMultiBlockMergeFilter.h
index 52bb672a4c4fd09257f8397877e7168d2e84775b..55e30b810e30b4f1bfa69ac19677102b0858c7fa 100644
--- a/Filters/General/vtkMultiBlockMergeFilter.h
+++ b/Filters/General/vtkMultiBlockMergeFilter.h
@@ -35,7 +35,7 @@ class VTKFILTERSGENERAL_EXPORT vtkMultiBlockMergeFilter
{
public:
vtkTypeMacro(vtkMultiBlockMergeFilter,vtkMultiBlockDataSetAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct object with PointIds and CellIds on; and ids being generated
@@ -55,13 +55,13 @@ public:
protected:
vtkMultiBlockMergeFilter();
- ~vtkMultiBlockMergeFilter() VTK_OVERRIDE;
+ ~vtkMultiBlockMergeFilter() override;
int RequestData(vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
int IsMultiPiece(vtkMultiBlockDataSet*);
diff --git a/Filters/General/vtkMultiThreshold.h b/Filters/General/vtkMultiThreshold.h
index 93f718934e22279d79c556bbebf5d190968b7142..418401a9ec3e5e8b28632cb8ceb81019b8d93935 100644
--- a/Filters/General/vtkMultiThreshold.h
+++ b/Filters/General/vtkMultiThreshold.h
@@ -122,7 +122,7 @@ class VTKFILTERSGENERAL_EXPORT vtkMultiThreshold : public vtkMultiBlockDataSetAl
public:
vtkTypeMacro(vtkMultiThreshold,vtkMultiBlockDataSetAlgorithm);
static vtkMultiThreshold* New();
- void PrintSelf( ostream& os, vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf( ostream& os, vtkIndent indent ) override;
/// Whether the endpoint value of an interval should be included or excluded.
enum Closure {
@@ -318,9 +318,9 @@ public:
*/
int Match( double cellNorm[2] );
- ~Interval() VTK_OVERRIDE { }
- void PrintNode( ostream& os ) VTK_OVERRIDE;
- Interval* GetIntervalPointer() VTK_OVERRIDE;
+ ~Interval() override { }
+ void PrintNode( ostream& os ) override;
+ Interval* GetIntervalPointer() override;
};
/// A subset of a mesh represented as a boolean set operation
@@ -336,15 +336,15 @@ public:
this->Id = sId;
this->Operator = op;
}
- ~BooleanSet() VTK_OVERRIDE { }
- void PrintNode( ostream& os ) VTK_OVERRIDE;
- BooleanSet* GetBooleanSetPointer() VTK_OVERRIDE;
+ ~BooleanSet() override { }
+ void PrintNode( ostream& os ) override;
+ BooleanSet* GetBooleanSetPointer() override;
};
protected:
vtkMultiThreshold();
- ~vtkMultiThreshold() VTK_OVERRIDE;
+ ~vtkMultiThreshold() override;
/**
* When an interval is evaluated, its value is used to update a truth table.
@@ -369,14 +369,14 @@ protected:
/**
* This function performs the actual thresholding.
*/
- int RequestData( vtkInformation*, vtkInformationVector**, vtkInformationVector* ) VTK_OVERRIDE;
+ int RequestData( vtkInformation*, vtkInformationVector**, vtkInformationVector* ) override;
/**
* We accept any mesh that is descended from vtkPointSet.
* In the future, it is possible to accept more types but this would require
* us to generate a new vtkPoints object for each output mesh.
*/
- int FillInputPortInformation( int port, vtkInformation* info ) VTK_OVERRIDE;
+ int FillInputPortInformation( int port, vtkInformation* info ) override;
/**
* A variable used to store the next index to use when calling SetInputArrayToProcess.
diff --git a/Filters/General/vtkNormalizeMatrixVectors.h b/Filters/General/vtkNormalizeMatrixVectors.h
index 8893aac8dc983a73215624f06a8dea52c1b6a6fd..2d1b3b78e662f28947e00b0ef2948daf08923621 100644
--- a/Filters/General/vtkNormalizeMatrixVectors.h
+++ b/Filters/General/vtkNormalizeMatrixVectors.h
@@ -40,7 +40,7 @@ class VTKFILTERSGENERAL_EXPORT vtkNormalizeMatrixVectors : public vtkArrayDataAl
public:
static vtkNormalizeMatrixVectors* New();
vtkTypeMacro(vtkNormalizeMatrixVectors, vtkArrayDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -60,12 +60,12 @@ public:
protected:
vtkNormalizeMatrixVectors();
- ~vtkNormalizeMatrixVectors() VTK_OVERRIDE;
+ ~vtkNormalizeMatrixVectors() override;
int RequestData(
vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
int VectorDimension;
double PValue;
diff --git a/Filters/General/vtkOBBDicer.h b/Filters/General/vtkOBBDicer.h
index 610264ea0f7ed843999b3f44ab6b6af5567e55ba..d25dcd05d81843b35ebac1c299858974793efe98 100644
--- a/Filters/General/vtkOBBDicer.h
+++ b/Filters/General/vtkOBBDicer.h
@@ -43,7 +43,7 @@ class VTKFILTERSGENERAL_EXPORT vtkOBBDicer : public vtkDicer
{
public:
vtkTypeMacro(vtkOBBDicer,vtkDicer);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Instantiate an object.
@@ -52,10 +52,10 @@ public:
protected:
vtkOBBDicer() {}
- ~vtkOBBDicer() VTK_OVERRIDE {}
+ ~vtkOBBDicer() override {}
// Usual data generation method
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
//implementation ivars and methods
void BuildTree(vtkIdList *ptIds, vtkOBBNode *OBBptr, vtkDataSet *input);
diff --git a/Filters/General/vtkOBBTree.h b/Filters/General/vtkOBBTree.h
index 5a7311e4b66a2a12ca88b06e2a808bd37580e048..9b50159da5caea996e07ca598eb0a75f3b73b895 100644
--- a/Filters/General/vtkOBBTree.h
+++ b/Filters/General/vtkOBBTree.h
@@ -86,7 +86,7 @@ class VTKFILTERSGENERAL_EXPORT vtkOBBTree : public vtkAbstractCellLocator
{
public:
vtkTypeMacro(vtkOBBTree,vtkAbstractCellLocator);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct with automatic computation of divisions, averaging
@@ -109,7 +109,7 @@ public:
* to receive that information.
*/
int IntersectWithLine(const double a0[3], const double a1[3],
- vtkPoints *points, vtkIdList *cellIds) VTK_OVERRIDE;
+ vtkPoints *points, vtkIdList *cellIds) override;
/**
* Return the first intersection of the specified line segment with
@@ -118,7 +118,7 @@ public:
*/
int IntersectWithLine(double a0[3], double a1[3], double tol,
double& t, double x[3], double pcoords[3],
- int &subId, vtkIdType &cellId, vtkGenericCell *cell) VTK_OVERRIDE;
+ int &subId, vtkIdType &cellId, vtkGenericCell *cell) override;
/**
* Compute an OBB from the list of points given. Return the corner point
@@ -178,8 +178,8 @@ public:
/**
* Satisfy locator's abstract interface, see vtkLocator.
*/
- void FreeSearchStructure() VTK_OVERRIDE;
- void BuildLocator() VTK_OVERRIDE;
+ void FreeSearchStructure() override;
+ void BuildLocator() override;
//@}
/**
@@ -191,11 +191,11 @@ public:
* represented either as two crossed polygons, or as a line, depending on
* the relative diameter of the OBB compared to the diameter (d).
*/
- void GenerateRepresentation(int level, vtkPolyData *pd) VTK_OVERRIDE;
+ void GenerateRepresentation(int level, vtkPolyData *pd) override;
protected:
vtkOBBTree();
- ~vtkOBBTree() VTK_OVERRIDE;
+ ~vtkOBBTree() override;
// Compute an OBB from the list of cells given. This used to be
// public but should not have been. A public call has been added
diff --git a/Filters/General/vtkOverlappingAMRLevelIdScalars.h b/Filters/General/vtkOverlappingAMRLevelIdScalars.h
index df4ecb72aa07e6a49b7b31db347a5ab329b8aa39..febbaf06c7cdd4c61e4c66fff099169550632703 100644
--- a/Filters/General/vtkOverlappingAMRLevelIdScalars.h
+++ b/Filters/General/vtkOverlappingAMRLevelIdScalars.h
@@ -36,15 +36,15 @@ class VTKFILTERSGENERAL_EXPORT vtkOverlappingAMRLevelIdScalars :
public:
static vtkOverlappingAMRLevelIdScalars* New();
vtkTypeMacro(vtkOverlappingAMRLevelIdScalars,vtkOverlappingAMRAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkOverlappingAMRLevelIdScalars();
- ~vtkOverlappingAMRLevelIdScalars() VTK_OVERRIDE;
+ ~vtkOverlappingAMRLevelIdScalars() override;
int RequestData(vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
void AddColorLevels(vtkUniformGridAMR *input, vtkUniformGridAMR *output);
vtkUniformGrid* ColorLevel(vtkUniformGrid* input, int group);
diff --git a/Filters/General/vtkPassArrays.h b/Filters/General/vtkPassArrays.h
index 2d3e7f0b06232d8e26ad89577284bc8fd4e780c4..c0937c82703f861279de886d3eda04721de5b2a0 100644
--- a/Filters/General/vtkPassArrays.h
+++ b/Filters/General/vtkPassArrays.h
@@ -68,7 +68,7 @@ class VTKFILTERSGENERAL_EXPORT vtkPassArrays : public vtkDataObjectAlgorithm
public:
static vtkPassArrays* New();
vtkTypeMacro(vtkPassArrays,vtkDataObjectAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Adds an array to pass through.
@@ -138,29 +138,29 @@ public:
*/
int ProcessRequest(vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
protected:
vtkPassArrays();
- ~vtkPassArrays() VTK_OVERRIDE;
+ ~vtkPassArrays() override;
/**
* Override to limit types of supported input types to non-composite
* datasets
*/
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
/**
* Creates the same output type as the input type.
*/
int RequestDataObject(vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
int RequestData(
vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
bool RemoveArrays;
bool UseFieldTypes;
diff --git a/Filters/General/vtkPassThrough.h b/Filters/General/vtkPassThrough.h
index 237ca113d2107df4c8483a2b719f45b24eba07fe..83219186030bc4038b7761e8d445c2bab9a72c9a 100644
--- a/Filters/General/vtkPassThrough.h
+++ b/Filters/General/vtkPassThrough.h
@@ -31,12 +31,12 @@ class VTKFILTERSGENERAL_EXPORT vtkPassThrough : public vtkPassInputTypeAlgorithm
public:
static vtkPassThrough* New();
vtkTypeMacro(vtkPassThrough, vtkPassInputTypeAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Specify the first input port as optional
*/
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
//@{
/**
@@ -63,16 +63,16 @@ public:
protected:
vtkPassThrough();
- ~vtkPassThrough() VTK_OVERRIDE;
+ ~vtkPassThrough() override;
int RequestDataObject(
vtkInformation *request,
vtkInformationVector **inVec,
- vtkInformationVector *outVec) VTK_OVERRIDE;
+ vtkInformationVector *outVec) override;
int RequestData(
vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
int DeepCopyInput;
bool AllowNullInput;
diff --git a/Filters/General/vtkPointConnectivityFilter.h b/Filters/General/vtkPointConnectivityFilter.h
index d99d706cc8cab7d7c05e1b7d41e711291edf4b2c..fac5314a5af2e72bc0becf50ab776dc266b77ddf 100644
--- a/Filters/General/vtkPointConnectivityFilter.h
+++ b/Filters/General/vtkPointConnectivityFilter.h
@@ -40,16 +40,16 @@ public:
*/
static vtkPointConnectivityFilter *New();
vtkTypeMacro(vtkPointConnectivityFilter,vtkDataSetAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
protected:
vtkPointConnectivityFilter();
- ~vtkPointConnectivityFilter() VTK_OVERRIDE;
+ ~vtkPointConnectivityFilter() override;
int RequestData(vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
private:
vtkPointConnectivityFilter(const vtkPointConnectivityFilter&) VTK_DELETE_FUNCTION;
diff --git a/Filters/General/vtkPolyDataStreamer.h b/Filters/General/vtkPolyDataStreamer.h
index ff92435e443ba9bded79dd76bf7d93ffb574e9dd..f982e824bc548b37ce8111be5e26151e4906961e 100644
--- a/Filters/General/vtkPolyDataStreamer.h
+++ b/Filters/General/vtkPolyDataStreamer.h
@@ -44,7 +44,7 @@ public:
static vtkPolyDataStreamer *New();
vtkTypeMacro(vtkPolyDataStreamer,vtkStreamerBase);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -70,19 +70,19 @@ public:
protected:
vtkPolyDataStreamer();
- ~vtkPolyDataStreamer() VTK_OVERRIDE;
+ ~vtkPolyDataStreamer() override;
// see algorithm for more info
- int FillOutputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillOutputPortInformation(int port, vtkInformation* info) override;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
- int RequestUpdateExtent(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestUpdateExtent(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
int ExecutePass(vtkInformationVector **inputVector,
- vtkInformationVector *outputVector) VTK_OVERRIDE;
+ vtkInformationVector *outputVector) override;
int PostExecute(vtkInformationVector **inputVector,
- vtkInformationVector *outputVector) VTK_OVERRIDE;
+ vtkInformationVector *outputVector) override;
int ColorByPiece;
private:
diff --git a/Filters/General/vtkPolyDataToReebGraphFilter.h b/Filters/General/vtkPolyDataToReebGraphFilter.h
index 03129f8620d9aca764d0c6b2f6a2452f89d01ee0..38373dfb406574862d4af6178975c8d508cff284 100644
--- a/Filters/General/vtkPolyDataToReebGraphFilter.h
+++ b/Filters/General/vtkPolyDataToReebGraphFilter.h
@@ -37,7 +37,7 @@ class VTKFILTERSGENERAL_EXPORT vtkPolyDataToReebGraphFilter :
public:
static vtkPolyDataToReebGraphFilter* New();
vtkTypeMacro(vtkPolyDataToReebGraphFilter, vtkDirectedGraphAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -51,16 +51,16 @@ public:
protected:
vtkPolyDataToReebGraphFilter();
- ~vtkPolyDataToReebGraphFilter() VTK_OVERRIDE;
+ ~vtkPolyDataToReebGraphFilter() override;
int FieldId;
- int FillInputPortInformation(int portNumber, vtkInformation *) VTK_OVERRIDE;
- int FillOutputPortInformation(int, vtkInformation *) VTK_OVERRIDE;
+ int FillInputPortInformation(int portNumber, vtkInformation *) override;
+ int FillOutputPortInformation(int, vtkInformation *) override;
int RequestData(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
private:
vtkPolyDataToReebGraphFilter(const vtkPolyDataToReebGraphFilter&) VTK_DELETE_FUNCTION;
diff --git a/Filters/General/vtkProbePolyhedron.h b/Filters/General/vtkProbePolyhedron.h
index 1114215be9751bc68e601b633f03bcaca61ee8fa..b8355b87ba4098f2e9d8028903847c644d84313f 100644
--- a/Filters/General/vtkProbePolyhedron.h
+++ b/Filters/General/vtkProbePolyhedron.h
@@ -69,7 +69,7 @@ public:
*/
static vtkProbePolyhedron *New();
vtkTypeMacro(vtkProbePolyhedron,vtkDataSetAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -113,17 +113,17 @@ public:
protected:
vtkProbePolyhedron();
- ~vtkProbePolyhedron() VTK_OVERRIDE;
+ ~vtkProbePolyhedron() override;
int ProbePointData;
int ProbeCellData;
int RequestData(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
int RequestInformation(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
int RequestUpdateExtent(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
private:
vtkProbePolyhedron(const vtkProbePolyhedron&) VTK_DELETE_FUNCTION;
diff --git a/Filters/General/vtkQuadraturePointInterpolator.h b/Filters/General/vtkQuadraturePointInterpolator.h
index b4609455f4a5add2b210c26b992c61a10218f257..b0d04d00aef46a92ecd586c65ca42e9ba6a618ea 100644
--- a/Filters/General/vtkQuadraturePointInterpolator.h
+++ b/Filters/General/vtkQuadraturePointInterpolator.h
@@ -43,14 +43,14 @@ class VTKFILTERSGENERAL_EXPORT vtkQuadraturePointInterpolator : public vtkDataSe
public:
static vtkQuadraturePointInterpolator *New();
vtkTypeMacro(vtkQuadraturePointInterpolator,vtkDataSetAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
- int FillOutputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
- int RequestData(vtkInformation *req, vtkInformationVector **input, vtkInformationVector *output) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
+ int FillOutputPortInformation(int port, vtkInformation *info) override;
+ int RequestData(vtkInformation *req, vtkInformationVector **input, vtkInformationVector *output) override;
vtkQuadraturePointInterpolator();
- ~vtkQuadraturePointInterpolator() VTK_OVERRIDE;
+ ~vtkQuadraturePointInterpolator() override;
private:
vtkQuadraturePointInterpolator(const vtkQuadraturePointInterpolator &) VTK_DELETE_FUNCTION;
diff --git a/Filters/General/vtkQuadraturePointsGenerator.h b/Filters/General/vtkQuadraturePointsGenerator.h
index be1e1a677d15901f7b9c352763feca1399e94015..574ac6095e48d352ecf0abc2fb29893ac37dc5e3 100644
--- a/Filters/General/vtkQuadraturePointsGenerator.h
+++ b/Filters/General/vtkQuadraturePointsGenerator.h
@@ -43,13 +43,13 @@ class VTKFILTERSGENERAL_EXPORT vtkQuadraturePointsGenerator : public vtkPolyData
{
public:
vtkTypeMacro(vtkQuadraturePointsGenerator,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkQuadraturePointsGenerator *New();
protected:
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
- int RequestData(vtkInformation *req, vtkInformationVector **input, vtkInformationVector *output) VTK_OVERRIDE;
+ int RequestData(vtkInformation *req, vtkInformationVector **input, vtkInformationVector *output) override;
/**
* Generate the point set .
@@ -64,7 +64,7 @@ protected:
vtkPolyData* pdOut);
vtkQuadraturePointsGenerator();
- ~vtkQuadraturePointsGenerator() VTK_OVERRIDE;
+ ~vtkQuadraturePointsGenerator() override;
private:
vtkQuadraturePointsGenerator(const vtkQuadraturePointsGenerator &) VTK_DELETE_FUNCTION;
void operator=(const vtkQuadraturePointsGenerator &) VTK_DELETE_FUNCTION;
diff --git a/Filters/General/vtkQuadratureSchemeDictionaryGenerator.h b/Filters/General/vtkQuadratureSchemeDictionaryGenerator.h
index bb9182146145f0b3401f6b7a052534eec528aa4e..9c3ebb08aeb5a8cafbdea23862ceee4016696c77 100644
--- a/Filters/General/vtkQuadratureSchemeDictionaryGenerator.h
+++ b/Filters/General/vtkQuadratureSchemeDictionaryGenerator.h
@@ -42,15 +42,15 @@ class VTKFILTERSGENERAL_EXPORT vtkQuadratureSchemeDictionaryGenerator : public v
{
public:
vtkTypeMacro(vtkQuadratureSchemeDictionaryGenerator,vtkDataSetAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkQuadratureSchemeDictionaryGenerator *New();
protected:
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
- int FillOutputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
- int RequestData(vtkInformation *req, vtkInformationVector **input, vtkInformationVector *output) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
+ int FillOutputPortInformation(int port, vtkInformation *info) override;
+ int RequestData(vtkInformation *req, vtkInformationVector **input, vtkInformationVector *output) override;
vtkQuadratureSchemeDictionaryGenerator();
- ~vtkQuadratureSchemeDictionaryGenerator() VTK_OVERRIDE;
+ ~vtkQuadratureSchemeDictionaryGenerator() override;
private:
vtkQuadratureSchemeDictionaryGenerator(const vtkQuadratureSchemeDictionaryGenerator &) VTK_DELETE_FUNCTION;
diff --git a/Filters/General/vtkQuantizePolyDataPoints.h b/Filters/General/vtkQuantizePolyDataPoints.h
index e71471c3bc9209035f9de7458819efd3e1b378ad..d321cecabcc2335528e0f403b7d23eda1295c69d 100644
--- a/Filters/General/vtkQuantizePolyDataPoints.h
+++ b/Filters/General/vtkQuantizePolyDataPoints.h
@@ -50,7 +50,7 @@ class VTKFILTERSGENERAL_EXPORT vtkQuantizePolyDataPoints : public vtkCleanPolyDa
public:
static vtkQuantizePolyDataPoints *New();
vtkTypeMacro(vtkQuantizePolyDataPoints,vtkCleanPolyData);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -63,16 +63,16 @@ public:
/**
* Perform quantization on a point
*/
- void OperateOnPoint(double in[3], double out[3]) VTK_OVERRIDE;
+ void OperateOnPoint(double in[3], double out[3]) override;
/**
* Perform quantization on bounds
*/
- void OperateOnBounds(double in[6], double out[6]) VTK_OVERRIDE;
+ void OperateOnBounds(double in[6], double out[6]) override;
protected:
vtkQuantizePolyDataPoints();
- ~vtkQuantizePolyDataPoints() VTK_OVERRIDE {}
+ ~vtkQuantizePolyDataPoints() override {}
double QFactor;
private:
diff --git a/Filters/General/vtkRandomAttributeGenerator.h b/Filters/General/vtkRandomAttributeGenerator.h
index 31590d49077dd1960fb3178843f71630c24a686f..8339471b63316b2ef2b7d17b35c1d58b2e1494fc 100644
--- a/Filters/General/vtkRandomAttributeGenerator.h
+++ b/Filters/General/vtkRandomAttributeGenerator.h
@@ -65,7 +65,7 @@ public:
static vtkRandomAttributeGenerator *New();
vtkTypeMacro(vtkRandomAttributeGenerator,vtkPassInputTypeAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -336,11 +336,11 @@ public:
protected:
vtkRandomAttributeGenerator();
- ~vtkRandomAttributeGenerator() VTK_OVERRIDE {}
+ ~vtkRandomAttributeGenerator() override {}
int RequestData(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ vtkInformationVector *) override;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
int DataType;
int NumberOfComponents;
diff --git a/Filters/General/vtkRectilinearGridClip.h b/Filters/General/vtkRectilinearGridClip.h
index 711cb890bf7bbf9fa1f63d270967382d2f8d2f09..7bd22cc200c8199d5d15b8be27df779a004f93a2 100644
--- a/Filters/General/vtkRectilinearGridClip.h
+++ b/Filters/General/vtkRectilinearGridClip.h
@@ -39,7 +39,7 @@ class VTKFILTERSGENERAL_EXPORT vtkRectilinearGridClip : public vtkRectilinearGri
public:
static vtkRectilinearGridClip *New();
vtkTypeMacro(vtkRectilinearGridClip,vtkRectilinearGridAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -67,7 +67,7 @@ public:
protected:
vtkRectilinearGridClip();
- ~vtkRectilinearGridClip() VTK_OVERRIDE {}
+ ~vtkRectilinearGridClip() override {}
// Time when OutputImageExtent was computed.
vtkTimeStamp CTime;
@@ -78,13 +78,13 @@ protected:
int RequestInformation (vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
void CopyData(vtkRectilinearGrid *inData, vtkRectilinearGrid *outData, int *ext);
int RequestData(vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
private:
vtkRectilinearGridClip(const vtkRectilinearGridClip&) VTK_DELETE_FUNCTION;
diff --git a/Filters/General/vtkRectilinearGridToPointSet.h b/Filters/General/vtkRectilinearGridToPointSet.h
index 1f520c83b9edbb1a18167907f8b3ded810b9bc97..8e542af4b065b13958ca5a4c30695e9102e36525 100644
--- a/Filters/General/vtkRectilinearGridToPointSet.h
+++ b/Filters/General/vtkRectilinearGridToPointSet.h
@@ -44,19 +44,19 @@ class VTKFILTERSGENERAL_EXPORT vtkRectilinearGridToPointSet : public vtkStructur
{
public:
vtkTypeMacro(vtkRectilinearGridToPointSet, vtkStructuredGridAlgorithm);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
static vtkRectilinearGridToPointSet *New();
protected:
vtkRectilinearGridToPointSet();
- ~vtkRectilinearGridToPointSet() VTK_OVERRIDE;
+ ~vtkRectilinearGridToPointSet() override;
int RequestData(vtkInformation *request,
vtkInformationVector **inputVector,
- vtkInformationVector *outputVector) VTK_OVERRIDE;
+ vtkInformationVector *outputVector) override;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
private:
vtkRectilinearGridToPointSet(const vtkRectilinearGridToPointSet &) VTK_DELETE_FUNCTION;
diff --git a/Filters/General/vtkRectilinearGridToTetrahedra.h b/Filters/General/vtkRectilinearGridToTetrahedra.h
index 995ab371d384c73f45ca7c03a4a2e5d8a9b5c941..5dd0f4a769a2106f61cc98f4fc37663340594c06 100644
--- a/Filters/General/vtkRectilinearGridToTetrahedra.h
+++ b/Filters/General/vtkRectilinearGridToTetrahedra.h
@@ -64,7 +64,7 @@ class VTKFILTERSGENERAL_EXPORT vtkRectilinearGridToTetrahedra : public vtkUnstru
{
public:
vtkTypeMacro(vtkRectilinearGridToTetrahedra,vtkUnstructuredGridAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Form 5 Tetrahedra per cube. Do not RememberVoxelId.
@@ -116,14 +116,14 @@ public:
protected:
vtkRectilinearGridToTetrahedra();
- ~vtkRectilinearGridToTetrahedra() VTK_OVERRIDE {}
+ ~vtkRectilinearGridToTetrahedra() override {}
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
int RememberVoxelId;
int TetraPerCell;
- int FillInputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
+ int FillInputPortInformation(int, vtkInformation*) override;
private:
vtkRectilinearGridToTetrahedra(const vtkRectilinearGridToTetrahedra&) VTK_DELETE_FUNCTION;
diff --git a/Filters/General/vtkRecursiveDividingCubes.h b/Filters/General/vtkRecursiveDividingCubes.h
index 728b8c57de196c006de8691f28327a77725f44b7..bf56bbd2df4cedb653fd18a4dbd7f24b3d08a533 100644
--- a/Filters/General/vtkRecursiveDividingCubes.h
+++ b/Filters/General/vtkRecursiveDividingCubes.h
@@ -47,7 +47,7 @@ class VTKFILTERSGENERAL_EXPORT vtkRecursiveDividingCubes : public vtkPolyDataAlg
public:
static vtkRecursiveDividingCubes *New();
vtkTypeMacro(vtkRecursiveDividingCubes,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -77,10 +77,10 @@ public:
protected:
vtkRecursiveDividingCubes();
- ~vtkRecursiveDividingCubes() VTK_OVERRIDE;
+ ~vtkRecursiveDividingCubes() override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
void SubDivide(double origin[3], double h[3], double values[8]);
double Value;
diff --git a/Filters/General/vtkReflectionFilter.h b/Filters/General/vtkReflectionFilter.h
index 0ee689cd1e0c25dc66ecf5eae2235cced1524547..5fd430c832871dab76c26361101c5674715fa848 100644
--- a/Filters/General/vtkReflectionFilter.h
+++ b/Filters/General/vtkReflectionFilter.h
@@ -37,7 +37,7 @@ public:
static vtkReflectionFilter *New();
vtkTypeMacro(vtkReflectionFilter, vtkDataObjectAlgorithm);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
enum ReflectionPlane
{
@@ -103,7 +103,7 @@ public:
protected:
vtkReflectionFilter();
- ~vtkReflectionFilter() VTK_OVERRIDE;
+ ~vtkReflectionFilter() override;
/**
* This is called by the superclass.
@@ -112,7 +112,7 @@ protected:
*/
int RequestDataObject(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
/**
* Actual implementation for reflection.
@@ -131,8 +131,8 @@ protected:
virtual vtkIdType ReflectNon3DCell(vtkDataSet* input, vtkUnstructuredGrid* output,
vtkIdType cellId, vtkIdType numInputPoints);
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
void FlipTuple(double* tuple, int* mirrorDir, int nComp);
diff --git a/Filters/General/vtkRotationFilter.h b/Filters/General/vtkRotationFilter.h
index 871b3f5539e6ec854ffa7217933bf0ab55de4d80..0887e7c347da2e7b6271d0081bcd0d60bb694ab7 100644
--- a/Filters/General/vtkRotationFilter.h
+++ b/Filters/General/vtkRotationFilter.h
@@ -37,7 +37,7 @@ class VTKFILTERSGENERAL_EXPORT vtkRotationFilter : public vtkUnstructuredGridAlg
public:
static vtkRotationFilter *New();
vtkTypeMacro(vtkRotationFilter, vtkUnstructuredGridAlgorithm);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
enum RotationAxis
{
@@ -96,10 +96,10 @@ public:
protected:
vtkRotationFilter();
- ~vtkRotationFilter() VTK_OVERRIDE;
+ ~vtkRotationFilter() override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
int Axis;
double Angle;
diff --git a/Filters/General/vtkSampleImplicitFunctionFilter.h b/Filters/General/vtkSampleImplicitFunctionFilter.h
index c47f310c06c4ba8cfb044aab1873793f5671722d..05a6a8ec50b534a8babd2778ac46538d0a6edafb 100644
--- a/Filters/General/vtkSampleImplicitFunctionFilter.h
+++ b/Filters/General/vtkSampleImplicitFunctionFilter.h
@@ -50,7 +50,7 @@ public:
*/
static vtkSampleImplicitFunctionFilter *New();
vtkTypeMacro(vtkSampleImplicitFunctionFilter,vtkDataSetAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -91,22 +91,22 @@ public:
/**
* Return the MTime also taking into account the implicit function.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
protected:
vtkSampleImplicitFunctionFilter();
- ~vtkSampleImplicitFunctionFilter() VTK_OVERRIDE;
+ ~vtkSampleImplicitFunctionFilter() override;
vtkImplicitFunction *ImplicitFunction;
int ComputeGradients;
char *ScalarArrayName;
char *GradientArrayName;
- void ReportReferences(vtkGarbageCollector*) VTK_OVERRIDE;
+ void ReportReferences(vtkGarbageCollector*) override;
int RequestData(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ vtkInformationVector *) override;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
private:
diff --git a/Filters/General/vtkShrinkFilter.h b/Filters/General/vtkShrinkFilter.h
index 43c28d0df346240dc0874c405e00aca40e268b03..0312fe10488d96717d5cc2ea771ed193113b46f3 100644
--- a/Filters/General/vtkShrinkFilter.h
+++ b/Filters/General/vtkShrinkFilter.h
@@ -41,7 +41,7 @@ class VTKFILTERSGENERAL_EXPORT vtkShrinkFilter : public vtkUnstructuredGridAlgor
public:
static vtkShrinkFilter *New();
vtkTypeMacro(vtkShrinkFilter,vtkUnstructuredGridAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -53,15 +53,15 @@ public:
protected:
vtkShrinkFilter();
- ~vtkShrinkFilter() VTK_OVERRIDE;
+ ~vtkShrinkFilter() override;
// Override to specify support for any vtkDataSet input type.
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
// Main implementation.
int RequestData(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
double ShrinkFactor;
diff --git a/Filters/General/vtkShrinkPolyData.h b/Filters/General/vtkShrinkPolyData.h
index 92599c8cc1cc2497c3017dc7ade68135c7ba987f..d94f623d59d148e9081b8e8c52297b339d2b3a4d 100644
--- a/Filters/General/vtkShrinkPolyData.h
+++ b/Filters/General/vtkShrinkPolyData.h
@@ -47,7 +47,7 @@ class VTKFILTERSGENERAL_EXPORT vtkShrinkPolyData : public vtkPolyDataAlgorithm
public:
static vtkShrinkPolyData *New();
vtkTypeMacro(vtkShrinkPolyData,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -65,9 +65,9 @@ public:
protected:
vtkShrinkPolyData(double sf=0.5);
- ~vtkShrinkPolyData() VTK_OVERRIDE {}
+ ~vtkShrinkPolyData() override {}
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
double ShrinkFactor;
private:
vtkShrinkPolyData(const vtkShrinkPolyData&) VTK_DELETE_FUNCTION;
diff --git a/Filters/General/vtkSpatialRepresentationFilter.h b/Filters/General/vtkSpatialRepresentationFilter.h
index be957ff3107ccd388d067aeda4899d16e8d1f57b..33bde5a9ae9169ec4be799081085ce94cd701f9a 100644
--- a/Filters/General/vtkSpatialRepresentationFilter.h
+++ b/Filters/General/vtkSpatialRepresentationFilter.h
@@ -59,7 +59,7 @@ class VTKFILTERSGENERAL_EXPORT vtkSpatialRepresentationFilter : public vtkMultiB
public:
static vtkSpatialRepresentationFilter *New();
vtkTypeMacro(vtkSpatialRepresentationFilter,vtkMultiBlockDataSetAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -98,19 +98,19 @@ public:
protected:
vtkSpatialRepresentationFilter();
- ~vtkSpatialRepresentationFilter() VTK_OVERRIDE;
+ ~vtkSpatialRepresentationFilter() override;
int RequestData(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
int MaximumLevel;
bool GenerateLeaves;
vtkLocator *SpatialRepresentation;
- void ReportReferences(vtkGarbageCollector*) VTK_OVERRIDE;
- int FillInputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
+ void ReportReferences(vtkGarbageCollector*) override;
+ int FillInputPortInformation(int, vtkInformation*) override;
private:
vtkSpatialRepresentationFilter(const vtkSpatialRepresentationFilter&) VTK_DELETE_FUNCTION;
void operator=(const vtkSpatialRepresentationFilter&) VTK_DELETE_FUNCTION;
diff --git a/Filters/General/vtkSplineFilter.h b/Filters/General/vtkSplineFilter.h
index 1e43ce1369fb1ea28ad23643d87fa4bc417e26e4..9fbee262ef5682f5b08a1bd82e86d08d21598302 100644
--- a/Filters/General/vtkSplineFilter.h
+++ b/Filters/General/vtkSplineFilter.h
@@ -59,7 +59,7 @@ class VTKFILTERSGENERAL_EXPORT vtkSplineFilter : public vtkPolyDataAlgorithm
{
public:
vtkTypeMacro(vtkSplineFilter,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct the class with no limit on the number of subdivisions
@@ -152,10 +152,10 @@ public:
protected:
vtkSplineFilter();
- ~vtkSplineFilter() VTK_OVERRIDE;
+ ~vtkSplineFilter() override;
// Usual data generation method
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
int MaximumNumberOfSubdivisions;
int Subdivide;
diff --git a/Filters/General/vtkSplitByCellScalarFilter.h b/Filters/General/vtkSplitByCellScalarFilter.h
index 2c24f6e94c81c5f3823c5d30341b722c06b1cb9c..410560846fb4e8db674ddfb7ae526ab2ceb35d88 100644
--- a/Filters/General/vtkSplitByCellScalarFilter.h
+++ b/Filters/General/vtkSplitByCellScalarFilter.h
@@ -42,7 +42,7 @@ class VTKFILTERSGENERAL_EXPORT vtkSplitByCellScalarFilter : public vtkMultiBlock
public:
static vtkSplitByCellScalarFilter *New();
vtkTypeMacro(vtkSplitByCellScalarFilter, vtkMultiBlockDataSetAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -60,12 +60,12 @@ public:
protected:
vtkSplitByCellScalarFilter();
- ~vtkSplitByCellScalarFilter() VTK_OVERRIDE;
+ ~vtkSplitByCellScalarFilter() override;
// Usual data generation method
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
bool PassAllPoints;
diff --git a/Filters/General/vtkSplitColumnComponents.h b/Filters/General/vtkSplitColumnComponents.h
index 8e431df3e42609ab09ae259dea7cbd676271fda2..5153c6a1d64a46735af89c3aeb277d806f9e1ef9 100644
--- a/Filters/General/vtkSplitColumnComponents.h
+++ b/Filters/General/vtkSplitColumnComponents.h
@@ -46,7 +46,7 @@ class VTKFILTERSGENERAL_EXPORT vtkSplitColumnComponents : public vtkTableAlgorit
public:
static vtkSplitColumnComponents* New();
vtkTypeMacro(vtkSplitColumnComponents,vtkTableAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -85,7 +85,7 @@ public:
protected:
vtkSplitColumnComponents();
- ~vtkSplitColumnComponents() VTK_OVERRIDE;
+ ~vtkSplitColumnComponents() override;
/**
* Returns the label to use for the specific component in the array based on
@@ -98,7 +98,7 @@ protected:
int RequestData(
vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
int NamingMode;
private:
diff --git a/Filters/General/vtkSplitField.h b/Filters/General/vtkSplitField.h
index d77df3035aeadba2b646fe7d971684aa0dc72163..9bd2f014113da64fd516a0d939c724c528b99df8 100644
--- a/Filters/General/vtkSplitField.h
+++ b/Filters/General/vtkSplitField.h
@@ -65,7 +65,7 @@ class VTKFILTERSGENERAL_EXPORT vtkSplitField : public vtkDataSetAlgorithm
{
public:
vtkTypeMacro(vtkSplitField,vtkDataSetAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Create a new vtkSplitField.
@@ -131,9 +131,9 @@ protected:
};
vtkSplitField();
- ~vtkSplitField() VTK_OVERRIDE;
+ ~vtkSplitField() override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
char* FieldName;
int FieldType;
diff --git a/Filters/General/vtkStructuredGridClip.h b/Filters/General/vtkStructuredGridClip.h
index 452d43af06aa2fd65f7cbbe5474eeb5be569aa38..f43393395c990f1bd95ca09ae4d62b715c3fd3f6 100644
--- a/Filters/General/vtkStructuredGridClip.h
+++ b/Filters/General/vtkStructuredGridClip.h
@@ -39,7 +39,7 @@ class VTKFILTERSGENERAL_EXPORT vtkStructuredGridClip : public vtkStructuredGridA
public:
static vtkStructuredGridClip *New();
vtkTypeMacro(vtkStructuredGridClip,vtkStructuredGridAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -67,7 +67,7 @@ public:
protected:
vtkStructuredGridClip();
- ~vtkStructuredGridClip() VTK_OVERRIDE {}
+ ~vtkStructuredGridClip() override {}
// Time when OutputImageExtent was computed.
vtkTimeStamp CTime;
@@ -78,13 +78,13 @@ protected:
int RequestInformation (vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
void CopyData(vtkStructuredGrid *inData, vtkStructuredGrid *outData, int *ext);
int RequestData(vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
private:
vtkStructuredGridClip(const vtkStructuredGridClip&) VTK_DELETE_FUNCTION;
diff --git a/Filters/General/vtkSubPixelPositionEdgels.h b/Filters/General/vtkSubPixelPositionEdgels.h
index c4571ffbae7c11b7529ca3c7b4780524cdc16f4a..32914fef50e888cc0389176d775a97aaed43dcd3 100644
--- a/Filters/General/vtkSubPixelPositionEdgels.h
+++ b/Filters/General/vtkSubPixelPositionEdgels.h
@@ -48,7 +48,7 @@ class VTKFILTERSGENERAL_EXPORT vtkSubPixelPositionEdgels : public vtkPolyDataAlg
public:
static vtkSubPixelPositionEdgels *New();
vtkTypeMacro(vtkSubPixelPositionEdgels,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -72,11 +72,11 @@ public:
protected:
vtkSubPixelPositionEdgels();
- ~vtkSubPixelPositionEdgels() VTK_OVERRIDE;
+ ~vtkSubPixelPositionEdgels() override;
// Usual data generation method
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
void Move(int xdim, int ydim, int zdim, int x, int y,
float *img, vtkDataArray *inVecs,
diff --git a/Filters/General/vtkSubdivisionFilter.h b/Filters/General/vtkSubdivisionFilter.h
index 4a46e9ad0d6a3585c6cdfdefd1444e4dc8938f14..ab437cf11d44dd75b7bfd6d01f96e43ed97b660f 100644
--- a/Filters/General/vtkSubdivisionFilter.h
+++ b/Filters/General/vtkSubdivisionFilter.h
@@ -38,7 +38,7 @@ class VTKFILTERSGENERAL_EXPORT vtkSubdivisionFilter : public vtkPolyDataAlgorith
{
public:
vtkTypeMacro(vtkSubdivisionFilter,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -62,9 +62,9 @@ public:
protected:
vtkSubdivisionFilter();
- ~vtkSubdivisionFilter() VTK_OVERRIDE {}
+ ~vtkSubdivisionFilter() override {}
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
int NumberOfSubdivisions;
int CheckForTriangles;
diff --git a/Filters/General/vtkSynchronizeTimeFilter.h b/Filters/General/vtkSynchronizeTimeFilter.h
index 7e6c1a491104ffe4f6d8eb266ac1f4e54d037156..d140182cdd573c314db8c8269383066784dcca3a 100644
--- a/Filters/General/vtkSynchronizeTimeFilter.h
+++ b/Filters/General/vtkSynchronizeTimeFilter.h
@@ -58,7 +58,7 @@ public:
protected:
vtkSynchronizeTimeFilter();
- ~vtkSynchronizeTimeFilter() VTK_OVERRIDE;
+ ~vtkSynchronizeTimeFilter() override;
/**
* Helper methods for getting the input time value or output time
@@ -70,17 +70,17 @@ protected:
int RequestInformation(
vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
int RequestUpdateExtent(
vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
int RequestData(
vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
private:
vtkSynchronizeTimeFilter(const vtkSynchronizeTimeFilter&) VTK_DELETE_FUNCTION;
diff --git a/Filters/General/vtkTableBasedClipDataSet.cxx b/Filters/General/vtkTableBasedClipDataSet.cxx
index 3c3952c78305c0a5b2fbfcc1a7e3798cfee6d2e4..fea016ec02841e2bdaaa44d39077b979e6cdebe6 100644
--- a/Filters/General/vtkTableBasedClipDataSet.cxx
+++ b/Filters/General/vtkTableBasedClipDataSet.cxx
@@ -481,8 +481,8 @@ class vtkTableBasedClipperHexList : public vtkTableBasedClipperShapeList
{
public:
vtkTableBasedClipperHexList();
- ~vtkTableBasedClipperHexList() VTK_OVERRIDE;
- int GetVTKType() const VTK_OVERRIDE { return VTK_HEXAHEDRON; }
+ ~vtkTableBasedClipperHexList() override;
+ int GetVTKType() const override { return VTK_HEXAHEDRON; }
void AddHex( int, int, int, int, int, int, int, int, int );
};
@@ -491,8 +491,8 @@ class vtkTableBasedClipperWedgeList : public vtkTableBasedClipperShapeList
{
public:
vtkTableBasedClipperWedgeList();
- ~vtkTableBasedClipperWedgeList() VTK_OVERRIDE;
- int GetVTKType() const VTK_OVERRIDE { return VTK_WEDGE; }
+ ~vtkTableBasedClipperWedgeList() override;
+ int GetVTKType() const override { return VTK_WEDGE; }
void AddWedge( int, int, int, int, int, int, int );
};
@@ -501,8 +501,8 @@ class vtkTableBasedClipperPyramidList : public vtkTableBasedClipperShapeList
{
public:
vtkTableBasedClipperPyramidList();
- ~vtkTableBasedClipperPyramidList() VTK_OVERRIDE;
- int GetVTKType() const VTK_OVERRIDE { return VTK_PYRAMID; }
+ ~vtkTableBasedClipperPyramidList() override;
+ int GetVTKType() const override { return VTK_PYRAMID; }
void AddPyramid( int, int, int, int, int, int );
};
@@ -511,8 +511,8 @@ class vtkTableBasedClipperTetList : public vtkTableBasedClipperShapeList
{
public:
vtkTableBasedClipperTetList();
- ~vtkTableBasedClipperTetList() VTK_OVERRIDE;
- int GetVTKType() const VTK_OVERRIDE { return VTK_TETRA; }
+ ~vtkTableBasedClipperTetList() override;
+ int GetVTKType() const override { return VTK_TETRA; }
void AddTet( int, int, int, int, int );
};
@@ -521,8 +521,8 @@ class vtkTableBasedClipperQuadList : public vtkTableBasedClipperShapeList
{
public:
vtkTableBasedClipperQuadList();
- ~vtkTableBasedClipperQuadList() VTK_OVERRIDE;
- int GetVTKType() const VTK_OVERRIDE { return VTK_QUAD; }
+ ~vtkTableBasedClipperQuadList() override;
+ int GetVTKType() const override { return VTK_QUAD; }
void AddQuad( int, int, int, int, int );
};
@@ -531,8 +531,8 @@ class vtkTableBasedClipperTriList : public vtkTableBasedClipperShapeList
{
public:
vtkTableBasedClipperTriList();
- ~vtkTableBasedClipperTriList() VTK_OVERRIDE;
- int GetVTKType() const VTK_OVERRIDE { return VTK_TRIANGLE; }
+ ~vtkTableBasedClipperTriList() override;
+ int GetVTKType() const override { return VTK_TRIANGLE; }
void AddTri( int, int, int, int );
};
@@ -541,8 +541,8 @@ class vtkTableBasedClipperLineList : public vtkTableBasedClipperShapeList
{
public:
vtkTableBasedClipperLineList();
- ~vtkTableBasedClipperLineList() VTK_OVERRIDE;
- int GetVTKType() const VTK_OVERRIDE { return VTK_LINE; }
+ ~vtkTableBasedClipperLineList() override;
+ int GetVTKType() const override { return VTK_LINE; }
void AddLine( int, int, int );
};
@@ -551,8 +551,8 @@ class vtkTableBasedClipperVertexList : public vtkTableBasedClipperShapeList
{
public:
vtkTableBasedClipperVertexList();
- ~vtkTableBasedClipperVertexList() VTK_OVERRIDE;
- int GetVTKType() const VTK_OVERRIDE { return VTK_VERTEX; }
+ ~vtkTableBasedClipperVertexList() override;
+ int GetVTKType() const override { return VTK_VERTEX; }
void AddVertex( int, int );
};
@@ -603,7 +603,7 @@ class vtkTableBasedClipperVolumeFromVolume :
public:
vtkTableBasedClipperVolumeFromVolume
( int precision, int nPts, int ptSizeGuess );
- ~vtkTableBasedClipperVolumeFromVolume() VTK_OVERRIDE { }
+ ~vtkTableBasedClipperVolumeFromVolume() override { }
void ConstructDataSet( vtkDataSet *,
vtkUnstructuredGrid *, double * );
diff --git a/Filters/General/vtkTableBasedClipDataSet.h b/Filters/General/vtkTableBasedClipDataSet.h
index 5eaf8d1ac477b0230ef8b17c4485c9a99ff267bd..977d7cec5ec7f9ece541909eb6124dfb9d4589ea 100644
--- a/Filters/General/vtkTableBasedClipDataSet.h
+++ b/Filters/General/vtkTableBasedClipDataSet.h
@@ -104,7 +104,7 @@ class VTKFILTERSGENERAL_EXPORT vtkTableBasedClipDataSet : public vtkUnstructured
{
public:
vtkTypeMacro( vtkTableBasedClipDataSet, vtkUnstructuredGridAlgorithm );
- void PrintSelf( ostream & os, vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf( ostream & os, vtkIndent indent ) override;
/**
* Create an instance with a user-specified implicit function, turning off
@@ -115,7 +115,7 @@ public:
/**
* Get the MTime for which the point locator and clip function are considered.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
//@{
/**
@@ -230,11 +230,11 @@ public:
protected:
vtkTableBasedClipDataSet( vtkImplicitFunction * cf = nullptr );
- ~vtkTableBasedClipDataSet() VTK_OVERRIDE;
+ ~vtkTableBasedClipDataSet() override;
int RequestData( vtkInformation *,
- vtkInformationVector **, vtkInformationVector * ) VTK_OVERRIDE;
- int FillInputPortInformation( int port, vtkInformation * info ) VTK_OVERRIDE;
+ vtkInformationVector **, vtkInformationVector * ) override;
+ int FillInputPortInformation( int port, vtkInformation * info ) override;
/**
* This function resorts to the sibling class vtkClipDataSet to handle
diff --git a/Filters/General/vtkTableToPolyData.h b/Filters/General/vtkTableToPolyData.h
index 9b77dab7758f28419e63d85cdf6ff3aca8d8e702..ec89a72b0c287f09c864a53d1f625304616ae8b9 100644
--- a/Filters/General/vtkTableToPolyData.h
+++ b/Filters/General/vtkTableToPolyData.h
@@ -32,7 +32,7 @@ class VTKFILTERSGENERAL_EXPORT vtkTableToPolyData : public vtkPolyDataAlgorithm
public:
static vtkTableToPolyData* New();
vtkTypeMacro(vtkTableToPolyData, vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -135,18 +135,18 @@ public:
protected:
vtkTableToPolyData();
- ~vtkTableToPolyData() VTK_OVERRIDE;
+ ~vtkTableToPolyData() override;
/**
* Overridden to specify that input must be a vtkTable.
*/
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
/**
* Convert input vtkTable to vtkPolyData.
*/
int RequestData(vtkInformation* request,
- vtkInformationVector** inputVector, vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector** inputVector, vtkInformationVector* outputVector) override;
char* XColumn;
char* YColumn;
diff --git a/Filters/General/vtkTableToStructuredGrid.h b/Filters/General/vtkTableToStructuredGrid.h
index c070b786092493bf87048583db89d50bc01f277d..93278d98dba7bb1985027f1bbccbe46ef4a3a4b3 100644
--- a/Filters/General/vtkTableToStructuredGrid.h
+++ b/Filters/General/vtkTableToStructuredGrid.h
@@ -36,7 +36,7 @@ class VTKFILTERSGENERAL_EXPORT vtkTableToStructuredGrid : public vtkStructuredGr
public:
static vtkTableToStructuredGrid* New();
vtkTypeMacro(vtkTableToStructuredGrid, vtkStructuredGridAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -103,27 +103,27 @@ public:
protected:
vtkTableToStructuredGrid();
- ~vtkTableToStructuredGrid() VTK_OVERRIDE;
+ ~vtkTableToStructuredGrid() override;
int Convert(vtkTable*, vtkStructuredGrid*, int extent[6]);
/**
* Overridden to specify that input must be a vtkTable.
*/
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
/**
* Convert input vtkTable to vtkStructuredGrid.
*/
int RequestData(vtkInformation* request,
- vtkInformationVector** inputVector, vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector** inputVector, vtkInformationVector* outputVector) override;
/**
* Request information -- pass whole extent to the pipeline.
*/
int RequestInformation(vtkInformation *vtkNotUsed(request),
vtkInformationVector **vtkNotUsed(inputVector),
- vtkInformationVector *outputVector) VTK_OVERRIDE;
+ vtkInformationVector *outputVector) override;
char* XColumn;
char* YColumn;
diff --git a/Filters/General/vtkTemporalPathLineFilter.h b/Filters/General/vtkTemporalPathLineFilter.h
index 3516db5c9f814a937648d6daaf5f8a306a8dd9d6..c4dccd20db3e65acd7f058cd14dae3ed46220f59 100644
--- a/Filters/General/vtkTemporalPathLineFilter.h
+++ b/Filters/General/vtkTemporalPathLineFilter.h
@@ -59,7 +59,7 @@ public:
*/
static vtkTemporalPathLineFilter *New();
vtkTypeMacro(vtkTemporalPathLineFilter,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -143,13 +143,13 @@ public:
protected:
vtkTemporalPathLineFilter();
- ~vtkTemporalPathLineFilter() VTK_OVERRIDE;
+ ~vtkTemporalPathLineFilter() override;
//
// Make sure the pipeline knows what type we expect as input
//
- int FillInputPortInformation (int port, vtkInformation* info) VTK_OVERRIDE;
- int FillOutputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillInputPortInformation (int port, vtkInformation* info) override;
+ int FillOutputPortInformation(int port, vtkInformation* info) override;
//@{
/**
@@ -157,11 +157,11 @@ protected:
*/
int RequestInformation (vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
//
int RequestData(vtkInformation *request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
//@}
TrailPointer GetTrail(vtkIdType i);
diff --git a/Filters/General/vtkTemporalStatistics.h b/Filters/General/vtkTemporalStatistics.h
index e5521e6e330301afc10a81efe3434c78c9a24d18..044255710354fc7dedc59467d90d5704144ea06a 100644
--- a/Filters/General/vtkTemporalStatistics.h
+++ b/Filters/General/vtkTemporalStatistics.h
@@ -65,7 +65,7 @@ class VTKFILTERSGENERAL_EXPORT vtkTemporalStatistics : public vtkPassInputTypeAl
public:
vtkTypeMacro(vtkTemporalStatistics, vtkPassInputTypeAlgorithm);
static vtkTemporalStatistics *New();
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
//@{
/**
@@ -107,7 +107,7 @@ public:
protected:
vtkTemporalStatistics();
- ~vtkTemporalStatistics() VTK_OVERRIDE;
+ ~vtkTemporalStatistics() override;
int ComputeAverage;
int ComputeMaximum;
@@ -117,20 +117,20 @@ protected:
// Used when iterating the pipeline to keep track of which timestep we are on.
int CurrentTimeIndex;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
int RequestDataObject(vtkInformation *request,
vtkInformationVector **inputVector,
- vtkInformationVector *outputVector) VTK_OVERRIDE;
+ vtkInformationVector *outputVector) override;
int RequestInformation(vtkInformation *request,
vtkInformationVector **inputVector,
- vtkInformationVector *outputVector) VTK_OVERRIDE;
+ vtkInformationVector *outputVector) override;
int RequestUpdateExtent(vtkInformation *request,
vtkInformationVector **inputVector,
- vtkInformationVector *outputVector) VTK_OVERRIDE;
+ vtkInformationVector *outputVector) override;
int RequestData(vtkInformation *request,
vtkInformationVector **inputVector,
- vtkInformationVector *outputVector) VTK_OVERRIDE;
+ vtkInformationVector *outputVector) override;
virtual void InitializeStatistics(vtkDataObject *input,
vtkDataObject *output);
diff --git a/Filters/General/vtkTessellatorFilter.cxx b/Filters/General/vtkTessellatorFilter.cxx
index 48df3f177d07de1f9db784f115e0d167f57b0bac..1984e665a2fa26158b514a8205216135ee879996 100644
--- a/Filters/General/vtkTessellatorFilter.cxx
+++ b/Filters/General/vtkTessellatorFilter.cxx
@@ -59,10 +59,10 @@ public:
{
this->Tessellator = tf;
}
- ~vtkProgressCommand() VTK_OVERRIDE
+ ~vtkProgressCommand() override
{
}
- void Execute( vtkObject*, unsigned long, void* callData ) VTK_OVERRIDE
+ void Execute( vtkObject*, unsigned long, void* callData ) override
{
double subprogress = *( static_cast<double*>( callData ) );
cout << " ++ <" << ( (subprogress / 2. + 0.5) * 100. ) << ">\n";
diff --git a/Filters/General/vtkTessellatorFilter.h b/Filters/General/vtkTessellatorFilter.h
index 6bd52f95dc710bc61798b2cc1415ade5493c0918..7c92526269dd2574eb31ac8b0bc756c93c213c1c 100644
--- a/Filters/General/vtkTessellatorFilter.h
+++ b/Filters/General/vtkTessellatorFilter.h
@@ -69,7 +69,7 @@ class VTKFILTERSGENERAL_EXPORT vtkTessellatorFilter : public vtkUnstructuredGrid
{
public:
vtkTypeMacro(vtkTessellatorFilter,vtkUnstructuredGridAlgorithm);
- void PrintSelf( ostream& os, vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf( ostream& os, vtkIndent indent ) override;
static vtkTessellatorFilter* New();
@@ -79,7 +79,7 @@ public:
virtual void SetSubdivider( vtkDataSetEdgeSubdivisionCriterion* );
vtkGetObjectMacro(Subdivider, vtkDataSetEdgeSubdivisionCriterion);
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
//@{
/**
@@ -130,9 +130,9 @@ public:
protected:
vtkTessellatorFilter();
- ~vtkTessellatorFilter() VTK_OVERRIDE;
+ ~vtkTessellatorFilter() override;
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
/**
* Called by RequestData to set up a multitude of member variables used by
@@ -156,7 +156,7 @@ protected:
*/
int RequestData(vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
vtkStreamingTessellator* Tessellator;
vtkDataSetEdgeSubdivisionCriterion* Subdivider;
diff --git a/Filters/General/vtkTimeSourceExample.h b/Filters/General/vtkTimeSourceExample.h
index ea9965e03d7110758fa498515b79af379d633275..b8c7480c3cabe772563844fcb148b768c779a923 100644
--- a/Filters/General/vtkTimeSourceExample.h
+++ b/Filters/General/vtkTimeSourceExample.h
@@ -36,7 +36,7 @@ class VTKFILTERSGENERAL_EXPORT vtkTimeSourceExample : public vtkUnstructuredGrid
public:
static vtkTimeSourceExample *New();
vtkTypeMacro(vtkTimeSourceExample,vtkUnstructuredGridAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -73,15 +73,15 @@ public:
protected:
vtkTimeSourceExample();
- ~vtkTimeSourceExample() VTK_OVERRIDE;
+ ~vtkTimeSourceExample() override;
int RequestInformation(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
int RequestData(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
void LookupTimeAndValue(double &time, double &value);
diff --git a/Filters/General/vtkTransformFilter.h b/Filters/General/vtkTransformFilter.h
index 78166ade48094ae5dd40445933db7a26803cfedb..129d5d0258d15f6e0ce2e6c739262f54c77fa3b1 100644
--- a/Filters/General/vtkTransformFilter.h
+++ b/Filters/General/vtkTransformFilter.h
@@ -45,12 +45,12 @@ class VTKFILTERSGENERAL_EXPORT vtkTransformFilter : public vtkPointSetAlgorithm
public:
static vtkTransformFilter *New();
vtkTypeMacro(vtkTransformFilter,vtkPointSetAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Return the MTime also considering the transform.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
//@{
/**
@@ -60,7 +60,7 @@ public:
vtkGetObjectMacro(Transform,vtkAbstractTransform);
//@}
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
//@{
/**
@@ -74,14 +74,14 @@ public:
protected:
vtkTransformFilter();
- ~vtkTransformFilter() VTK_OVERRIDE;
+ ~vtkTransformFilter() override;
int RequestDataObject(vtkInformation *request,
vtkInformationVector **inputVector,
- vtkInformationVector *outputVector) VTK_OVERRIDE;
+ vtkInformationVector *outputVector) override;
int RequestData(vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
vtkAbstractTransform *Transform;
int OutputPointsPrecision;
diff --git a/Filters/General/vtkTransformPolyDataFilter.h b/Filters/General/vtkTransformPolyDataFilter.h
index 813930a420552138b0b6e5753c5c090e893f0685..20cb5ce38c0e135de9f1a1dd73db1da57efccb67 100644
--- a/Filters/General/vtkTransformPolyDataFilter.h
+++ b/Filters/General/vtkTransformPolyDataFilter.h
@@ -47,12 +47,12 @@ class VTKFILTERSGENERAL_EXPORT vtkTransformPolyDataFilter : public vtkPolyDataAl
public:
static vtkTransformPolyDataFilter *New();
vtkTypeMacro(vtkTransformPolyDataFilter,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Return the MTime also considering the transform.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
//@{
/**
@@ -74,9 +74,9 @@ public:
protected:
vtkTransformPolyDataFilter();
- ~vtkTransformPolyDataFilter() VTK_OVERRIDE;
+ ~vtkTransformPolyDataFilter() override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
vtkAbstractTransform *Transform;
int OutputPointsPrecision;
diff --git a/Filters/General/vtkUncertaintyTubeFilter.h b/Filters/General/vtkUncertaintyTubeFilter.h
index 6ea74856bf2decd665f4b1c1c67929121cbe4e24..14fde81efc147ad3bf6d006ed72ae3af70cb1a57 100644
--- a/Filters/General/vtkUncertaintyTubeFilter.h
+++ b/Filters/General/vtkUncertaintyTubeFilter.h
@@ -48,7 +48,7 @@ public:
* Standard methods for printing and obtaining type information for instances of this class.
*/
vtkTypeMacro(vtkUncertaintyTubeFilter,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
@@ -67,10 +67,10 @@ public:
protected:
vtkUncertaintyTubeFilter();
- ~vtkUncertaintyTubeFilter() VTK_OVERRIDE;
+ ~vtkUncertaintyTubeFilter() override;
// Integrate data
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
int BuildTubes(vtkPointData *pd, vtkPointData *outPD,
vtkCellData *cd, vtkCellData *outCD, vtkPolyData *output);
diff --git a/Filters/General/vtkVertexGlyphFilter.h b/Filters/General/vtkVertexGlyphFilter.h
index 86dd388fc69b1b0a7ed856770089f9caac7dba54..ebe9f116473fe3997bd4568ec2dce7c3cf9c10a0 100644
--- a/Filters/General/vtkVertexGlyphFilter.h
+++ b/Filters/General/vtkVertexGlyphFilter.h
@@ -41,16 +41,16 @@ class VTKFILTERSGENERAL_EXPORT vtkVertexGlyphFilter : public vtkPolyDataAlgorith
{
public:
vtkTypeMacro(vtkVertexGlyphFilter, vtkPolyDataAlgorithm);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
static vtkVertexGlyphFilter *New();
protected:
vtkVertexGlyphFilter();
- ~vtkVertexGlyphFilter() VTK_OVERRIDE;
+ ~vtkVertexGlyphFilter() override;
int RequestData(vtkInformation *,
- vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int, vtkInformation *) VTK_OVERRIDE;
+ vtkInformationVector **, vtkInformationVector *) override;
+ int FillInputPortInformation(int, vtkInformation *) override;
private:
vtkVertexGlyphFilter(const vtkVertexGlyphFilter &) VTK_DELETE_FUNCTION;
diff --git a/Filters/General/vtkVolumeContourSpectrumFilter.h b/Filters/General/vtkVolumeContourSpectrumFilter.h
index f1db3061a15ba603316be654b99f4c1c88181354..bf63f5163f0d89c1eb039fe4123d8bf21b31c672 100644
--- a/Filters/General/vtkVolumeContourSpectrumFilter.h
+++ b/Filters/General/vtkVolumeContourSpectrumFilter.h
@@ -56,7 +56,7 @@ class VTKFILTERSGENERAL_EXPORT vtkVolumeContourSpectrumFilter :
public:
static vtkVolumeContourSpectrumFilter* New();
vtkTypeMacro(vtkVolumeContourSpectrumFilter, vtkDataObjectAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -89,16 +89,16 @@ public:
protected:
vtkVolumeContourSpectrumFilter();
- ~vtkVolumeContourSpectrumFilter() VTK_OVERRIDE;
+ ~vtkVolumeContourSpectrumFilter() override;
vtkIdType ArcId, FieldId;
int NumberOfSamples;
- int FillInputPortInformation(int portNumber, vtkInformation *) VTK_OVERRIDE;
- int FillOutputPortInformation(int portNumber, vtkInformation *info) VTK_OVERRIDE;
+ int FillInputPortInformation(int portNumber, vtkInformation *) override;
+ int FillOutputPortInformation(int portNumber, vtkInformation *info) override;
int RequestData(vtkInformation *request,
- vtkInformationVector **inputVector, vtkInformationVector *outputVector) VTK_OVERRIDE;
+ vtkInformationVector **inputVector, vtkInformationVector *outputVector) override;
private:
vtkVolumeContourSpectrumFilter(const vtkVolumeContourSpectrumFilter&) VTK_DELETE_FUNCTION;
diff --git a/Filters/General/vtkVoxelContoursToSurfaceFilter.h b/Filters/General/vtkVoxelContoursToSurfaceFilter.h
index 7fea92597a51fd5b734163463ffaa0255dfa5a7e..0b4a9b66605a5ed0b84f4e6ef5bd7bac3f6ea451 100644
--- a/Filters/General/vtkVoxelContoursToSurfaceFilter.h
+++ b/Filters/General/vtkVoxelContoursToSurfaceFilter.h
@@ -51,7 +51,7 @@ class VTKFILTERSGENERAL_EXPORT vtkVoxelContoursToSurfaceFilter : public vtkPolyD
public:
static vtkVoxelContoursToSurfaceFilter *New();
vtkTypeMacro(vtkVoxelContoursToSurfaceFilter,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -69,9 +69,9 @@ public:
protected:
vtkVoxelContoursToSurfaceFilter();
- ~vtkVoxelContoursToSurfaceFilter() VTK_OVERRIDE;
+ ~vtkVoxelContoursToSurfaceFilter() override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
int MemoryLimitInBytes;
diff --git a/Filters/General/vtkWarpLens.h b/Filters/General/vtkWarpLens.h
index d38437380b2ffba3fd22478632cfca2d1cc80b63..ad1ec325650087f1e0beef1444d729f96f223a87 100644
--- a/Filters/General/vtkWarpLens.h
+++ b/Filters/General/vtkWarpLens.h
@@ -31,7 +31,7 @@ class VTKFILTERSGENERAL_EXPORT vtkWarpLens : public vtkPointSetAlgorithm
public:
static vtkWarpLens *New();
vtkTypeMacro(vtkWarpLens,vtkPointSetAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -99,18 +99,18 @@ public:
vtkGetMacro(ImageHeight,int);
//@}
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
protected:
vtkWarpLens();
- ~vtkWarpLens() VTK_OVERRIDE {}
+ ~vtkWarpLens() override {}
int RequestDataObject(vtkInformation *request,
vtkInformationVector **inputVector,
- vtkInformationVector *outputVector) VTK_OVERRIDE;
+ vtkInformationVector *outputVector) override;
int RequestData(vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
double PrincipalPoint[2]; // The calibrated principal point of camera/lens in mm
double K1; // Symmetric radial distortion parameters
diff --git a/Filters/General/vtkWarpScalar.h b/Filters/General/vtkWarpScalar.h
index d3bcc4cc5569b88398f4237357f81b5856a8b5f9..97865ea949337e0e3fa814b0e064744d80f6d6a6 100644
--- a/Filters/General/vtkWarpScalar.h
+++ b/Filters/General/vtkWarpScalar.h
@@ -48,7 +48,7 @@ class VTKFILTERSGENERAL_EXPORT vtkWarpScalar : public vtkPointSetAlgorithm
public:
static vtkWarpScalar *New();
vtkTypeMacro(vtkWarpScalar,vtkPointSetAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -88,18 +88,18 @@ public:
vtkBooleanMacro(XYPlane,int);
//@}
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
protected:
vtkWarpScalar();
- ~vtkWarpScalar() VTK_OVERRIDE;
+ ~vtkWarpScalar() override;
int RequestDataObject(vtkInformation *request,
vtkInformationVector **inputVector,
- vtkInformationVector *outputVector) VTK_OVERRIDE;
+ vtkInformationVector *outputVector) override;
int RequestData(vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
double ScaleFactor;
int UseNormal;
diff --git a/Filters/General/vtkWarpTo.h b/Filters/General/vtkWarpTo.h
index c0e6d844b23114052bf41b4309a03a0d030711a6..799baae91193ecd183d2662e5a795665068516d0 100644
--- a/Filters/General/vtkWarpTo.h
+++ b/Filters/General/vtkWarpTo.h
@@ -31,7 +31,7 @@ class VTKFILTERSGENERAL_EXPORT vtkWarpTo : public vtkPointSetAlgorithm
public:
static vtkWarpTo *New();
vtkTypeMacro(vtkWarpTo,vtkPointSetAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -59,18 +59,18 @@ public:
vtkBooleanMacro(Absolute,int);
//@}
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
protected:
vtkWarpTo();
- ~vtkWarpTo() VTK_OVERRIDE {}
+ ~vtkWarpTo() override {}
int RequestDataObject(vtkInformation *request,
vtkInformationVector **inputVector,
- vtkInformationVector *outputVector) VTK_OVERRIDE;
+ vtkInformationVector *outputVector) override;
int RequestData(vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
double ScaleFactor;
double Position[3];
int Absolute;
diff --git a/Filters/General/vtkWarpVector.h b/Filters/General/vtkWarpVector.h
index 8f2d665774289cf55d867fa5cdeb0757d5802903..85ecbb7b0362135d78b36689656f689d9521ba7c 100644
--- a/Filters/General/vtkWarpVector.h
+++ b/Filters/General/vtkWarpVector.h
@@ -34,7 +34,7 @@ class VTKFILTERSGENERAL_EXPORT vtkWarpVector : public vtkPointSetAlgorithm
public:
static vtkWarpVector *New();
vtkTypeMacro(vtkWarpVector,vtkPointSetAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -44,18 +44,18 @@ public:
vtkGetMacro(ScaleFactor,double);
//@}
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
protected:
vtkWarpVector();
- ~vtkWarpVector() VTK_OVERRIDE;
+ ~vtkWarpVector() override;
int RequestDataObject(vtkInformation *request,
vtkInformationVector **inputVector,
- vtkInformationVector *outputVector) VTK_OVERRIDE;
+ vtkInformationVector *outputVector) override;
int RequestData(vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
double ScaleFactor;
private:
diff --git a/Filters/General/vtkYoungsMaterialInterface.h b/Filters/General/vtkYoungsMaterialInterface.h
index 02d0356576432a2377812ea52562522021f7657e..f9ae1dff302f6be0e0455ff6163fd09b4c9a9282 100644
--- a/Filters/General/vtkYoungsMaterialInterface.h
+++ b/Filters/General/vtkYoungsMaterialInterface.h
@@ -49,7 +49,7 @@ class VTKFILTERSGENERAL_EXPORT vtkYoungsMaterialInterface : public vtkMultiBlock
public:
static vtkYoungsMaterialInterface* New();
vtkTypeMacro(vtkYoungsMaterialInterface,vtkMultiBlockDataSetAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -186,12 +186,12 @@ public:
protected:
vtkYoungsMaterialInterface ();
- ~vtkYoungsMaterialInterface () VTK_OVERRIDE;
+ ~vtkYoungsMaterialInterface () override;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
int RequestData(vtkInformation *request,
vtkInformationVector **inputVector,
- vtkInformationVector *outputVector) VTK_OVERRIDE;
+ vtkInformationVector *outputVector) override;
/**
* Serial implementation of the material aggregation.
diff --git a/Filters/Generic/Testing/Cxx/TestGenericDataSetTessellator.cxx b/Filters/Generic/Testing/Cxx/TestGenericDataSetTessellator.cxx
index 4e84b3d329c9be292dd96d431d5400b6c5c57d8f..ddac9977f7804914c0fedc4259355407f88eb8e3 100644
--- a/Filters/Generic/Testing/Cxx/TestGenericDataSetTessellator.cxx
+++ b/Filters/Generic/Testing/Cxx/TestGenericDataSetTessellator.cxx
@@ -87,7 +87,7 @@ public:
this->RenWin=aRenWin;
}
- void Execute(vtkObject *vtkNotUsed(caller), unsigned long, void*) VTK_OVERRIDE
+ void Execute(vtkObject *vtkNotUsed(caller), unsigned long, void*) override
{
if(this->LabeledDataMapper->GetLabelMode()==VTK_LABEL_SCALARS)
{
diff --git a/Filters/Generic/vtkGenericClip.h b/Filters/Generic/vtkGenericClip.h
index ebff40d4e208af0d11222f90da449f44e315f57d..c91ed919b724c7d5f0d730fc323d284eccab5eb3 100644
--- a/Filters/Generic/vtkGenericClip.h
+++ b/Filters/Generic/vtkGenericClip.h
@@ -74,7 +74,7 @@ class VTKFILTERSGENERIC_EXPORT vtkGenericClip : public vtkUnstructuredGridAlgori
{
public:
vtkTypeMacro(vtkGenericClip,vtkUnstructuredGridAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct with user-specified implicit function; InsideOut turned off;
@@ -175,7 +175,7 @@ public:
/**
* Return the mtime also considering the locator and clip function.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
//@{
/**
@@ -189,10 +189,10 @@ public:
protected:
vtkGenericClip(vtkImplicitFunction *cf=nullptr);
- ~vtkGenericClip() VTK_OVERRIDE;
+ ~vtkGenericClip() override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int FillInputPortInformation(int, vtkInformation*) override;
vtkImplicitFunction *ClipFunction;
diff --git a/Filters/Generic/vtkGenericContourFilter.h b/Filters/Generic/vtkGenericContourFilter.h
index eab6469d3ea0141dda1ea5b1099c341307f935ab..5c674f2ffe09f530999e29f26635c7d864e16471 100644
--- a/Filters/Generic/vtkGenericContourFilter.h
+++ b/Filters/Generic/vtkGenericContourFilter.h
@@ -57,7 +57,7 @@ public:
vtkTypeMacro(vtkGenericContourFilter,
vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct object with initial range (0,1) and single contour value
@@ -84,7 +84,7 @@ public:
/**
* Modified GetMTime Because we delegate to vtkContourValues
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
//@{
/**
@@ -148,11 +148,11 @@ public:
protected:
vtkGenericContourFilter();
- ~vtkGenericContourFilter() VTK_OVERRIDE;
+ ~vtkGenericContourFilter() override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
- int FillInputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
+ int FillInputPortInformation(int, vtkInformation*) override;
vtkContourValues *ContourValues;
int ComputeNormals;
diff --git a/Filters/Generic/vtkGenericCutter.h b/Filters/Generic/vtkGenericCutter.h
index 159984c8b8e0b094a7d144ffd0c2cc5dc0257242..a4e32849709dac5b0b02c636aa6b4fe52c3bedb3 100644
--- a/Filters/Generic/vtkGenericCutter.h
+++ b/Filters/Generic/vtkGenericCutter.h
@@ -60,7 +60,7 @@ class VTKFILTERSGENERIC_EXPORT vtkGenericCutter : public vtkPolyDataAlgorithm
{
public:
vtkTypeMacro(vtkGenericCutter,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct with user-specified implicit function; initial value of 0.0; and
@@ -120,7 +120,7 @@ public:
* Override GetMTime because we delegate to vtkContourValues and refer to
* vtkImplicitFunction.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
//@{
/**
@@ -158,14 +158,14 @@ public:
protected:
vtkGenericCutter(vtkImplicitFunction *cf=nullptr);
- ~vtkGenericCutter() VTK_OVERRIDE;
+ ~vtkGenericCutter() override;
//@{
/**
* Actual implementation of the cutter operation.
*/
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int FillInputPortInformation(int, vtkInformation*) override;
//@}
vtkImplicitFunction *CutFunction;
diff --git a/Filters/Generic/vtkGenericDataSetTessellator.h b/Filters/Generic/vtkGenericDataSetTessellator.h
index 46575e4ce973c7d4c80ad6f912c5b7f0a9c4214a..38c1ce5f2af12eac8c3f405c5e7da1af24858225 100644
--- a/Filters/Generic/vtkGenericDataSetTessellator.h
+++ b/Filters/Generic/vtkGenericDataSetTessellator.h
@@ -52,7 +52,7 @@ public:
static vtkGenericDataSetTessellator *New();
vtkTypeMacro(vtkGenericDataSetTessellator,
vtkUnstructuredGridAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -96,15 +96,15 @@ public:
/**
* Return the MTime also considering the locator.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
protected:
vtkGenericDataSetTessellator();
- ~vtkGenericDataSetTessellator() VTK_OVERRIDE;
+ ~vtkGenericDataSetTessellator() override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
- int FillInputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
+ int FillInputPortInformation(int, vtkInformation*) override;
// See Set/Get KeepCellIds() for explanations.
int KeepCellIds;
diff --git a/Filters/Generic/vtkGenericGeometryFilter.h b/Filters/Generic/vtkGenericGeometryFilter.h
index 13e6e6de00cd06c0d9d523cac8bda1c4462bd82d..1bd2d1eecfdc917c1823e633f8c12493a192d5a3 100644
--- a/Filters/Generic/vtkGenericGeometryFilter.h
+++ b/Filters/Generic/vtkGenericGeometryFilter.h
@@ -58,7 +58,7 @@ class VTKFILTERSGENERIC_EXPORT vtkGenericGeometryFilter : public vtkPolyDataAlgo
public:
static vtkGenericGeometryFilter *New();
vtkTypeMacro(vtkGenericGeometryFilter,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -161,7 +161,7 @@ public:
/**
* Return the MTime also considering the locator.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
//@{
/**
@@ -177,15 +177,15 @@ public:
protected:
vtkGenericGeometryFilter();
- ~vtkGenericGeometryFilter() VTK_OVERRIDE;
+ ~vtkGenericGeometryFilter() override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
void PolyDataExecute(); //special cases for performance
void UnstructuredGridExecute();
void StructuredGridExecute();
- int RequestUpdateExtent(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestUpdateExtent(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
- int FillInputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
+ int FillInputPortInformation(int, vtkInformation*) override;
vtkIdType PointMaximum;
vtkIdType PointMinimum;
diff --git a/Filters/Generic/vtkGenericGlyph3DFilter.h b/Filters/Generic/vtkGenericGlyph3DFilter.h
index 6bd3dcf3e78512cf9f6b5b25421e76800df1345a..04749e9bb07535a42626435e97727ae2e2c9d3d9 100644
--- a/Filters/Generic/vtkGenericGlyph3DFilter.h
+++ b/Filters/Generic/vtkGenericGlyph3DFilter.h
@@ -103,7 +103,7 @@ class VTKFILTERSGENERIC_EXPORT vtkGenericGlyph3DFilter : public vtkPolyDataAlgor
{
public:
vtkTypeMacro(vtkGenericGlyph3DFilter,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct object with scaling on, scaling mode is by scalar value,
@@ -284,13 +284,13 @@ public:
protected:
vtkGenericGlyph3DFilter();
- ~vtkGenericGlyph3DFilter() VTK_OVERRIDE;
+ ~vtkGenericGlyph3DFilter() override;
- int FillInputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
+ int FillInputPortInformation(int, vtkInformation*) override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int RequestInformation(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int RequestUpdateExtent(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int RequestInformation(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int RequestUpdateExtent(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
vtkPolyData **Source; // Geometry to copy to each point
int Scaling; // Determine whether scaling of geometry is performed
int ScaleMode; // Scale by scalar value or vector magnitude
diff --git a/Filters/Generic/vtkGenericOutlineFilter.h b/Filters/Generic/vtkGenericOutlineFilter.h
index 604f5667e40c19f486bcfdb78ce21081c4695bb4..62ceb03127c9af7f754565d342e8273aff8e7ff3 100644
--- a/Filters/Generic/vtkGenericOutlineFilter.h
+++ b/Filters/Generic/vtkGenericOutlineFilter.h
@@ -42,13 +42,13 @@ public:
protected:
vtkGenericOutlineFilter();
- ~vtkGenericOutlineFilter() VTK_OVERRIDE;
+ ~vtkGenericOutlineFilter() override;
vtkOutlineSource *OutlineSource;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int RequestInformation(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int RequestInformation(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
- int FillInputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
+ int FillInputPortInformation(int, vtkInformation*) override;
private:
vtkGenericOutlineFilter(const vtkGenericOutlineFilter&) VTK_DELETE_FUNCTION;
diff --git a/Filters/Generic/vtkGenericProbeFilter.h b/Filters/Generic/vtkGenericProbeFilter.h
index 0985f67c7ca58bad24eec3dd7b98aff00ebcef56..9f3d57f08f54e699d74b3de0dd6c83500345618a 100644
--- a/Filters/Generic/vtkGenericProbeFilter.h
+++ b/Filters/Generic/vtkGenericProbeFilter.h
@@ -53,7 +53,7 @@ class VTKFILTERSGENERIC_EXPORT vtkGenericProbeFilter : public vtkDataSetAlgorith
public:
static vtkGenericProbeFilter *New();
vtkTypeMacro(vtkGenericProbeFilter,vtkDataSetAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -74,12 +74,12 @@ public:
protected:
vtkGenericProbeFilter();
- ~vtkGenericProbeFilter() VTK_OVERRIDE;
+ ~vtkGenericProbeFilter() override;
- int RequestInformation(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestInformation(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
- int FillInputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
+ int FillInputPortInformation(int, vtkInformation*) override;
vtkIdTypeArray *ValidPoints;
diff --git a/Filters/Generic/vtkGenericStreamTracer.h b/Filters/Generic/vtkGenericStreamTracer.h
index db196f26519daf6ca90bd005f20201be53f4a26a..13e7e64d7c3e913ea886a3d360da92e5da3291fe 100644
--- a/Filters/Generic/vtkGenericStreamTracer.h
+++ b/Filters/Generic/vtkGenericStreamTracer.h
@@ -84,7 +84,7 @@ class VTKFILTERSGENERIC_EXPORT vtkGenericStreamTracer : public vtkPolyDataAlgori
{
public:
vtkTypeMacro(vtkGenericStreamTracer,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct object to start from position (0,0,0), integrate forward,
@@ -118,7 +118,7 @@ public:
*/
void SetSourceConnection(vtkAlgorithmOutput* algOutput);
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
enum Units
{
@@ -363,13 +363,13 @@ public:
protected:
vtkGenericStreamTracer();
- ~vtkGenericStreamTracer() VTK_OVERRIDE;
+ ~vtkGenericStreamTracer() override;
// hide the superclass' AddInput() from the user and the compiler
void AddInput(vtkDataObject *)
{ vtkErrorMacro( << "AddInput() must be called with a vtkGenericDataSet not a vtkDataObject."); };
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
/**
* Compute the vorticity at point `pcoords' in cell `cell' for the
diff --git a/Filters/Geometry/vtkAbstractGridConnectivity.h b/Filters/Geometry/vtkAbstractGridConnectivity.h
index 90eeb453546489383e5e274f53633da20ea67b01..1afe86918e6ec7671737794df548312094ddbecd 100644
--- a/Filters/Geometry/vtkAbstractGridConnectivity.h
+++ b/Filters/Geometry/vtkAbstractGridConnectivity.h
@@ -64,7 +64,7 @@ class VTKFILTERSGEOMETRY_EXPORT vtkAbstractGridConnectivity : public vtkObject
{
public:
vtkTypeMacro( vtkAbstractGridConnectivity, vtkObject );
- void PrintSelf(ostream &os,vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf(ostream &os,vtkIndent indent ) override;
//@{
/**
@@ -143,7 +143,7 @@ public:
protected:
vtkAbstractGridConnectivity();
- ~vtkAbstractGridConnectivity() VTK_OVERRIDE;
+ ~vtkAbstractGridConnectivity() override;
/**
* Fills the ghost arrays for the given grid.
diff --git a/Filters/Geometry/vtkCompositeDataGeometryFilter.h b/Filters/Geometry/vtkCompositeDataGeometryFilter.h
index 1f666c241c7b238db02588b060eb5789479e2f80..221be1ba2a5141aac49461f0a0df525ca74cca38 100644
--- a/Filters/Geometry/vtkCompositeDataGeometryFilter.h
+++ b/Filters/Geometry/vtkCompositeDataGeometryFilter.h
@@ -35,23 +35,23 @@ class VTKFILTERSGEOMETRY_EXPORT vtkCompositeDataGeometryFilter : public vtkPolyD
public:
static vtkCompositeDataGeometryFilter *New();
vtkTypeMacro(vtkCompositeDataGeometryFilter,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* see vtkAlgorithm for details
*/
int ProcessRequest(vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
protected:
vtkCompositeDataGeometryFilter();
- ~vtkCompositeDataGeometryFilter() VTK_OVERRIDE;
+ ~vtkCompositeDataGeometryFilter() override;
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
// Create a default executive.
- vtkExecutive* CreateDefaultExecutive() VTK_OVERRIDE;
+ vtkExecutive* CreateDefaultExecutive() override;
virtual int RequestCompositeData(vtkInformation*,
vtkInformationVector**,
diff --git a/Filters/Geometry/vtkDataSetGhostGenerator.h b/Filters/Geometry/vtkDataSetGhostGenerator.h
index 447f8d54e806c2ee533bb0d6559172419a0c5a71..0602e29e4b28be451838eb7e45f601e5c7c61b93 100644
--- a/Filters/Geometry/vtkDataSetGhostGenerator.h
+++ b/Filters/Geometry/vtkDataSetGhostGenerator.h
@@ -44,7 +44,7 @@ class VTKFILTERSGEOMETRY_EXPORT vtkDataSetGhostGenerator:
{
public:
vtkTypeMacro(vtkDataSetGhostGenerator,vtkMultiBlockDataSetAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -55,16 +55,16 @@ public:
//@}
// Standard VTK pipeline routines
- int FillInputPortInformation(int port,vtkInformation *info) VTK_OVERRIDE;
- int FillOutputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port,vtkInformation *info) override;
+ int FillOutputPortInformation(int port, vtkInformation *info) override;
int RequestData(
vtkInformation *rqst, vtkInformationVector **inputVector,
- vtkInformationVector* outputVector ) VTK_OVERRIDE;
+ vtkInformationVector* outputVector ) override;
protected:
vtkDataSetGhostGenerator();
- ~vtkDataSetGhostGenerator() VTK_OVERRIDE;
+ ~vtkDataSetGhostGenerator() override;
/**
* Generate ghost layers. Implemented by concrete implementations.
diff --git a/Filters/Geometry/vtkDataSetRegionSurfaceFilter.h b/Filters/Geometry/vtkDataSetRegionSurfaceFilter.h
index 8d2d215a4aa832996e7d33f79e16b80143cc5b42..34c118db4d922b462b8d6d6c27e43365a0321e0d 100644
--- a/Filters/Geometry/vtkDataSetRegionSurfaceFilter.h
+++ b/Filters/Geometry/vtkDataSetRegionSurfaceFilter.h
@@ -32,7 +32,7 @@ class VTKFILTERSGEOMETRY_EXPORT vtkDataSetRegionSurfaceFilter : public vtkDataSe
public:
static vtkDataSetRegionSurfaceFilter* New();
vtkTypeMacro(vtkDataSetRegionSurfaceFilter, vtkDataSetSurfaceFilter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -44,13 +44,13 @@ public:
//@}
int UnstructuredGridExecute(vtkDataSet *input,
- vtkPolyData *output) VTK_OVERRIDE;
+ vtkPolyData *output) override;
//make it clear we want all the recordOrigCellId signatures from our parent
using vtkDataSetSurfaceFilter::RecordOrigCellId;
//override one of the signatures
- void RecordOrigCellId(vtkIdType newIndex, vtkFastGeomQuad *quad) VTK_OVERRIDE;
+ void RecordOrigCellId(vtkIdType newIndex, vtkFastGeomQuad *quad) override;
//@{
/**
@@ -99,25 +99,25 @@ public:
protected:
vtkDataSetRegionSurfaceFilter();
- ~vtkDataSetRegionSurfaceFilter() VTK_OVERRIDE;
+ ~vtkDataSetRegionSurfaceFilter() override;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
/// Implementation of the algorithm.
int RequestData(vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
virtual void InsertQuadInHash(vtkIdType a, vtkIdType b, vtkIdType c,
vtkIdType d, vtkIdType sourceId, vtkIdType faceId);
void InsertQuadInHash(vtkIdType a, vtkIdType b, vtkIdType c,
- vtkIdType d, vtkIdType sourceId) VTK_OVERRIDE
+ vtkIdType d, vtkIdType sourceId) override
{
this->InsertQuadInHash(a,b,c,d,sourceId, -1); //for -Woverloaded-virtual comp warning
}
void InsertTriInHash(vtkIdType a, vtkIdType b, vtkIdType c,
- vtkIdType sourceId, vtkIdType faceId) VTK_OVERRIDE;
+ vtkIdType sourceId, vtkIdType faceId) override;
virtual void InsertTriInHash(vtkIdType a, vtkIdType b, vtkIdType c,
vtkIdType sourceId)
{
diff --git a/Filters/Geometry/vtkDataSetSurfaceFilter.h b/Filters/Geometry/vtkDataSetSurfaceFilter.h
index adbe01919a77873a287878abfcb8a10e3cfcf04f..23fd423ae7e9e10e23b3f0b924b3d75a70b54342 100644
--- a/Filters/Geometry/vtkDataSetSurfaceFilter.h
+++ b/Filters/Geometry/vtkDataSetSurfaceFilter.h
@@ -51,7 +51,7 @@ class VTKFILTERSGEOMETRY_EXPORT vtkDataSetSurfaceFilter : public vtkPolyDataAlgo
public:
static vtkDataSetSurfaceFilter *New();
vtkTypeMacro(vtkDataSetSurfaceFilter,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -172,14 +172,14 @@ public:
protected:
vtkDataSetSurfaceFilter();
- ~vtkDataSetSurfaceFilter() VTK_OVERRIDE;
+ ~vtkDataSetSurfaceFilter() override;
int UseStrips;
- int RequestUpdateExtent(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestUpdateExtent(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
// Helper methods.
diff --git a/Filters/Geometry/vtkGeometryFilter.h b/Filters/Geometry/vtkGeometryFilter.h
index faa27330f6cbf8951ef098c44db027a8a58143d6..ff0f7a932917fc9676a1372722b6a56bff15baa4 100644
--- a/Filters/Geometry/vtkGeometryFilter.h
+++ b/Filters/Geometry/vtkGeometryFilter.h
@@ -63,7 +63,7 @@ class VTKFILTERSGEOMETRY_EXPORT vtkGeometryFilter : public vtkPolyDataAlgorithm
public:
static vtkGeometryFilter *New();
vtkTypeMacro(vtkGeometryFilter,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -166,7 +166,7 @@ public:
/**
* Return the MTime also considering the locator.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
//@{
/**
@@ -181,16 +181,16 @@ public:
protected:
vtkGeometryFilter();
- ~vtkGeometryFilter() VTK_OVERRIDE;
+ ~vtkGeometryFilter() override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
//special cases for performance
void PolyDataExecute(vtkDataSet *, vtkPolyData *);
void UnstructuredGridExecute(vtkDataSet *, vtkPolyData *);
void StructuredGridExecute(vtkDataSet *, vtkPolyData *, vtkInformation *);
- int RequestUpdateExtent(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestUpdateExtent(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
vtkIdType PointMaximum;
vtkIdType PointMinimum;
diff --git a/Filters/Geometry/vtkHierarchicalDataSetGeometryFilter.h b/Filters/Geometry/vtkHierarchicalDataSetGeometryFilter.h
index 7bf14e7ae8744dda9a9254c94307a7aafe0a49e7..dceed99ae2e1abb51fc7b3c2180292821aea5c0d 100644
--- a/Filters/Geometry/vtkHierarchicalDataSetGeometryFilter.h
+++ b/Filters/Geometry/vtkHierarchicalDataSetGeometryFilter.h
@@ -37,12 +37,12 @@ public:
static vtkHierarchicalDataSetGeometryFilter *New();
vtkTypeMacro(vtkHierarchicalDataSetGeometryFilter,
vtkCompositeDataGeometryFilter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkHierarchicalDataSetGeometryFilter();
- ~vtkHierarchicalDataSetGeometryFilter() VTK_OVERRIDE;
+ ~vtkHierarchicalDataSetGeometryFilter() override;
private:
vtkHierarchicalDataSetGeometryFilter(const vtkHierarchicalDataSetGeometryFilter&) VTK_DELETE_FUNCTION;
diff --git a/Filters/Geometry/vtkImageDataGeometryFilter.h b/Filters/Geometry/vtkImageDataGeometryFilter.h
index d714080f93415acf2b5639b414b12a7ec3062418..9b7eabda1d9aca7475e1539adfb197d88bc230db 100644
--- a/Filters/Geometry/vtkImageDataGeometryFilter.h
+++ b/Filters/Geometry/vtkImageDataGeometryFilter.h
@@ -45,7 +45,7 @@ class VTKFILTERSGEOMETRY_EXPORT vtkImageDataGeometryFilter : public vtkPolyDataA
{
public:
vtkTypeMacro(vtkImageDataGeometryFilter,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct with initial extent of all the data
@@ -95,10 +95,10 @@ public:
protected:
vtkImageDataGeometryFilter();
- ~vtkImageDataGeometryFilter() VTK_OVERRIDE {}
+ ~vtkImageDataGeometryFilter() override {}
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
int Extent[6];
int ThresholdCells;
diff --git a/Filters/Geometry/vtkImageDataToUniformGrid.h b/Filters/Geometry/vtkImageDataToUniformGrid.h
index b7a89aed984f90809869af5cd41dadb8fa4715f4..b69f452ec233be77046860da41848fc3720d7198 100644
--- a/Filters/Geometry/vtkImageDataToUniformGrid.h
+++ b/Filters/Geometry/vtkImageDataToUniformGrid.h
@@ -40,7 +40,7 @@ class VTKFILTERSGEOMETRY_EXPORT vtkImageDataToUniformGrid
public:
static vtkImageDataToUniformGrid *New();
vtkTypeMacro(vtkImageDataToUniformGrid,vtkDataObjectAlgorithm);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
//@{
/**
@@ -56,17 +56,17 @@ class VTKFILTERSGEOMETRY_EXPORT vtkImageDataToUniformGrid
protected:
vtkImageDataToUniformGrid();
- ~vtkImageDataToUniformGrid() VTK_OVERRIDE;
+ ~vtkImageDataToUniformGrid() override;
int RequestData(vtkInformation *req,
vtkInformationVector **inV,
- vtkInformationVector *outV) VTK_OVERRIDE;
+ vtkInformationVector *outV) override;
int RequestDataObject(vtkInformation *req,
vtkInformationVector **inV,
- vtkInformationVector *outV) VTK_OVERRIDE;
+ vtkInformationVector *outV) override;
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
- int FillOutputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
+ int FillOutputPortInformation(int port, vtkInformation* info) override;
virtual int Process(vtkImageData* input, int association, const char* arrayName,
vtkUniformGrid* output);
diff --git a/Filters/Geometry/vtkLinearToQuadraticCellsFilter.h b/Filters/Geometry/vtkLinearToQuadraticCellsFilter.h
index cfbb624eface8af1063a50e440334de2da8b37cd..94cec903647b90c9083855c69da3b28dc062f848 100644
--- a/Filters/Geometry/vtkLinearToQuadraticCellsFilter.h
+++ b/Filters/Geometry/vtkLinearToQuadraticCellsFilter.h
@@ -37,7 +37,7 @@ class VTKFILTERSGEOMETRY_EXPORT vtkLinearToQuadraticCellsFilter :
{
public:
vtkTypeMacro(vtkLinearToQuadraticCellsFilter,vtkUnstructuredGridAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkLinearToQuadraticCellsFilter *New();
//@{
@@ -69,14 +69,14 @@ public:
/**
* Return the mtime also considering the locator.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
protected:
vtkLinearToQuadraticCellsFilter();
- ~vtkLinearToQuadraticCellsFilter() VTK_OVERRIDE;
+ ~vtkLinearToQuadraticCellsFilter() override;
int RequestData(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
vtkIncrementalPointLocator *Locator;
int OutputPointsPrecision;
diff --git a/Filters/Geometry/vtkProjectSphereFilter.h b/Filters/Geometry/vtkProjectSphereFilter.h
index 5df2121d7834ab11cf6cc053b887b921417f5ad9..a102864fba461ef3b01746a1d5145d509f53d091 100644
--- a/Filters/Geometry/vtkProjectSphereFilter.h
+++ b/Filters/Geometry/vtkProjectSphereFilter.h
@@ -38,7 +38,7 @@ class VTKFILTERSGEOMETRY_EXPORT vtkProjectSphereFilter :
{
public:
vtkTypeMacro(vtkProjectSphereFilter, vtkPointSetAlgorithm);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
static vtkProjectSphereFilter *New();
@@ -73,12 +73,12 @@ public:
protected:
vtkProjectSphereFilter();
- ~vtkProjectSphereFilter() VTK_OVERRIDE;
+ ~vtkProjectSphereFilter() override;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
int RequestData(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
void TransformPointInformation(vtkPointSet* input, vtkPointSet* output, vtkIdList*);
void TransformCellInformation(vtkPointSet* input, vtkPointSet* output, vtkIdList*);
diff --git a/Filters/Geometry/vtkRectilinearGridGeometryFilter.h b/Filters/Geometry/vtkRectilinearGridGeometryFilter.h
index 1ac3e4802dfed2bb5e8def5908e446fe71074c58..3ced5bd08263c638da33aaf7e9f1a1564704025c 100644
--- a/Filters/Geometry/vtkRectilinearGridGeometryFilter.h
+++ b/Filters/Geometry/vtkRectilinearGridGeometryFilter.h
@@ -45,7 +45,7 @@ class VTKFILTERSGEOMETRY_EXPORT vtkRectilinearGridGeometryFilter : public vtkPol
{
public:
vtkTypeMacro(vtkRectilinearGridGeometryFilter,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct with initial extent (0,100, 0,100, 0,0) (i.e., a k-plane).
@@ -72,10 +72,10 @@ public:
protected:
vtkRectilinearGridGeometryFilter();
- ~vtkRectilinearGridGeometryFilter() VTK_OVERRIDE {}
+ ~vtkRectilinearGridGeometryFilter() override {}
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
int Extent[6];
private:
diff --git a/Filters/Geometry/vtkRectilinearGridPartitioner.h b/Filters/Geometry/vtkRectilinearGridPartitioner.h
index c71b2809c2231a99df817206ec3b12f071abeeb4..ce5cab56b1c504d205e0af9b907c5605b1baaa6c 100644
--- a/Filters/Geometry/vtkRectilinearGridPartitioner.h
+++ b/Filters/Geometry/vtkRectilinearGridPartitioner.h
@@ -43,7 +43,7 @@ class VTKFILTERSGEOMETRY_EXPORT vtkRectilinearGridPartitioner :
public:
static vtkRectilinearGridPartitioner *New();
vtkTypeMacro(vtkRectilinearGridPartitioner, vtkMultiBlockDataSetAlgorithm);
- void PrintSelf(ostream &oss, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &oss, vtkIndent indent) override;
//@{
/**
@@ -69,7 +69,7 @@ public:
protected:
vtkRectilinearGridPartitioner();
- ~vtkRectilinearGridPartitioner() VTK_OVERRIDE;
+ ~vtkRectilinearGridPartitioner() override;
/**
* Extracts the coordinates
@@ -82,9 +82,9 @@ protected:
// Standard Pipeline methods
int RequestData(
- vtkInformation*,vtkInformationVector**,vtkInformationVector*) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
- int FillOutputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ vtkInformation*,vtkInformationVector**,vtkInformationVector*) override;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
+ int FillOutputPortInformation(int port, vtkInformation *info) override;
int NumberOfPartitions;
int NumberOfGhostLayers;
diff --git a/Filters/Geometry/vtkStructuredAMRGridConnectivity.h b/Filters/Geometry/vtkStructuredAMRGridConnectivity.h
index f175b801d982e8786e4c01345b49f16ae7a7b307..a27f683d7047284ef18d377eb5ec71815136859d 100644
--- a/Filters/Geometry/vtkStructuredAMRGridConnectivity.h
+++ b/Filters/Geometry/vtkStructuredAMRGridConnectivity.h
@@ -49,7 +49,7 @@ class VTKFILTERSGEOMETRY_EXPORT vtkStructuredAMRGridConnectivity :
public:
static vtkStructuredAMRGridConnectivity* New();
vtkTypeMacro(vtkStructuredAMRGridConnectivity, vtkAbstractGridConnectivity);
- void PrintSelf(ostream& os, vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent ) override;
/**
* Initializes this instance of vtkStructuredAMRGridConnectivity where N
@@ -65,12 +65,12 @@ public:
/**
* Computes neighboring information.
*/
- void ComputeNeighbors() VTK_OVERRIDE;
+ void ComputeNeighbors() override;
/**
* Creates ghost layers.
*/
- void CreateGhostLayers(const int N=1) VTK_OVERRIDE;
+ void CreateGhostLayers(const int N=1) override;
/**
* Registers the AMR grid with the given global linear grid ID (starting
@@ -146,12 +146,12 @@ public:
protected:
vtkStructuredAMRGridConnectivity();
- ~vtkStructuredAMRGridConnectivity() VTK_OVERRIDE;
+ ~vtkStructuredAMRGridConnectivity() override;
/**
* Sets the total number of grids(blocks) in the AMR hierarchy
*/
- void SetNumberOfGrids( const unsigned int N ) VTK_OVERRIDE;
+ void SetNumberOfGrids( const unsigned int N ) override;
/**
* Creates the ghosted mask arrays
@@ -419,7 +419,7 @@ protected:
void FillGhostArrays(
const int gridId,
vtkUnsignedCharArray* nodesArray,
- vtkUnsignedCharArray* cellsArray ) VTK_OVERRIDE;
+ vtkUnsignedCharArray* cellsArray ) override;
/**
* Compute the AMR neighbor of grid "i" and its neighbor grid "j".
diff --git a/Filters/Geometry/vtkStructuredAMRNeighbor.h b/Filters/Geometry/vtkStructuredAMRNeighbor.h
index 191ad0d414261e69d591246116be664efc6667b6..86663760a463604e909713e672fbb22a48521d95 100644
--- a/Filters/Geometry/vtkStructuredAMRNeighbor.h
+++ b/Filters/Geometry/vtkStructuredAMRNeighbor.h
@@ -81,7 +81,7 @@ public:
/**
* Destructor.
*/
- ~vtkStructuredAMRNeighbor() VTK_OVERRIDE {}
+ ~vtkStructuredAMRNeighbor() override {}
/**
* Overload assignment operator.
@@ -108,7 +108,7 @@ public:
*/
void ComputeSendAndReceiveExtent(
int gridRealExtent[6], int gridGhostedExtent[6], int neiRealExtent[6],
- int WholeExtent[6], const int N) VTK_OVERRIDE;
+ int WholeExtent[6], const int N) override;
};
//@}
diff --git a/Filters/Geometry/vtkStructuredGridConnectivity.h b/Filters/Geometry/vtkStructuredGridConnectivity.h
index 38f6b533873b136a50a6c3dfc20ecb27628874b0..3ab1812cab7b41f19df12d4f9fd15c7431021ca8 100644
--- a/Filters/Geometry/vtkStructuredGridConnectivity.h
+++ b/Filters/Geometry/vtkStructuredGridConnectivity.h
@@ -60,7 +60,7 @@ class VTKFILTERSGEOMETRY_EXPORT vtkStructuredGridConnectivity :
public:
static vtkStructuredGridConnectivity* New();
vtkTypeMacro( vtkStructuredGridConnectivity, vtkAbstractGridConnectivity );
- void PrintSelf(ostream& os, vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent ) override;
//@{
/**
@@ -80,7 +80,7 @@ public:
/**
* Set/Get the total number of domains distributed among processors
*/
- void SetNumberOfGrids( const unsigned int N ) VTK_OVERRIDE;
+ void SetNumberOfGrids( const unsigned int N ) override;
/**
* Registers the current grid corresponding to the grid ID by its global
@@ -112,7 +112,7 @@ public:
/**
* Computes neighboring information
*/
- void ComputeNeighbors() VTK_OVERRIDE;
+ void ComputeNeighbors() override;
/**
* Returns the number of neighbors for the grid corresponding to the given
@@ -144,16 +144,16 @@ public:
void FillGhostArrays(
const int gridID,
vtkUnsignedCharArray *nodesArray,
- vtkUnsignedCharArray *cellsArray ) VTK_OVERRIDE;
+ vtkUnsignedCharArray *cellsArray ) override;
/**
* Creates ghost layers.
*/
- void CreateGhostLayers( const int N=1 ) VTK_OVERRIDE;
+ void CreateGhostLayers( const int N=1 ) override;
protected:
vtkStructuredGridConnectivity();
- ~vtkStructuredGridConnectivity() VTK_OVERRIDE;
+ ~vtkStructuredGridConnectivity() override;
/**
* Returns true iff Lo <= idx <= Hi, otherwise false.
diff --git a/Filters/Geometry/vtkStructuredGridGeometryFilter.h b/Filters/Geometry/vtkStructuredGridGeometryFilter.h
index 355bf7e3a4b71203c7b25b515f8b2878c03ee4c1..1b78d85668b9dd7d5204ae42913f4d29d7ee739b 100644
--- a/Filters/Geometry/vtkStructuredGridGeometryFilter.h
+++ b/Filters/Geometry/vtkStructuredGridGeometryFilter.h
@@ -52,7 +52,7 @@ class VTKFILTERSGEOMETRY_EXPORT vtkStructuredGridGeometryFilter : public vtkPoly
public:
static vtkStructuredGridGeometryFilter *New();
vtkTypeMacro(vtkStructuredGridGeometryFilter,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -74,11 +74,11 @@ public:
protected:
vtkStructuredGridGeometryFilter();
- ~vtkStructuredGridGeometryFilter() VTK_OVERRIDE {}
+ ~vtkStructuredGridGeometryFilter() override {}
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int RequestUpdateExtent(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int RequestUpdateExtent(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
int Extent[6];
private:
diff --git a/Filters/Geometry/vtkStructuredGridGhostDataGenerator.h b/Filters/Geometry/vtkStructuredGridGhostDataGenerator.h
index 827764422093681beda61b1e0abfed36b791c2a1..1e1765510ff78127f870bd564be086d6e6ba70c6 100644
--- a/Filters/Geometry/vtkStructuredGridGhostDataGenerator.h
+++ b/Filters/Geometry/vtkStructuredGridGhostDataGenerator.h
@@ -62,11 +62,11 @@ class VTKFILTERSGEOMETRY_EXPORT vtkStructuredGridGhostDataGenerator :
public:
static vtkStructuredGridGhostDataGenerator* New();
vtkTypeMacro(vtkStructuredGridGhostDataGenerator,vtkDataSetGhostGenerator);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
protected:
vtkStructuredGridGhostDataGenerator();
- ~vtkStructuredGridGhostDataGenerator() VTK_OVERRIDE;
+ ~vtkStructuredGridGhostDataGenerator() override;
/**
* Registers the grid associated with this instance of multi-block.
@@ -84,7 +84,7 @@ protected:
* Generates ghost layers.
*/
void GenerateGhostLayers(
- vtkMultiBlockDataSet *in, vtkMultiBlockDataSet *out) VTK_OVERRIDE;
+ vtkMultiBlockDataSet *in, vtkMultiBlockDataSet *out) override;
vtkStructuredGridConnectivity *GridConnectivity;
private:
diff --git a/Filters/Geometry/vtkStructuredGridPartitioner.h b/Filters/Geometry/vtkStructuredGridPartitioner.h
index 29103ee4c92952769d0d60c24e8f08a6a0322235..9cfed6d213c1d0da67183ddfd3c05053464d8159 100644
--- a/Filters/Geometry/vtkStructuredGridPartitioner.h
+++ b/Filters/Geometry/vtkStructuredGridPartitioner.h
@@ -43,7 +43,7 @@ class VTKFILTERSGEOMETRY_EXPORT vtkStructuredGridPartitioner :
public:
static vtkStructuredGridPartitioner *New();
vtkTypeMacro(vtkStructuredGridPartitioner, vtkMultiBlockDataSetAlgorithm);
- void PrintSelf(ostream &oss, vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf(ostream &oss, vtkIndent indent ) override;
//@{
/**
@@ -72,7 +72,7 @@ public:
protected:
vtkStructuredGridPartitioner();
- ~vtkStructuredGridPartitioner() VTK_OVERRIDE;
+ ~vtkStructuredGridPartitioner() override;
/**
* Extracts the coordinates of the sub-grid from the whole grid.
@@ -81,9 +81,9 @@ protected:
// Standard Pipeline methods
int RequestData(
- vtkInformation*,vtkInformationVector**,vtkInformationVector*) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
- int FillOutputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ vtkInformation*,vtkInformationVector**,vtkInformationVector*) override;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
+ int FillOutputPortInformation(int port, vtkInformation *info) override;
int NumberOfPartitions;
int NumberOfGhostLayers;
diff --git a/Filters/Geometry/vtkStructuredPointsGeometryFilter.h b/Filters/Geometry/vtkStructuredPointsGeometryFilter.h
index be4c748e26bbf54cba60cc09bdc1aad76b7bde0c..4fd808e7328e10fb07d732fa6354711bdf2feaf5 100644
--- a/Filters/Geometry/vtkStructuredPointsGeometryFilter.h
+++ b/Filters/Geometry/vtkStructuredPointsGeometryFilter.h
@@ -38,7 +38,7 @@ public:
protected:
vtkStructuredPointsGeometryFilter();
- ~vtkStructuredPointsGeometryFilter() VTK_OVERRIDE {}
+ ~vtkStructuredPointsGeometryFilter() override {}
private:
vtkStructuredPointsGeometryFilter(const vtkStructuredPointsGeometryFilter&) VTK_DELETE_FUNCTION;
diff --git a/Filters/Geometry/vtkUniformGridGhostDataGenerator.h b/Filters/Geometry/vtkUniformGridGhostDataGenerator.h
index c088c76512040b3012cf74d5bf6c1851ac916f5a..1606cc7f070c226544ef7a7cf275a0a2a9179200 100644
--- a/Filters/Geometry/vtkUniformGridGhostDataGenerator.h
+++ b/Filters/Geometry/vtkUniformGridGhostDataGenerator.h
@@ -63,11 +63,11 @@ class VTKFILTERSGEOMETRY_EXPORT vtkUniformGridGhostDataGenerator :
public:
static vtkUniformGridGhostDataGenerator* New();
vtkTypeMacro(vtkUniformGridGhostDataGenerator,vtkDataSetGhostGenerator);
- void PrintSelf(ostream& os, vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent ) override;
protected:
vtkUniformGridGhostDataGenerator();
- ~vtkUniformGridGhostDataGenerator() VTK_OVERRIDE;
+ ~vtkUniformGridGhostDataGenerator() override;
/**
* Computes the global origin
@@ -95,7 +95,7 @@ protected:
* Generates ghost layers.
*/
void GenerateGhostLayers(
- vtkMultiBlockDataSet *in, vtkMultiBlockDataSet *out) VTK_OVERRIDE;
+ vtkMultiBlockDataSet *in, vtkMultiBlockDataSet *out) override;
double GlobalSpacing[3];
double GlobalOrigin[3];
diff --git a/Filters/Geometry/vtkUnstructuredGridGeometryFilter.h b/Filters/Geometry/vtkUnstructuredGridGeometryFilter.h
index 3b5f419e648cbcdd9a0163705855220763683cf6..4aa2dce7132db60b764116461a1d54b9d9554568 100644
--- a/Filters/Geometry/vtkUnstructuredGridGeometryFilter.h
+++ b/Filters/Geometry/vtkUnstructuredGridGeometryFilter.h
@@ -54,7 +54,7 @@ public:
static vtkUnstructuredGridGeometryFilter *New();
vtkTypeMacro(vtkUnstructuredGridGeometryFilter,
vtkUnstructuredGridBaseAlgorithm)
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -203,16 +203,16 @@ public:
/**
* Return the MTime also considering the locator.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
protected:
vtkUnstructuredGridGeometryFilter();
- ~vtkUnstructuredGridGeometryFilter() VTK_OVERRIDE;
+ ~vtkUnstructuredGridGeometryFilter() override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
- int RequestUpdateExtent(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestUpdateExtent(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
vtkIdType PointMaximum;
vtkIdType PointMinimum;
diff --git a/Filters/Hybrid/Testing/Cxx/TestForceTime.cxx b/Filters/Hybrid/Testing/Cxx/TestForceTime.cxx
index 5605e0125db2bf3da63ebbf8009ca372c5be8eda..de1d4b5d6c21dfe5489b6505dd312e05d4f2bc61 100644
--- a/Filters/Hybrid/Testing/Cxx/TestForceTime.cxx
+++ b/Filters/Hybrid/Testing/Cxx/TestForceTime.cxx
@@ -41,7 +41,7 @@ protected:
int RequestInformation(vtkInformation * request,
vtkInformationVector **inputVector,
- vtkInformationVector *outputVector) VTK_OVERRIDE
+ vtkInformationVector *outputVector) override
{
// get the info objects
vtkInformation *outInfo = outputVector->GetInformationObject(0);
@@ -56,7 +56,7 @@ protected:
return 1;
}
- void ExecuteDataWithInformation(vtkDataObject *output, vtkInformation *outInfo) VTK_OVERRIDE
+ void ExecuteDataWithInformation(vtkDataObject *output, vtkInformation *outInfo) override
{
Superclass::ExecuteDataWithInformation(output, outInfo);
diff --git a/Filters/Hybrid/Testing/Cxx/TestTemporalArrayOperatorFilter.cxx b/Filters/Hybrid/Testing/Cxx/TestTemporalArrayOperatorFilter.cxx
index c7ffdb4c236e24cc1b4509d4901070bb57ae6d74..bdf26d0748fbd2748ca486d429154cee1a062e3d 100644
--- a/Filters/Hybrid/Testing/Cxx/TestTemporalArrayOperatorFilter.cxx
+++ b/Filters/Hybrid/Testing/Cxx/TestTemporalArrayOperatorFilter.cxx
@@ -34,7 +34,7 @@ protected:
int RequestInformation(vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE
+ vtkInformationVector* outputVector) override
{
vtkInformation* outInfo = outputVector->GetInformationObject(0);
double range[2] = { 0, 5 };
@@ -45,7 +45,7 @@ protected:
return 1;
}
- void ExecuteDataWithInformation(vtkDataObject* output, vtkInformation* outInfo) VTK_OVERRIDE
+ void ExecuteDataWithInformation(vtkDataObject* output, vtkInformation* outInfo) override
{
Superclass::ExecuteDataWithInformation(output, outInfo);
diff --git a/Filters/Hybrid/Testing/Cxx/TestTemporalCacheSimple.cxx b/Filters/Hybrid/Testing/Cxx/TestTemporalCacheSimple.cxx
index 8866c3c2aed97d63b7be3d2647c14ede3bf6d238..11825fd862452eb93b21600bd4d4ebb54d0fc973 100644
--- a/Filters/Hybrid/Testing/Cxx/TestTemporalCacheSimple.cxx
+++ b/Filters/Hybrid/Testing/Cxx/TestTemporalCacheSimple.cxx
@@ -68,12 +68,12 @@ public:
int RequestInformation(
vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
int RequestData(
vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
public:
int TimeStepRange[2];
@@ -172,7 +172,7 @@ public:
static vtkTestTemporalCacheSimpleExecuteCallback *New()
{ return new vtkTestTemporalCacheSimpleExecuteCallback; }
- void Execute(vtkObject *caller, unsigned long, void*) VTK_OVERRIDE
+ void Execute(vtkObject *caller, unsigned long, void*) override
{
// count the number of timesteps requested
vtkTemporalSphereSource *sph = vtkTemporalSphereSource::SafeDownCast(caller);
diff --git a/Filters/Hybrid/Testing/Cxx/TestTemporalCacheTemporal.cxx b/Filters/Hybrid/Testing/Cxx/TestTemporalCacheTemporal.cxx
index 7179b697eb0db15e65a4354627b8a5781454356d..17d95f45a376acfcdda4b0097b45dc5cf0178f53 100644
--- a/Filters/Hybrid/Testing/Cxx/TestTemporalCacheTemporal.cxx
+++ b/Filters/Hybrid/Testing/Cxx/TestTemporalCacheTemporal.cxx
@@ -37,7 +37,7 @@ public:
static vtkTestTemporalCacheTemporalExecuteCallback *New()
{ return new vtkTestTemporalCacheTemporalExecuteCallback; }
- void Execute(vtkObject *caller, unsigned long, void*) VTK_OVERRIDE
+ void Execute(vtkObject *caller, unsigned long, void*) override
{
// count the number of timesteps requested
vtkTemporalFractal *f = vtkTemporalFractal::SafeDownCast(caller);
diff --git a/Filters/Hybrid/vtkAdaptiveDataSetSurfaceFilter.h b/Filters/Hybrid/vtkAdaptiveDataSetSurfaceFilter.h
index fa9a03dc72db149f2f633bd3119a58ff5cd2b326..984be29df157ad0dab7e2976bbaaedfbbabd3041 100644
--- a/Filters/Hybrid/vtkAdaptiveDataSetSurfaceFilter.h
+++ b/Filters/Hybrid/vtkAdaptiveDataSetSurfaceFilter.h
@@ -46,7 +46,7 @@ class VTKFILTERSHYBRID_EXPORT vtkAdaptiveDataSetSurfaceFilter : public vtkDataSe
public:
static vtkAdaptiveDataSetSurfaceFilter* New();
vtkTypeMacro( vtkAdaptiveDataSetSurfaceFilter, vtkDataSetSurfaceFilter );
- void PrintSelf( ostream&, vtkIndent ) VTK_OVERRIDE;
+ void PrintSelf( ostream&, vtkIndent ) override;
//@{
/**
@@ -64,16 +64,16 @@ public:
/**
* Get the mtime of this object.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
protected:
vtkAdaptiveDataSetSurfaceFilter();
- ~vtkAdaptiveDataSetSurfaceFilter() VTK_OVERRIDE;
+ ~vtkAdaptiveDataSetSurfaceFilter() override;
int RequestData( vtkInformation* vtkNotUsed(request),
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector ) VTK_OVERRIDE;
- int DataSetExecute( vtkDataSet* input, vtkPolyData* output ) VTK_OVERRIDE;
+ vtkInformationVector* outputVector ) override;
+ int DataSetExecute( vtkDataSet* input, vtkPolyData* output ) override;
/**
* Main routine to generate external boundary
diff --git a/Filters/Hybrid/vtkBSplineTransform.h b/Filters/Hybrid/vtkBSplineTransform.h
index b728d78c4a96bc5cd0126e78f8c5573b2dca49ee..fbba6f7beb1b034f74cfd6aea94e217b2bb9f38f 100644
--- a/Filters/Hybrid/vtkBSplineTransform.h
+++ b/Filters/Hybrid/vtkBSplineTransform.h
@@ -51,7 +51,7 @@ class VTKFILTERSHYBRID_EXPORT vtkBSplineTransform : public vtkWarpTransform
public:
static vtkBSplineTransform *New();
vtkTypeMacro(vtkBSplineTransform,vtkWarpTransform);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -99,47 +99,47 @@ public:
/**
* Make another transform of the same type.
*/
- vtkAbstractTransform *MakeTransform() VTK_OVERRIDE;
+ vtkAbstractTransform *MakeTransform() override;
/**
* Get the MTime.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
protected:
vtkBSplineTransform();
- ~vtkBSplineTransform() VTK_OVERRIDE;
+ ~vtkBSplineTransform() override;
/**
* Update the displacement grid.
*/
- void InternalUpdate() VTK_OVERRIDE;
+ void InternalUpdate() override;
/**
* Copy this transform from another of the same type.
*/
- void InternalDeepCopy(vtkAbstractTransform *transform) VTK_OVERRIDE;
+ void InternalDeepCopy(vtkAbstractTransform *transform) override;
//@{
/**
* Internal functions for calculating the transformation.
*/
- void ForwardTransformPoint(const float in[3], float out[3]) VTK_OVERRIDE;
- void ForwardTransformPoint(const double in[3], double out[3]) VTK_OVERRIDE;
+ void ForwardTransformPoint(const float in[3], float out[3]) override;
+ void ForwardTransformPoint(const double in[3], double out[3]) override;
//@}
void ForwardTransformDerivative(const float in[3], float out[3],
- float derivative[3][3]) VTK_OVERRIDE;
+ float derivative[3][3]) override;
void ForwardTransformDerivative(const double in[3], double out[3],
- double derivative[3][3]) VTK_OVERRIDE;
+ double derivative[3][3]) override;
- void InverseTransformPoint(const float in[3], float out[3]) VTK_OVERRIDE;
- void InverseTransformPoint(const double in[3], double out[3]) VTK_OVERRIDE;
+ void InverseTransformPoint(const float in[3], float out[3]) override;
+ void InverseTransformPoint(const double in[3], double out[3]) override;
void InverseTransformDerivative(const float in[3], float out[3],
- float derivative[3][3]) VTK_OVERRIDE;
+ float derivative[3][3]) override;
void InverseTransformDerivative(const double in[3], double out[3],
- double derivative[3][3]) VTK_OVERRIDE;
+ double derivative[3][3]) override;
void (*CalculateSpline)(const double point[3], double displacement[3],
double derivatives[3][3],
diff --git a/Filters/Hybrid/vtkDSPFilterDefinition.h b/Filters/Hybrid/vtkDSPFilterDefinition.h
index d6e0c7cbc8fb51049f9a685091d767766251924d..293bc96265320c547f3ebd67e1d4cbbc9a3970ef 100644
--- a/Filters/Hybrid/vtkDSPFilterDefinition.h
+++ b/Filters/Hybrid/vtkDSPFilterDefinition.h
@@ -41,13 +41,13 @@ class VTKFILTERSHYBRID_EXPORT vtkDSPFilterDefinition : public vtkObject
{
public:
vtkTypeMacro(vtkDSPFilterDefinition, vtkObject);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
static vtkDSPFilterDefinition *New();
protected:
vtkDSPFilterDefinition();
vtkDSPFilterDefinition(vtkDSPFilterDefinition *other);
- ~vtkDSPFilterDefinition() VTK_OVERRIDE;
+ ~vtkDSPFilterDefinition() override;
public:
void Copy(vtkDSPFilterDefinition *other);
diff --git a/Filters/Hybrid/vtkDSPFilterGroup.h b/Filters/Hybrid/vtkDSPFilterGroup.h
index 8e57b0060cfd29a53ed8504cec96d5d8d7a1570a..d1450064a8e8cac26efa328e964c0af6f8d57f0e 100644
--- a/Filters/Hybrid/vtkDSPFilterGroup.h
+++ b/Filters/Hybrid/vtkDSPFilterGroup.h
@@ -46,7 +46,7 @@ class VTKFILTERSHYBRID_EXPORT vtkDSPFilterGroup : public vtkObject
public:
static vtkDSPFilterGroup *New();
vtkTypeMacro(vtkDSPFilterGroup,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
void AddFilter(vtkDSPFilterDefinition *filter);
@@ -73,7 +73,7 @@ public:
protected:
vtkDSPFilterGroup();
- ~vtkDSPFilterGroup() VTK_OVERRIDE;
+ ~vtkDSPFilterGroup() override;
vtkDSPFilterGroupVectorArraySTLCloak * /*std::vector<vtkFloatArray *>*/ CachedInputs;
diff --git a/Filters/Hybrid/vtkDepthSortPolyData.h b/Filters/Hybrid/vtkDepthSortPolyData.h
index 8a65e58848766162000351b17fb097c7f55b81a1..8811b79d7f6e781d105382e4d833cec9197c832c 100644
--- a/Filters/Hybrid/vtkDepthSortPolyData.h
+++ b/Filters/Hybrid/vtkDepthSortPolyData.h
@@ -47,7 +47,7 @@ public:
static vtkDepthSortPolyData *New();
vtkTypeMacro(vtkDepthSortPolyData,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
enum Directions
{
@@ -152,13 +152,13 @@ public:
* Return MTime also considering the dependent objects: the camera
* and/or the prop3D.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
protected:
vtkDepthSortPolyData();
- ~vtkDepthSortPolyData() VTK_OVERRIDE;
+ ~vtkDepthSortPolyData() override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
void ComputeProjectionVector(double vector[3], double origin[3]);
int Direction;
diff --git a/Filters/Hybrid/vtkEarthSource.h b/Filters/Hybrid/vtkEarthSource.h
index ee756719d9e3c89b34de9d05ef5f96e38ebeef49..53b0e02f00cdc0f53407c2d6f37645920ccde729 100644
--- a/Filters/Hybrid/vtkEarthSource.h
+++ b/Filters/Hybrid/vtkEarthSource.h
@@ -34,7 +34,7 @@ class VTKFILTERSHYBRID_EXPORT vtkEarthSource : public vtkPolyDataAlgorithm
public:
static vtkEarthSource *New();
vtkTypeMacro(vtkEarthSource,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -68,9 +68,9 @@ public:
protected:
vtkEarthSource();
- ~vtkEarthSource() VTK_OVERRIDE {}
+ ~vtkEarthSource() override {}
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
double Radius;
int OnRatio;
diff --git a/Filters/Hybrid/vtkFacetReader.h b/Filters/Hybrid/vtkFacetReader.h
index a159ad87e8ab16bf41fee9074f6aab2d57020a1d..892b5e0f4cab38a744895cd1346fa5bd06b38b2a 100644
--- a/Filters/Hybrid/vtkFacetReader.h
+++ b/Filters/Hybrid/vtkFacetReader.h
@@ -47,7 +47,7 @@ class VTKFILTERSHYBRID_EXPORT vtkFacetReader : public vtkPolyDataAlgorithm
public:
static vtkFacetReader *New();
vtkTypeMacro(vtkFacetReader,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -61,9 +61,9 @@ public:
protected:
vtkFacetReader();
- ~vtkFacetReader() VTK_OVERRIDE;
+ ~vtkFacetReader() override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
char *FileName;
diff --git a/Filters/Hybrid/vtkForceTime.h b/Filters/Hybrid/vtkForceTime.h
index e61055a523ac7e748cac2db36ad859f09dd73543..639f3bc91ca33884ba111cd55b78a97f6400cd46 100644
--- a/Filters/Hybrid/vtkForceTime.h
+++ b/Filters/Hybrid/vtkForceTime.h
@@ -24,7 +24,7 @@ class VTKFILTERSHYBRID_EXPORT vtkForceTime : public vtkPassInputTypeAlgorithm
public :
static vtkForceTime* New();
vtkTypeMacro(vtkForceTime, vtkPassInputTypeAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
// Description:
// Replace the pipeline time by this one.
@@ -39,18 +39,18 @@ public :
protected:
vtkForceTime();
- ~vtkForceTime() VTK_OVERRIDE;
+ ~vtkForceTime() override;
int RequestUpdateExtent(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
int RequestInformation(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
int RequestData(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
private:
vtkForceTime(const vtkForceTime&) VTK_DELETE_FUNCTION;
diff --git a/Filters/Hybrid/vtkGreedyTerrainDecimation.h b/Filters/Hybrid/vtkGreedyTerrainDecimation.h
index 0cf43d075014bc78f55b7b4f98c3517e7a89ce87..09fa1b04a50d816c7bee26ffc3d438c1482fc25c 100644
--- a/Filters/Hybrid/vtkGreedyTerrainDecimation.h
+++ b/Filters/Hybrid/vtkGreedyTerrainDecimation.h
@@ -90,7 +90,7 @@ class VTKFILTERSHYBRID_EXPORT vtkGreedyTerrainDecimation : public vtkPolyDataAlg
{
public:
vtkTypeMacro(vtkGreedyTerrainDecimation,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Instantiate the class.
@@ -179,10 +179,10 @@ public:
protected:
vtkGreedyTerrainDecimation();
- ~vtkGreedyTerrainDecimation() VTK_OVERRIDE;
+ ~vtkGreedyTerrainDecimation() override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
int ComputeNormals;
vtkFloatArray* Normals;
diff --git a/Filters/Hybrid/vtkGridTransform.h b/Filters/Hybrid/vtkGridTransform.h
index ef113cd58d5dc77efed4f2dc0eb83d68b03331a2..6933fb9a6ae1794caccb4bfffccd71f47b133329 100644
--- a/Filters/Hybrid/vtkGridTransform.h
+++ b/Filters/Hybrid/vtkGridTransform.h
@@ -44,7 +44,7 @@ class VTKFILTERSHYBRID_EXPORT vtkGridTransform : public vtkWarpTransform
public:
static vtkGridTransform *New();
vtkTypeMacro(vtkGridTransform,vtkWarpTransform);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -99,47 +99,47 @@ public:
/**
* Make another transform of the same type.
*/
- vtkAbstractTransform *MakeTransform() VTK_OVERRIDE;
+ vtkAbstractTransform *MakeTransform() override;
/**
* Get the MTime.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
protected:
vtkGridTransform();
- ~vtkGridTransform() VTK_OVERRIDE;
+ ~vtkGridTransform() override;
/**
* Update the displacement grid.
*/
- void InternalUpdate() VTK_OVERRIDE;
+ void InternalUpdate() override;
/**
* Copy this transform from another of the same type.
*/
- void InternalDeepCopy(vtkAbstractTransform *transform) VTK_OVERRIDE;
+ void InternalDeepCopy(vtkAbstractTransform *transform) override;
//@{
/**
* Internal functions for calculating the transformation.
*/
- void ForwardTransformPoint(const float in[3], float out[3]) VTK_OVERRIDE;
- void ForwardTransformPoint(const double in[3], double out[3]) VTK_OVERRIDE;
+ void ForwardTransformPoint(const float in[3], float out[3]) override;
+ void ForwardTransformPoint(const double in[3], double out[3]) override;
//@}
void ForwardTransformDerivative(const float in[3], float out[3],
- float derivative[3][3]) VTK_OVERRIDE;
+ float derivative[3][3]) override;
void ForwardTransformDerivative(const double in[3], double out[3],
- double derivative[3][3]) VTK_OVERRIDE;
+ double derivative[3][3]) override;
- void InverseTransformPoint(const float in[3], float out[3]) VTK_OVERRIDE;
- void InverseTransformPoint(const double in[3], double out[3]) VTK_OVERRIDE;
+ void InverseTransformPoint(const float in[3], float out[3]) override;
+ void InverseTransformPoint(const double in[3], double out[3]) override;
void InverseTransformDerivative(const float in[3], float out[3],
- float derivative[3][3]) VTK_OVERRIDE;
+ float derivative[3][3]) override;
void InverseTransformDerivative(const double in[3], double out[3],
- double derivative[3][3]) VTK_OVERRIDE;
+ double derivative[3][3]) override;
void (*InterpolationFunction)(double point[3], double displacement[3],
double derivatives[3][3],
diff --git a/Filters/Hybrid/vtkImageToPolyDataFilter.h b/Filters/Hybrid/vtkImageToPolyDataFilter.h
index ec5226058a6e97ef1b5f349f0eaf99ecdfbcd1d2..cdbd293563b01f85b62f0c32600b5b430d5835e1 100644
--- a/Filters/Hybrid/vtkImageToPolyDataFilter.h
+++ b/Filters/Hybrid/vtkImageToPolyDataFilter.h
@@ -87,7 +87,7 @@ class VTKFILTERSHYBRID_EXPORT vtkImageToPolyDataFilter : public vtkPolyDataAlgor
{
public:
vtkTypeMacro(vtkImageToPolyDataFilter,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Instantiate object with initial number of colors 256.
@@ -198,10 +198,10 @@ public:
protected:
vtkImageToPolyDataFilter();
- ~vtkImageToPolyDataFilter() VTK_OVERRIDE;
+ ~vtkImageToPolyDataFilter() override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
int OutputStyle;
int ColorMode;
diff --git a/Filters/Hybrid/vtkImplicitModeller.h b/Filters/Hybrid/vtkImplicitModeller.h
index d1159e04f10defb239d1cde495a1599d3c164af5..76c9546c66e68cd29619a066795ace6f48c459ee 100644
--- a/Filters/Hybrid/vtkImplicitModeller.h
+++ b/Filters/Hybrid/vtkImplicitModeller.h
@@ -101,7 +101,7 @@ class VTKFILTERSHYBRID_EXPORT vtkImplicitModeller : public vtkImageAlgorithm
{
public:
vtkTypeMacro(vtkImplicitModeller,vtkImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct with sample dimensions=(50,50,50), and so that model bounds are
@@ -282,19 +282,19 @@ public:
// See the vtkAlgorithm for a desciption of what these do
int ProcessRequest(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
protected:
vtkImplicitModeller();
- ~vtkImplicitModeller() VTK_OVERRIDE;
+ ~vtkImplicitModeller() override;
double GetScalarTypeMax(int type);
int RequestInformation (vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
int RequestData (vtkInformation *,
- vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector **, vtkInformationVector *) override;
void StartAppend(int internal);
void Cap(vtkDataArray *s);
@@ -321,7 +321,7 @@ protected:
// the max distance computed during that one call
double InternalMaxDistance;
- int FillInputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
+ int FillInputPortInformation(int, vtkInformation*) override;
private:
vtkImplicitModeller(const vtkImplicitModeller&) VTK_DELETE_FUNCTION;
diff --git a/Filters/Hybrid/vtkPCAAnalysisFilter.h b/Filters/Hybrid/vtkPCAAnalysisFilter.h
index 38df3f4ccc4cd0e98c8f79054315f1d6d944ccd4..c8b10f64334951f4f84fd882d30f18696d22736e 100644
--- a/Filters/Hybrid/vtkPCAAnalysisFilter.h
+++ b/Filters/Hybrid/vtkPCAAnalysisFilter.h
@@ -64,7 +64,7 @@ class VTKFILTERSHYBRID_EXPORT vtkPCAAnalysisFilter : public vtkMultiBlockDataSet
/**
* Prints information about the state of the filter.
*/
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Creates with similarity transform.
@@ -113,12 +113,12 @@ class VTKFILTERSHYBRID_EXPORT vtkPCAAnalysisFilter : public vtkMultiBlockDataSet
protected:
vtkPCAAnalysisFilter();
- ~vtkPCAAnalysisFilter() VTK_OVERRIDE;
+ ~vtkPCAAnalysisFilter() override;
/**
* Usual data generation method.
*/
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
private:
vtkPCAAnalysisFilter(const vtkPCAAnalysisFilter&) VTK_DELETE_FUNCTION;
diff --git a/Filters/Hybrid/vtkPolyDataSilhouette.h b/Filters/Hybrid/vtkPolyDataSilhouette.h
index b54f6e32156b54114fba3bd4b7427efb14f01291..0c827152ec8051c82db11c453d1e4e0eeab5e8b1 100644
--- a/Filters/Hybrid/vtkPolyDataSilhouette.h
+++ b/Filters/Hybrid/vtkPolyDataSilhouette.h
@@ -56,7 +56,7 @@ public:
static vtkPolyDataSilhouette *New();
vtkTypeMacro(vtkPolyDataSilhouette,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -165,13 +165,13 @@ public:
* Return MTime also considering the dependent objects: the camera
* and/or the prop3D.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
protected:
vtkPolyDataSilhouette();
- ~vtkPolyDataSilhouette() VTK_OVERRIDE;
+ ~vtkPolyDataSilhouette() override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
void ComputeProjectionVector(double vector[3], double origin[3]);
int Direction;
diff --git a/Filters/Hybrid/vtkProcrustesAlignmentFilter.h b/Filters/Hybrid/vtkProcrustesAlignmentFilter.h
index 08456daec15ce444c0cf49b414e74bfff283a296..8c4756badb664c0b234df75995f34dbf4505d630 100644
--- a/Filters/Hybrid/vtkProcrustesAlignmentFilter.h
+++ b/Filters/Hybrid/vtkProcrustesAlignmentFilter.h
@@ -67,7 +67,7 @@ public:
/**
* Prints information about the state of the filter.
*/
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Creates with similarity transform.
@@ -118,12 +118,12 @@ public:
protected:
vtkProcrustesAlignmentFilter();
- ~vtkProcrustesAlignmentFilter() VTK_OVERRIDE;
+ ~vtkProcrustesAlignmentFilter() override;
/**
* Usual data generation method.
*/
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
vtkLandmarkTransform *LandmarkTransform;
diff --git a/Filters/Hybrid/vtkProjectedTerrainPath.h b/Filters/Hybrid/vtkProjectedTerrainPath.h
index 2b3eed2eb496d266c9ca831eab85067d0e68a0e6..9cfaf92ece2485f1255f897c3a10a699104bf38d 100644
--- a/Filters/Hybrid/vtkProjectedTerrainPath.h
+++ b/Filters/Hybrid/vtkProjectedTerrainPath.h
@@ -84,7 +84,7 @@ public:
* Standard methids for printing and determining type information.
*/
vtkTypeMacro(vtkProjectedTerrainPath,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
@@ -162,11 +162,11 @@ public:
protected:
vtkProjectedTerrainPath();
- ~vtkProjectedTerrainPath() VTK_OVERRIDE;
+ ~vtkProjectedTerrainPath() override;
int RequestData(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ vtkInformationVector *) override;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
// Supporting methods
void GetImageIndex(double x[3], double loc[2], int ij[2]);
diff --git a/Filters/Hybrid/vtkRenderLargeImage.h b/Filters/Hybrid/vtkRenderLargeImage.h
index 96824141a7ba14547e8d7a14c1d0cd97b9bb3457..93456c3d4a62a981a864c9abf2f5650f7ff834ea 100644
--- a/Filters/Hybrid/vtkRenderLargeImage.h
+++ b/Filters/Hybrid/vtkRenderLargeImage.h
@@ -36,7 +36,7 @@ class VTKFILTERSHYBRID_EXPORT vtkRenderLargeImage : public vtkAlgorithm
public:
static vtkRenderLargeImage *New();
vtkTypeMacro(vtkRenderLargeImage,vtkAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -68,11 +68,11 @@ public:
*/
int ProcessRequest(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
protected:
vtkRenderLargeImage();
- ~vtkRenderLargeImage() VTK_OVERRIDE;
+ ~vtkRenderLargeImage() override;
int Magnification;
vtkRenderer *Input;
@@ -82,7 +82,7 @@ protected:
vtkInformationVector **, vtkInformationVector *);
// see algorithm for more info
- int FillOutputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillOutputPortInformation(int port, vtkInformation* info) override;
// Adjust the coordinates of all 2D actors to fit new window size
void Rescale2DActors();
diff --git a/Filters/Hybrid/vtkTemporalArrayOperatorFilter.h b/Filters/Hybrid/vtkTemporalArrayOperatorFilter.h
index 4da8f113ce4f0e795b79802dc4874c733d3cbb3b..5eae340b3f813ac613ca8a0d84139c6eba1702ce 100644
--- a/Filters/Hybrid/vtkTemporalArrayOperatorFilter.h
+++ b/Filters/Hybrid/vtkTemporalArrayOperatorFilter.h
@@ -35,7 +35,7 @@ class VTKFILTERSHYBRID_EXPORT vtkTemporalArrayOperatorFilter :
public:
static vtkTemporalArrayOperatorFilter* New();
vtkTypeMacro(vtkTemporalArrayOperatorFilter, vtkMultiTimeStepAlgorithm);
- void PrintSelf(ostream &OS, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &OS, vtkIndent indent) override;
enum OperatorType
{
@@ -81,19 +81,19 @@ public:
protected:
vtkTemporalArrayOperatorFilter();
- ~vtkTemporalArrayOperatorFilter() VTK_OVERRIDE;
+ ~vtkTemporalArrayOperatorFilter() override;
- int FillInputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
- int FillOutputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
+ int FillInputPortInformation(int, vtkInformation*) override;
+ int FillOutputPortInformation(int, vtkInformation*) override;
int RequestDataObject(vtkInformation*, vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
int RequestInformation(vtkInformation*, vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
int RequestUpdateExtent(vtkInformation*, vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
int RequestData(vtkInformation*, vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
int GetInputArrayAssociation();
virtual vtkDataObject* Process(vtkDataObject*, vtkDataObject*);
diff --git a/Filters/Hybrid/vtkTemporalDataSetCache.h b/Filters/Hybrid/vtkTemporalDataSetCache.h
index 1cf6c44b58083341968c9f56c8fe47f32aa7a5b0..aeedee79c09c50c4a304a0d357f4210e36e70762 100644
--- a/Filters/Hybrid/vtkTemporalDataSetCache.h
+++ b/Filters/Hybrid/vtkTemporalDataSetCache.h
@@ -41,7 +41,7 @@ class VTKFILTERSHYBRID_EXPORT vtkTemporalDataSetCache : public vtkAlgorithm
public:
static vtkTemporalDataSetCache *New();
vtkTypeMacro(vtkTemporalDataSetCache, vtkAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -54,7 +54,7 @@ public:
protected:
vtkTemporalDataSetCache();
- ~vtkTemporalDataSetCache() VTK_OVERRIDE;
+ ~vtkTemporalDataSetCache() override;
int CacheSize;
@@ -67,10 +67,10 @@ protected:
*/
int ProcessRequest(vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
- int FillOutputPortInformation(int vtkNotUsed(port), vtkInformation* info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
+ int FillOutputPortInformation(int vtkNotUsed(port), vtkInformation* info) override;
virtual int RequestDataObject( vtkInformation*,
vtkInformationVector** inputVector ,
vtkInformationVector* outputVector);
diff --git a/Filters/Hybrid/vtkTemporalFractal.cxx b/Filters/Hybrid/vtkTemporalFractal.cxx
index c5059c5cea2dfa2d0f4e31c9fb41ede9f5a43782..4e898c6af9587da383493d2ea78288d9ff5bec9a 100644
--- a/Filters/Hybrid/vtkTemporalFractal.cxx
+++ b/Filters/Hybrid/vtkTemporalFractal.cxx
@@ -52,7 +52,7 @@ public:
this->DataSets.push_back(data);
this->Levels.push_back(level);
}
- ~TemporalFractalOutputUtil() VTK_OVERRIDE
+ ~TemporalFractalOutputUtil() override
{
this->DataSets.clear();
this->Levels.clear();
diff --git a/Filters/Hybrid/vtkTemporalFractal.h b/Filters/Hybrid/vtkTemporalFractal.h
index be7f0959fec9ea9ed9f7a01017d7f2e66ca8e2b1..484dd2aed3f8ab7155ced76d3983d9f19ac5bf69 100644
--- a/Filters/Hybrid/vtkTemporalFractal.h
+++ b/Filters/Hybrid/vtkTemporalFractal.h
@@ -45,7 +45,7 @@ class VTKFILTERSHYBRID_EXPORT vtkTemporalFractal: public vtkAlgorithm
public:
static vtkTemporalFractal *New();
vtkTypeMacro(vtkTemporalFractal,vtkAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -134,9 +134,9 @@ public:
protected:
vtkTemporalFractal();
- ~vtkTemporalFractal() VTK_OVERRIDE;
+ ~vtkTemporalFractal() override;
- int FillOutputPortInformation(int vtkNotUsed(port), vtkInformation* info) VTK_OVERRIDE;
+ int FillOutputPortInformation(int vtkNotUsed(port), vtkInformation* info) override;
int StartBlock;
int EndBlock;
@@ -147,7 +147,7 @@ protected:
*/
int ProcessRequest(vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
/**
* This is called by the superclass.
diff --git a/Filters/Hybrid/vtkTemporalInterpolator.h b/Filters/Hybrid/vtkTemporalInterpolator.h
index 05076a1e6f44da5ef30e9b6cf077fcd3ae25ddc2..c6250e8f1bf74c92a56c3cea198ff5fc0a55161f 100644
--- a/Filters/Hybrid/vtkTemporalInterpolator.h
+++ b/Filters/Hybrid/vtkTemporalInterpolator.h
@@ -64,7 +64,7 @@ class VTKFILTERSHYBRID_EXPORT vtkTemporalInterpolator : public vtkMultiTimeStepA
public:
static vtkTemporalInterpolator *New();
vtkTypeMacro(vtkTemporalInterpolator, vtkMultiTimeStepAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -105,30 +105,30 @@ public:
protected:
vtkTemporalInterpolator();
- ~vtkTemporalInterpolator() VTK_OVERRIDE;
+ ~vtkTemporalInterpolator() override;
double DiscreteTimeStepInterval;
int ResampleFactor;
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
- int FillOutputPortInformation(int vtkNotUsed(port), vtkInformation* info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
+ int FillOutputPortInformation(int vtkNotUsed(port), vtkInformation* info) override;
int RequestDataObject(vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
int RequestUpdateExtent(vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
int RequestInformation(vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
int RequestData(vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
/**
* General interpolation routine for any type on input data. This is
diff --git a/Filters/Hybrid/vtkTemporalShiftScale.h b/Filters/Hybrid/vtkTemporalShiftScale.h
index ab697f306ad924798bbd509217125ebb94c36b8e..4dd63f47b4a5bd2907371b19832ccb2cfc4d23d4 100644
--- a/Filters/Hybrid/vtkTemporalShiftScale.h
+++ b/Filters/Hybrid/vtkTemporalShiftScale.h
@@ -42,7 +42,7 @@ class VTKFILTERSHYBRID_EXPORT vtkTemporalShiftScale: public vtkAlgorithm
public:
static vtkTemporalShiftScale *New();
vtkTypeMacro(vtkTemporalShiftScale, vtkAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -116,7 +116,7 @@ public:
protected:
vtkTemporalShiftScale();
- ~vtkTemporalShiftScale() VTK_OVERRIDE;
+ ~vtkTemporalShiftScale() override;
double PreShift;
double PostShift;
@@ -136,14 +136,14 @@ protected:
*/
int ProcessRequest(vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
virtual int RequestUpdateExtent (vtkInformation *,
vtkInformationVector **,
vtkInformationVector *);
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
- int FillOutputPortInformation(int vtkNotUsed(port), vtkInformation* info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
+ int FillOutputPortInformation(int vtkNotUsed(port), vtkInformation* info) override;
virtual int RequestDataObject(vtkInformation *,
diff --git a/Filters/Hybrid/vtkTemporalSnapToTimeStep.h b/Filters/Hybrid/vtkTemporalSnapToTimeStep.h
index 7cbe5ecd9cb1a45082d8056a6d579ff2ddab8fe7..a60cd03e433ce3c6dca9cca628557a10f67ad895 100644
--- a/Filters/Hybrid/vtkTemporalSnapToTimeStep.h
+++ b/Filters/Hybrid/vtkTemporalSnapToTimeStep.h
@@ -42,7 +42,7 @@ class VTKFILTERSHYBRID_EXPORT vtkTemporalSnapToTimeStep : public vtkPassInputTyp
public:
static vtkTemporalSnapToTimeStep *New();
vtkTypeMacro(vtkTemporalSnapToTimeStep, vtkPassInputTypeAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
enum {
VTK_SNAP_NEAREST=0,
@@ -58,26 +58,26 @@ public:
protected:
vtkTemporalSnapToTimeStep();
- ~vtkTemporalSnapToTimeStep() VTK_OVERRIDE;
+ ~vtkTemporalSnapToTimeStep() override;
/**
* see vtkAlgorithm for details
*/
int ProcessRequest(vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
int RequestUpdateExtent(vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
int RequestInformation(vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
int RequestData(vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
std::vector<double> InputTimeValues;
int HasDiscrete;
diff --git a/Filters/Hybrid/vtkTransformToGrid.h b/Filters/Hybrid/vtkTransformToGrid.h
index 2961c2b488dc75517752c8414fa78493ed370e53..b0f0acd547bd77ad7ba978a74bff882e593b0501 100644
--- a/Filters/Hybrid/vtkTransformToGrid.h
+++ b/Filters/Hybrid/vtkTransformToGrid.h
@@ -38,7 +38,7 @@ class VTKFILTERSHYBRID_EXPORT vtkTransformToGrid : public vtkAlgorithm
public:
static vtkTransformToGrid *New();
vtkTypeMacro(vtkTransformToGrid,vtkAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -111,11 +111,11 @@ public:
*/
int ProcessRequest(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
protected:
vtkTransformToGrid();
- ~vtkTransformToGrid() VTK_OVERRIDE;
+ ~vtkTransformToGrid() override;
void RequestInformation (vtkInformation *,
vtkInformationVector **, vtkInformationVector *);
@@ -129,7 +129,7 @@ protected:
*/
void UpdateShiftScale();
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
vtkAbstractTransform *Input;
@@ -143,7 +143,7 @@ protected:
vtkTimeStamp ShiftScaleTime;
// see algorithm for more info
- int FillOutputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillOutputPortInformation(int port, vtkInformation* info) override;
private:
vtkTransformToGrid(const vtkTransformToGrid&) VTK_DELETE_FUNCTION;
diff --git a/Filters/Hybrid/vtkWeightedTransformFilter.h b/Filters/Hybrid/vtkWeightedTransformFilter.h
index f9e8b4e1caef10af973e4a95855badd5e2833195..cc0f53a52e382595fe2b9df61424fc8d041a683a 100644
--- a/Filters/Hybrid/vtkWeightedTransformFilter.h
+++ b/Filters/Hybrid/vtkWeightedTransformFilter.h
@@ -81,12 +81,12 @@ class VTKFILTERSHYBRID_EXPORT vtkWeightedTransformFilter : public vtkPointSetAlg
public:
static vtkWeightedTransformFilter *New();
vtkTypeMacro(vtkWeightedTransformFilter,vtkPointSetAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Return the MTime also considering the filter's transforms.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
//@{
/**
@@ -189,9 +189,9 @@ protected:
char *TransformIndexArray;
vtkWeightedTransformFilter();
- ~vtkWeightedTransformFilter() VTK_OVERRIDE;
+ ~vtkWeightedTransformFilter() override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
private:
vtkWeightedTransformFilter(const vtkWeightedTransformFilter&) VTK_DELETE_FUNCTION;
void operator=(const vtkWeightedTransformFilter&) VTK_DELETE_FUNCTION;
diff --git a/Filters/HyperTree/Testing/Cxx/TestHyperTreeGridTernary3DGeometryLargeMaterialBits.cxx b/Filters/HyperTree/Testing/Cxx/TestHyperTreeGridTernary3DGeometryLargeMaterialBits.cxx
index d26aba62f297de00255d5f0cc0a631a563f749eb..a549ada30e21e28e136724b6678a749425196495 100644
--- a/Filters/HyperTree/Testing/Cxx/TestHyperTreeGridTernary3DGeometryLargeMaterialBits.cxx
+++ b/Filters/HyperTree/Testing/Cxx/TestHyperTreeGridTernary3DGeometryLargeMaterialBits.cxx
@@ -44,7 +44,7 @@ class KeyPressInteractorStyle : public vtkInteractorStyleTrackballCamera
static KeyPressInteractorStyle* New();
vtkTypeMacro(KeyPressInteractorStyle, vtkInteractorStyleTrackballCamera);
- void OnKeyPress() VTK_OVERRIDE
+ void OnKeyPress() override
{
// Get the keypress
vtkRenderWindowInteractor *rwi = this->Interactor;
diff --git a/Filters/HyperTree/vtkClipHyperOctree.h b/Filters/HyperTree/vtkClipHyperOctree.h
index 77c3f31d5d33f913c4a6dac22eb8272538216e08..017db96662c95e759f5b85d40e44d6c51f2de3f6 100644
--- a/Filters/HyperTree/vtkClipHyperOctree.h
+++ b/Filters/HyperTree/vtkClipHyperOctree.h
@@ -83,7 +83,7 @@ class VTKFILTERSHYPERTREE_EXPORT vtkClipHyperOctree : public vtkUnstructuredGrid
{
public:
vtkTypeMacro(vtkClipHyperOctree,vtkUnstructuredGridAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct with user-specified implicit function; InsideOut turned off;
@@ -170,13 +170,13 @@ public:
/**
* Return the mtime also considering the locator and clip function.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
protected:
vtkClipHyperOctree(vtkImplicitFunction *cf=nullptr);
- ~vtkClipHyperOctree() VTK_OVERRIDE;
+ ~vtkClipHyperOctree() override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
/**
* Clip the sub-hierarchy pointed by cursor.
@@ -187,7 +187,7 @@ protected:
int level,
double bounds[6]);
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
vtkImplicitFunction *ClipFunction;
vtkIncrementalPointLocator *Locator;
diff --git a/Filters/HyperTree/vtkHyperOctreeClipCutPointsGrabber.h b/Filters/HyperTree/vtkHyperOctreeClipCutPointsGrabber.h
index 273c77861f420fc8f6a7110c79fdcfe93a798d54..441967318ec8557d8336bfcde9103ba8a54fb268 100644
--- a/Filters/HyperTree/vtkHyperOctreeClipCutPointsGrabber.h
+++ b/Filters/HyperTree/vtkHyperOctreeClipCutPointsGrabber.h
@@ -40,14 +40,14 @@ public:
vtkTypeMacro(vtkHyperOctreeClipCutPointsGrabber,vtkHyperOctreePointsGrabber);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Set the dimension of the hyperoctree.
* \pre valid_dim: (dim==2 || dim==3)
* \post is_set: GetDimension()==dim
*/
- void SetDimension(int dim) VTK_OVERRIDE;
+ void SetDimension(int dim) override;
/**
* Initialize the points insertion scheme.
@@ -57,7 +57,7 @@ public:
* that lie on an hyperoctant.
* \pre only_in_3d: GetDimension()==3
*/
- void InitPointInsertion() VTK_OVERRIDE;
+ void InitPointInsertion() override;
/**
* Insert a point, assuming the point is unique and does not require a
@@ -67,7 +67,7 @@ public:
void InsertPoint(vtkIdType ptId,
double pt[3],
double pcoords[3],
- int ijk[3]) VTK_OVERRIDE;
+ int ijk[3]) override;
/**
* Insert a point using a locator.
@@ -75,13 +75,13 @@ public:
void InsertPointWithMerge(vtkIdType ptId,
double pt[3],
double pcoords[3],
- int ijk[3]) VTK_OVERRIDE;
+ int ijk[3]) override;
/**
* Insert a point in the quadtree case.
*/
void InsertPoint2D(double pt[3],
- int ijk[3]) VTK_OVERRIDE;
+ int ijk[3]) override;
/**
* Return the ordered triangulator.
@@ -97,7 +97,7 @@ public:
protected:
// Constructor with default bounds (0,1, 0,1, 0,1).
vtkHyperOctreeClipCutPointsGrabber();
- ~vtkHyperOctreeClipCutPointsGrabber() VTK_OVERRIDE;
+ ~vtkHyperOctreeClipCutPointsGrabber() override;
vtkOrderedTriangulator *Triangulator;
vtkPolygon *Polygon;
diff --git a/Filters/HyperTree/vtkHyperOctreeContourFilter.cxx b/Filters/HyperTree/vtkHyperOctreeContourFilter.cxx
index 0adf013340b496a429a2a81d68ff9291bb96dc8e..57b28fcf5c43ceccdfca87e4e77888d3b23642ae 100644
--- a/Filters/HyperTree/vtkHyperOctreeContourFilter.cxx
+++ b/Filters/HyperTree/vtkHyperOctreeContourFilter.cxx
@@ -81,13 +81,13 @@ public:
vtkTypeMacro(vtkHyperOctreeContourPointsGrabber,vtkHyperOctreePointsGrabber);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
// Description:
// Set the dimension of the hyperoctree.
// \pre valid_dim: (dim==2 || dim==3)
// \post is_set: GetDimension()==dim
- void SetDimension(int dim) VTK_OVERRIDE;
+ void SetDimension(int dim) override;
// Description:
// Initialize the points insertion scheme.
@@ -96,7 +96,7 @@ public:
// It is used by clip,cut and contour filters to build the points
// that lie on an hyperoctant.
// \pre only_in_3d: GetDimension()==3
- void InitPointInsertion() VTK_OVERRIDE;
+ void InitPointInsertion() override;
// Description:
// Insert a point, assuming the point is unique and does not require a
@@ -105,19 +105,19 @@ public:
void InsertPoint(vtkIdType ptId,
double pt[3],
double pcoords[3],
- int ijk[3]) VTK_OVERRIDE;
+ int ijk[3]) override;
// Description:
// Insert a point using a locator.
void InsertPointWithMerge(vtkIdType ptId,
double pt[3],
double pcoords[3],
- int ijk[3]) VTK_OVERRIDE;
+ int ijk[3]) override;
// Description:
// Insert a point in the quadtree case.
void InsertPoint2D(double pt[3],
- int ijk[3]) VTK_OVERRIDE;
+ int ijk[3]) override;
// Description:
// Return the ordered triangulator.
@@ -141,7 +141,7 @@ public:
protected:
// Constructor with default bounds (0,1, 0,1, 0,1).
vtkHyperOctreeContourPointsGrabber();
- ~vtkHyperOctreeContourPointsGrabber() VTK_OVERRIDE;
+ ~vtkHyperOctreeContourPointsGrabber() override;
vtkHyperOctreeContourFilter *Filter;
vtkOrderedTriangulator *Triangulator;
diff --git a/Filters/HyperTree/vtkHyperOctreeContourFilter.h b/Filters/HyperTree/vtkHyperOctreeContourFilter.h
index bd703162e5b70504e784e26ff67fb5ba2a3be779..1718a4856210ceb7d603ed209d00712dc4ae069c 100644
--- a/Filters/HyperTree/vtkHyperOctreeContourFilter.h
+++ b/Filters/HyperTree/vtkHyperOctreeContourFilter.h
@@ -70,7 +70,7 @@ class VTKFILTERSHYPERTREE_EXPORT vtkHyperOctreeContourFilter : public vtkPolyDat
{
public:
vtkTypeMacro(vtkHyperOctreeContourFilter,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct object with initial range (0,1) and single contour value
@@ -158,7 +158,7 @@ public:
/**
* Modified GetMTime Because we delegate to vtkContourValues
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
//@{
/**
@@ -177,15 +177,15 @@ public:
protected:
vtkHyperOctreeContourFilter();
- ~vtkHyperOctreeContourFilter() VTK_OVERRIDE;
+ ~vtkHyperOctreeContourFilter() override;
int RequestData(vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
int RequestUpdateExtent(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ vtkInformationVector*) override;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
/**
* Do the recursive contour of the node pointed by Cursor.
diff --git a/Filters/HyperTree/vtkHyperOctreeCutter.h b/Filters/HyperTree/vtkHyperOctreeCutter.h
index 8eb6998e8acc5bf2239fa837c610ddca8f6b015b..151b48a936f457e0ccf46daf1bafdf21cf8b2898 100644
--- a/Filters/HyperTree/vtkHyperOctreeCutter.h
+++ b/Filters/HyperTree/vtkHyperOctreeCutter.h
@@ -72,7 +72,7 @@ class VTKFILTERSHYPERTREE_EXPORT vtkHyperOctreeCutter : public vtkPolyDataAlgori
{
public:
vtkTypeMacro(vtkHyperOctreeCutter,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct with user-specified implicit function; initial value of 0.0; and
@@ -140,7 +140,7 @@ public:
* Override GetMTime because we delegate to vtkContourValues and refer to
* vtkImplicitFunction.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
//@{
/**
@@ -219,11 +219,11 @@ public:
protected:
vtkHyperOctreeCutter(vtkImplicitFunction *cf=nullptr);
- ~vtkHyperOctreeCutter() VTK_OVERRIDE;
+ ~vtkHyperOctreeCutter() override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int RequestUpdateExtent(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int RequestUpdateExtent(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
/**
* Cut the sub-hierarchy pointed by cursor.
diff --git a/Filters/HyperTree/vtkHyperOctreeDepth.h b/Filters/HyperTree/vtkHyperOctreeDepth.h
index df3d70f37a06347b360769cba7de99f65cdc04d7..b12b8170f33acab628bd86aed758a80400fdf561 100644
--- a/Filters/HyperTree/vtkHyperOctreeDepth.h
+++ b/Filters/HyperTree/vtkHyperOctreeDepth.h
@@ -41,11 +41,11 @@ public:
protected:
vtkHyperOctreeDepth();
- ~vtkHyperOctreeDepth() VTK_OVERRIDE;
+ ~vtkHyperOctreeDepth() override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
- int FillOutputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
+ int FillOutputPortInformation(int port, vtkInformation *info) override;
vtkHyperOctree *Input;
vtkHyperOctree *Output;
diff --git a/Filters/HyperTree/vtkHyperOctreeDualGridContourFilter.h b/Filters/HyperTree/vtkHyperOctreeDualGridContourFilter.h
index ff0985f3380faf775f4eda53c370c9b71b3f8637..6b1d1ab8743ee098a693b485412d1633de027f64 100644
--- a/Filters/HyperTree/vtkHyperOctreeDualGridContourFilter.h
+++ b/Filters/HyperTree/vtkHyperOctreeDualGridContourFilter.h
@@ -59,7 +59,7 @@ class VTKFILTERSHYPERTREE_EXPORT vtkHyperOctreeDualGridContourFilter : public vt
{
public:
vtkTypeMacro(vtkHyperOctreeDualGridContourFilter,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct object with initial range (0,1) and single contour value
@@ -147,7 +147,7 @@ public:
/**
* Modified GetMTime Because we delegate to vtkContourValues
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
//@{
/**
@@ -166,15 +166,15 @@ public:
protected:
vtkHyperOctreeDualGridContourFilter();
- ~vtkHyperOctreeDualGridContourFilter() VTK_OVERRIDE;
+ ~vtkHyperOctreeDualGridContourFilter() override;
int RequestData(vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
int RequestUpdateExtent(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ vtkInformationVector*) override;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
/**
* Do the recursive contour of the node pointed by Cursor.
diff --git a/Filters/HyperTree/vtkHyperOctreeLimiter.h b/Filters/HyperTree/vtkHyperOctreeLimiter.h
index 918e0a10e0b5df5843afc69ed5ba76afe068498a..a680fadc3b84e1ab0be68bd3189cef32b8abf848 100644
--- a/Filters/HyperTree/vtkHyperOctreeLimiter.h
+++ b/Filters/HyperTree/vtkHyperOctreeLimiter.h
@@ -52,11 +52,11 @@ public:
protected:
vtkHyperOctreeLimiter();
- ~vtkHyperOctreeLimiter() VTK_OVERRIDE;
+ ~vtkHyperOctreeLimiter() override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
- int FillOutputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
+ int FillOutputPortInformation(int port, vtkInformation *info) override;
vtkHyperOctree *Input;
vtkHyperOctree *Output;
diff --git a/Filters/HyperTree/vtkHyperOctreeSampleFunction.h b/Filters/HyperTree/vtkHyperOctreeSampleFunction.h
index 633413b8425ee91e2b3bbf47db6b0c20441d9fbd..47ce571f23d631af4c788b2d5b15dec326a1696f 100644
--- a/Filters/HyperTree/vtkHyperOctreeSampleFunction.h
+++ b/Filters/HyperTree/vtkHyperOctreeSampleFunction.h
@@ -38,7 +38,7 @@ class VTKFILTERSHYPERTREE_EXPORT vtkHyperOctreeSampleFunction : public vtkHyperO
{
public:
vtkTypeMacro(vtkHyperOctreeSampleFunction,vtkHyperOctreeAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkHyperOctreeSampleFunction *New();
@@ -200,7 +200,7 @@ public:
/**
* Return the MTime also considering the implicit function.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
protected:
//@{
@@ -211,15 +211,15 @@ protected:
* Threshold is 0.1.
*/
vtkHyperOctreeSampleFunction();
- ~vtkHyperOctreeSampleFunction() VTK_OVERRIDE;
+ ~vtkHyperOctreeSampleFunction() override;
//@}
int RequestInformation (vtkInformation * vtkNotUsed(request),
vtkInformationVector ** vtkNotUsed( inputVector ),
- vtkInformationVector *outputVector) VTK_OVERRIDE;
+ vtkInformationVector *outputVector) override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
void Subdivide(vtkHyperOctreeCursor *cursor,
int level,
diff --git a/Filters/HyperTree/vtkHyperOctreeSurfaceFilter.h b/Filters/HyperTree/vtkHyperOctreeSurfaceFilter.h
index 25eeafb914948335e856722648afea329c050f08..7481c779263989a48fdfee6a0ac00d9d696ac26a 100644
--- a/Filters/HyperTree/vtkHyperOctreeSurfaceFilter.h
+++ b/Filters/HyperTree/vtkHyperOctreeSurfaceFilter.h
@@ -38,7 +38,7 @@ class VTKFILTERSHYPERTREE_EXPORT vtkHyperOctreeSurfaceFilter : public vtkPolyDat
public:
static vtkHyperOctreeSurfaceFilter *New();
vtkTypeMacro(vtkHyperOctreeSurfaceFilter,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -63,7 +63,7 @@ public:
/**
* Return the MTime also considering the locator.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
//@{
/**
@@ -79,10 +79,10 @@ public:
protected:
vtkHyperOctreeSurfaceFilter();
- ~vtkHyperOctreeSurfaceFilter() VTK_OVERRIDE;
+ ~vtkHyperOctreeSurfaceFilter() override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
void GenerateLines(double bounds[2],
vtkIdType ptIds[2]);
diff --git a/Filters/HyperTree/vtkHyperOctreeToUniformGridFilter.h b/Filters/HyperTree/vtkHyperOctreeToUniformGridFilter.h
index 1851cd6ac4e883f4f884a3d0975d0751e02b7284..08ddaf40353695d973d56e25346d92b55e47f2a2 100644
--- a/Filters/HyperTree/vtkHyperOctreeToUniformGridFilter.h
+++ b/Filters/HyperTree/vtkHyperOctreeToUniformGridFilter.h
@@ -41,18 +41,18 @@ class VTKFILTERSHYPERTREE_EXPORT vtkHyperOctreeToUniformGridFilter : public vtkI
public:
static vtkHyperOctreeToUniformGridFilter *New();
vtkTypeMacro(vtkHyperOctreeToUniformGridFilter,vtkImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkHyperOctreeToUniformGridFilter();
- ~vtkHyperOctreeToUniformGridFilter() VTK_OVERRIDE;
+ ~vtkHyperOctreeToUniformGridFilter() override;
int RequestInformation (vtkInformation * vtkNotUsed(request),
vtkInformationVector **inputVector,
- vtkInformationVector *outputVector) VTK_OVERRIDE;
+ vtkInformationVector *outputVector) override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
void CopyCellData(int cellExtent[6]);
diff --git a/Filters/HyperTree/vtkHyperTreeGridAxisClip.h b/Filters/HyperTree/vtkHyperTreeGridAxisClip.h
index e8879a8112b6550f8417561d4a56522a956178a3..3e208e5b8b3c3de875eb0065778e86b22bfefc13 100644
--- a/Filters/HyperTree/vtkHyperTreeGridAxisClip.h
+++ b/Filters/HyperTree/vtkHyperTreeGridAxisClip.h
@@ -47,7 +47,7 @@ class VTKFILTERSHYPERTREE_EXPORT vtkHyperTreeGridAxisClip : public vtkHyperTreeG
public:
static vtkHyperTreeGridAxisClip* New();
vtkTypeMacro( vtkHyperTreeGridAxisClip, vtkHyperTreeGridAlgorithm );
- void PrintSelf( ostream&, vtkIndent ) VTK_OVERRIDE;
+ void PrintSelf( ostream&, vtkIndent ) override;
/**
* Methods by which the hyper tree grid input may be clipped:
@@ -135,14 +135,14 @@ public:
/**
* Override GetMTime because we delegate to a vtkQuadric.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
protected:
vtkHyperTreeGridAxisClip();
- ~vtkHyperTreeGridAxisClip() VTK_OVERRIDE;
+ ~vtkHyperTreeGridAxisClip() override;
// For this algorithm the output is a vtkHyperTreeGrid instance
- int FillOutputPortInformation( int, vtkInformation* ) VTK_OVERRIDE;
+ int FillOutputPortInformation( int, vtkInformation* ) override;
/**
* Decide whether the cell is clipped out
@@ -152,7 +152,7 @@ protected:
/**
* Main routine to generate hyper tree grid clip
*/
- int ProcessTrees( vtkHyperTreeGrid*, vtkDataObject* ) VTK_OVERRIDE;
+ int ProcessTrees( vtkHyperTreeGrid*, vtkDataObject* ) override;
/**
* Recursively descend into tree down to leaves
diff --git a/Filters/HyperTree/vtkHyperTreeGridAxisCut.h b/Filters/HyperTree/vtkHyperTreeGridAxisCut.h
index 7644dc6dd9838b32c7a25e199207f6bd0db0d54a..675b1606deb7ee547980a60b6cf8525c6ab0d8ea 100644
--- a/Filters/HyperTree/vtkHyperTreeGridAxisCut.h
+++ b/Filters/HyperTree/vtkHyperTreeGridAxisCut.h
@@ -50,7 +50,7 @@ class VTKFILTERSHYPERTREE_EXPORT vtkHyperTreeGridAxisCut : public vtkHyperTreeGr
public:
static vtkHyperTreeGridAxisCut* New();
vtkTypeMacro( vtkHyperTreeGridAxisCut, vtkHyperTreeGridAlgorithm );
- void PrintSelf( ostream&, vtkIndent ) VTK_OVERRIDE;
+ void PrintSelf( ostream&, vtkIndent ) override;
//@{
/**
@@ -70,15 +70,15 @@ public:
protected:
vtkHyperTreeGridAxisCut();
- ~vtkHyperTreeGridAxisCut() VTK_OVERRIDE;
+ ~vtkHyperTreeGridAxisCut() override;
// For this algorithm the output is a vtkHyperTreeGrid instance
- int FillOutputPortInformation( int, vtkInformation* ) VTK_OVERRIDE;
+ int FillOutputPortInformation( int, vtkInformation* ) override;
/**
* Main routine to generate hyper tree grid cut
*/
- int ProcessTrees( vtkHyperTreeGrid*, vtkDataObject* ) VTK_OVERRIDE;
+ int ProcessTrees( vtkHyperTreeGrid*, vtkDataObject* ) override;
/**
* Recursively descend into tree down to leaves
diff --git a/Filters/HyperTree/vtkHyperTreeGridAxisReflection.h b/Filters/HyperTree/vtkHyperTreeGridAxisReflection.h
index 1edccb921bb81360ae4dd40b433c88ae2f873870..0afe50ef75e6fd1598be747c847ec68935e03444 100644
--- a/Filters/HyperTree/vtkHyperTreeGridAxisReflection.h
+++ b/Filters/HyperTree/vtkHyperTreeGridAxisReflection.h
@@ -41,7 +41,7 @@ class VTKFILTERSHYPERTREE_EXPORT vtkHyperTreeGridAxisReflection : public vtkHype
public:
static vtkHyperTreeGridAxisReflection* New();
vtkTypeMacro( vtkHyperTreeGridAxisReflection, vtkHyperTreeGridAlgorithm );
- void PrintSelf( ostream&, vtkIndent ) VTK_OVERRIDE;
+ void PrintSelf( ostream&, vtkIndent ) override;
/**
* Specify unique identifiers of vailable reflection planes.
@@ -87,17 +87,17 @@ public:
protected:
vtkHyperTreeGridAxisReflection();
- ~vtkHyperTreeGridAxisReflection() VTK_OVERRIDE;
+ ~vtkHyperTreeGridAxisReflection() override;
/**
* For this algorithm the output is a vtkHyperTreeGrid instance
*/
- int FillOutputPortInformation( int, vtkInformation* ) VTK_OVERRIDE;
+ int FillOutputPortInformation( int, vtkInformation* ) override;
/**
* Main routine to extract cells based on reflectioned value
*/
- int ProcessTrees( vtkHyperTreeGrid*, vtkDataObject* ) VTK_OVERRIDE;
+ int ProcessTrees( vtkHyperTreeGrid*, vtkDataObject* ) override;
/**
* Required type of plane reflection
diff --git a/Filters/HyperTree/vtkHyperTreeGridCellCenters.h b/Filters/HyperTree/vtkHyperTreeGridCellCenters.h
index 14460fd2fb7e5b489126ec83d3065fa68f34df48..2827678a16b204b05d32933e4e54402fcd959a8b 100644
--- a/Filters/HyperTree/vtkHyperTreeGridCellCenters.h
+++ b/Filters/HyperTree/vtkHyperTreeGridCellCenters.h
@@ -56,14 +56,14 @@ class VTKFILTERSHYPERTREE_EXPORT vtkHyperTreeGridCellCenters : public vtkCellCen
public:
static vtkHyperTreeGridCellCenters* New();
vtkTypeMacro( vtkHyperTreeGridCellCenters, vtkCellCenters );
- void PrintSelf( ostream&, vtkIndent ) VTK_OVERRIDE;
+ void PrintSelf( ostream&, vtkIndent ) override;
protected:
vtkHyperTreeGridCellCenters();
- ~vtkHyperTreeGridCellCenters() VTK_OVERRIDE;
+ ~vtkHyperTreeGridCellCenters() override;
- int RequestData( vtkInformation*, vtkInformationVector**, vtkInformationVector* ) VTK_OVERRIDE;
- int FillInputPortInformation( int, vtkInformation* ) VTK_OVERRIDE;
+ int RequestData( vtkInformation*, vtkInformationVector**, vtkInformationVector* ) override;
+ int FillInputPortInformation( int, vtkInformation* ) override;
/**
* Main routine to process individual trees in the grid
diff --git a/Filters/HyperTree/vtkHyperTreeGridContour.h b/Filters/HyperTree/vtkHyperTreeGridContour.h
index c9a09806311b2b5ce39ff3ea3fec0a83e40389d1..8390da7a9e93d57a0e69d74c4485f33f40476370 100644
--- a/Filters/HyperTree/vtkHyperTreeGridContour.h
+++ b/Filters/HyperTree/vtkHyperTreeGridContour.h
@@ -60,7 +60,7 @@ class VTKFILTERSHYPERTREE_EXPORT vtkHyperTreeGridContour : public vtkHyperTreeGr
public:
static vtkHyperTreeGridContour* New();
vtkTypeMacro( vtkHyperTreeGridContour, vtkHyperTreeGridAlgorithm );
- void PrintSelf( ostream&, vtkIndent ) VTK_OVERRIDE;
+ void PrintSelf( ostream&, vtkIndent ) override;
//@{
/**
@@ -80,7 +80,7 @@ public:
/**
* Modified GetMTime Because we delegate to vtkContourValues.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
//@{
/**
@@ -98,17 +98,17 @@ public:
protected:
vtkHyperTreeGridContour();
- ~vtkHyperTreeGridContour() VTK_OVERRIDE;
+ ~vtkHyperTreeGridContour() override;
/**
* For this algorithm the output is a vtkPolyData instance
*/
- int FillOutputPortInformation( int, vtkInformation* ) VTK_OVERRIDE;
+ int FillOutputPortInformation( int, vtkInformation* ) override;
/**
* Main routine to generate isocontours of hyper tree grid.
*/
- int ProcessTrees( vtkHyperTreeGrid*, vtkDataObject* ) VTK_OVERRIDE;
+ int ProcessTrees( vtkHyperTreeGrid*, vtkDataObject* ) override;
/**
* Recursively decide whether a cell is intersected by a contour
diff --git a/Filters/HyperTree/vtkHyperTreeGridDepthLimiter.h b/Filters/HyperTree/vtkHyperTreeGridDepthLimiter.h
index 2c0d1cf3116d91fbbe0c7756e758a4d059d98ef2..ca1e8b96602bb97ac5b0370dfe18783587f1b4bb 100644
--- a/Filters/HyperTree/vtkHyperTreeGridDepthLimiter.h
+++ b/Filters/HyperTree/vtkHyperTreeGridDepthLimiter.h
@@ -50,7 +50,7 @@ class VTKFILTERSHYPERTREE_EXPORT vtkHyperTreeGridDepthLimiter : public vtkHyperT
public:
static vtkHyperTreeGridDepthLimiter* New();
vtkTypeMacro( vtkHyperTreeGridDepthLimiter, vtkHyperTreeGridAlgorithm );
- void PrintSelf( ostream&, vtkIndent ) VTK_OVERRIDE;
+ void PrintSelf( ostream&, vtkIndent ) override;
//@{
/**
@@ -62,17 +62,17 @@ public:
protected:
vtkHyperTreeGridDepthLimiter();
- ~vtkHyperTreeGridDepthLimiter() VTK_OVERRIDE;
+ ~vtkHyperTreeGridDepthLimiter() override;
/**
* For this algorithm the output is a vtkHyperTreeGrid instance
*/
- int FillOutputPortInformation( int, vtkInformation* ) VTK_OVERRIDE;
+ int FillOutputPortInformation( int, vtkInformation* ) override;
/**
* Main routine to extract hyper tree grid levels
*/
- int ProcessTrees( vtkHyperTreeGrid*, vtkDataObject* ) VTK_OVERRIDE;
+ int ProcessTrees( vtkHyperTreeGrid*, vtkDataObject* ) override;
/**
* Recursively descend into tree down to leaves
diff --git a/Filters/HyperTree/vtkHyperTreeGridGeometry.h b/Filters/HyperTree/vtkHyperTreeGridGeometry.h
index a2f1b96eae8ba99ac06890223938310ad394a834..30b5c5d27f36d477dce262b82920bba41762a444 100644
--- a/Filters/HyperTree/vtkHyperTreeGridGeometry.h
+++ b/Filters/HyperTree/vtkHyperTreeGridGeometry.h
@@ -43,21 +43,21 @@ class VTKFILTERSHYPERTREE_EXPORT vtkHyperTreeGridGeometry : public vtkHyperTreeG
public:
static vtkHyperTreeGridGeometry* New();
vtkTypeMacro( vtkHyperTreeGridGeometry, vtkHyperTreeGridAlgorithm );
- void PrintSelf( ostream&, vtkIndent ) VTK_OVERRIDE;
+ void PrintSelf( ostream&, vtkIndent ) override;
protected:
vtkHyperTreeGridGeometry();
- ~vtkHyperTreeGridGeometry() VTK_OVERRIDE;
+ ~vtkHyperTreeGridGeometry() override;
/**
* For this algorithm the output is a vtkPolyData instance
*/
- int FillOutputPortInformation( int, vtkInformation* ) VTK_OVERRIDE;
+ int FillOutputPortInformation( int, vtkInformation* ) override;
/**
* Main routine to generate external boundary
*/
- int ProcessTrees( vtkHyperTreeGrid*, vtkDataObject* ) VTK_OVERRIDE;
+ int ProcessTrees( vtkHyperTreeGrid*, vtkDataObject* ) override;
/**
* Recursively descend into tree down to leaves
diff --git a/Filters/HyperTree/vtkHyperTreeGridPlaneCutter.h b/Filters/HyperTree/vtkHyperTreeGridPlaneCutter.h
index 87c68671a01fc041f727cd62c1d87b7071591b77..9d8e8159ecd57bc9a7bbe93acf486bebfeb6d090 100644
--- a/Filters/HyperTree/vtkHyperTreeGridPlaneCutter.h
+++ b/Filters/HyperTree/vtkHyperTreeGridPlaneCutter.h
@@ -54,7 +54,7 @@ class VTKFILTERSHYPERTREE_EXPORT vtkHyperTreeGridPlaneCutter : public vtkHyperTr
public:
static vtkHyperTreeGridPlaneCutter* New();
vtkTypeMacro( vtkHyperTreeGridPlaneCutter, vtkHyperTreeGridAlgorithm );
- void PrintSelf( ostream&, vtkIndent ) VTK_OVERRIDE;
+ void PrintSelf( ostream&, vtkIndent ) override;
//@{
/**
@@ -76,17 +76,17 @@ public:
protected:
vtkHyperTreeGridPlaneCutter();
- ~vtkHyperTreeGridPlaneCutter() VTK_OVERRIDE;
+ ~vtkHyperTreeGridPlaneCutter() override;
/**
* For this algorithm the output is a vtkPolyData instance
*/
- int FillOutputPortInformation( int, vtkInformation* ) VTK_OVERRIDE;
+ int FillOutputPortInformation( int, vtkInformation* ) override;
/**
* Top-level routine to generate plane cut
*/
- int ProcessTrees( vtkHyperTreeGrid*, vtkDataObject* ) VTK_OVERRIDE;
+ int ProcessTrees( vtkHyperTreeGrid*, vtkDataObject* ) override;
/**
* Recursively descend into tree down to leaves, cutting primal cells
diff --git a/Filters/HyperTree/vtkHyperTreeGridThreshold.h b/Filters/HyperTree/vtkHyperTreeGridThreshold.h
index a6d7c4ef67d484020c15662a5ef3185b1ef826fd..762185c361ad9ab9a58be2e3db696d07ad9e70cd 100644
--- a/Filters/HyperTree/vtkHyperTreeGridThreshold.h
+++ b/Filters/HyperTree/vtkHyperTreeGridThreshold.h
@@ -48,7 +48,7 @@ class VTKFILTERSHYPERTREE_EXPORT vtkHyperTreeGridThreshold : public vtkHyperTree
public:
static vtkHyperTreeGridThreshold* New();
vtkTypeMacro( vtkHyperTreeGridThreshold, vtkHyperTreeGridAlgorithm );
- void PrintSelf( ostream&, vtkIndent ) VTK_OVERRIDE;
+ void PrintSelf( ostream&, vtkIndent ) override;
//@{
/**
@@ -73,17 +73,17 @@ public:
protected:
vtkHyperTreeGridThreshold();
- ~vtkHyperTreeGridThreshold() VTK_OVERRIDE;
+ ~vtkHyperTreeGridThreshold() override;
/**
* For this algorithm the output is a vtkHyperTreeGrid instance
*/
- int FillOutputPortInformation( int, vtkInformation* ) VTK_OVERRIDE;
+ int FillOutputPortInformation( int, vtkInformation* ) override;
/**
* Main routine to extract cells based on thresholded value
*/
- int ProcessTrees( vtkHyperTreeGrid*, vtkDataObject* ) VTK_OVERRIDE;
+ int ProcessTrees( vtkHyperTreeGrid*, vtkDataObject* ) override;
/**
* Recursively descend into tree down to leaves
diff --git a/Filters/HyperTree/vtkHyperTreeGridToUnstructuredGrid.h b/Filters/HyperTree/vtkHyperTreeGridToUnstructuredGrid.h
index 95fdbc44527cf06b552a08bd61ef7ef4e2b3b1a7..ad898a6580a778f64ff6439a3152744a4f99e0a5 100644
--- a/Filters/HyperTree/vtkHyperTreeGridToUnstructuredGrid.h
+++ b/Filters/HyperTree/vtkHyperTreeGridToUnstructuredGrid.h
@@ -51,21 +51,21 @@ class VTKFILTERSHYPERTREE_EXPORT vtkHyperTreeGridToUnstructuredGrid : public vtk
public:
static vtkHyperTreeGridToUnstructuredGrid* New();
vtkTypeMacro( vtkHyperTreeGridToUnstructuredGrid, vtkHyperTreeGridAlgorithm );
- void PrintSelf( ostream&, vtkIndent ) VTK_OVERRIDE;
+ void PrintSelf( ostream&, vtkIndent ) override;
protected:
vtkHyperTreeGridToUnstructuredGrid();
- ~vtkHyperTreeGridToUnstructuredGrid() VTK_OVERRIDE;
+ ~vtkHyperTreeGridToUnstructuredGrid() override;
/**
* For this algorithm the output is a vtkUnstructuredGrid instance
*/
- int FillOutputPortInformation( int, vtkInformation* ) VTK_OVERRIDE;
+ int FillOutputPortInformation( int, vtkInformation* ) override;
/**
* Main routine to convert the grid of tree into an unstructured grid
*/
- int ProcessTrees( vtkHyperTreeGrid*, vtkDataObject* ) VTK_OVERRIDE;
+ int ProcessTrees( vtkHyperTreeGrid*, vtkDataObject* ) override;
/**
* Recursively descend into tree down to leaves
diff --git a/Filters/Imaging/vtkComputeHistogram2DOutliers.h b/Filters/Imaging/vtkComputeHistogram2DOutliers.h
index 2533a89a8459911bbcd1d363be3dc92f18cd1977..06265ce06d2247672f96b97356140a2d104ad898 100644
--- a/Filters/Imaging/vtkComputeHistogram2DOutliers.h
+++ b/Filters/Imaging/vtkComputeHistogram2DOutliers.h
@@ -64,7 +64,7 @@ class VTKFILTERSIMAGING_EXPORT vtkComputeHistogram2DOutliers : public vtkSelecti
public:
static vtkComputeHistogram2DOutliers* New();
vtkTypeMacro(vtkComputeHistogram2DOutliers, vtkSelectionAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
vtkSetMacro(PreferredNumberOfOutliers,int);
vtkGetMacro(PreferredNumberOfOutliers,int);
@@ -105,7 +105,7 @@ public:
protected:
vtkComputeHistogram2DOutliers();
- ~vtkComputeHistogram2DOutliers() VTK_OVERRIDE;
+ ~vtkComputeHistogram2DOutliers() override;
int PreferredNumberOfOutliers;
vtkTimeStamp BuildTime;
@@ -113,10 +113,10 @@ protected:
int RequestData(
vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
- int FillInputPortInformation( int port, vtkInformation* info ) VTK_OVERRIDE;
- int FillOutputPortInformation( int port, vtkInformation* info ) VTK_OVERRIDE;
+ int FillInputPortInformation( int port, vtkInformation* info ) override;
+ int FillOutputPortInformation( int port, vtkInformation* info ) override;
/**
* Compute the thresholds (essentially bin extents) that contain outliers for
diff --git a/Filters/Imaging/vtkExtractHistogram2D.h b/Filters/Imaging/vtkExtractHistogram2D.h
index 51b5e1d7454192b151d8a2d31463b359deb85ab1..a1c6566b5d718ffcc640bc2a2586bdd447831a02 100644
--- a/Filters/Imaging/vtkExtractHistogram2D.h
+++ b/Filters/Imaging/vtkExtractHistogram2D.h
@@ -60,7 +60,7 @@ class VTKFILTERSIMAGING_EXPORT vtkExtractHistogram2D : public vtkStatisticsAlgor
public:
static vtkExtractHistogram2D* New();
vtkTypeMacro(vtkExtractHistogram2D, vtkStatisticsAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
enum OutputIndices
{
@@ -178,11 +178,11 @@ public:
/**
* Given a collection of models, calculate aggregate model. Not used.
*/
- void Aggregate( vtkDataObjectCollection*, vtkMultiBlockDataSet* ) VTK_OVERRIDE {}
+ void Aggregate( vtkDataObjectCollection*, vtkMultiBlockDataSet* ) override {}
protected:
vtkExtractHistogram2D();
- ~vtkExtractHistogram2D() VTK_OVERRIDE;
+ ~vtkExtractHistogram2D() override;
int SwapColumns;
int NumberOfBins[2];
@@ -202,26 +202,26 @@ protected:
*/
void Learn( vtkTable* inData,
vtkTable* inParameters,
- vtkMultiBlockDataSet* inMeta ) VTK_OVERRIDE;
+ vtkMultiBlockDataSet* inMeta ) override;
/**
* Execute the calculations required by the Derive option. Not used.
*/
- void Derive( vtkMultiBlockDataSet* ) VTK_OVERRIDE {}
+ void Derive( vtkMultiBlockDataSet* ) override {}
/**
* Execute the calculations required by the Test option.
*/
void Test( vtkTable*,
vtkMultiBlockDataSet*,
- vtkTable* ) VTK_OVERRIDE { return; };
+ vtkTable* ) override { return; };
/**
* Execute the calculations required by the Assess option.
*/
void Assess( vtkTable*,
vtkMultiBlockDataSet*,
- vtkTable* ) VTK_OVERRIDE { return; };
+ vtkTable* ) override { return; };
/**
* Provide the appropriate assessment functor. Not used.
@@ -229,16 +229,16 @@ protected:
void SelectAssessFunctor( vtkTable* vtkNotUsed(outData),
vtkDataObject* vtkNotUsed(inMeta),
vtkStringArray* vtkNotUsed(rowNames),
- AssessFunctor*& vtkNotUsed(dfunc) ) VTK_OVERRIDE {}
+ AssessFunctor*& vtkNotUsed(dfunc) ) override {}
- int FillOutputPortInformation( int port, vtkInformation* info ) VTK_OVERRIDE;
+ int FillOutputPortInformation( int port, vtkInformation* info ) override;
/**
* Makes sure that the image data output port has up-to-date spacing/origin/etc
*/
int RequestInformation (vtkInformation *request,
vtkInformationVector **inputVector,
- vtkInformationVector *outputVector) VTK_OVERRIDE;
+ vtkInformationVector *outputVector) override;
/**
* Get points to the arrays that live in the two input columns
diff --git a/Filters/Imaging/vtkPairwiseExtractHistogram2D.h b/Filters/Imaging/vtkPairwiseExtractHistogram2D.h
index f43280caf14710ca3c370a8f6aa9279d68f31d0f..ba3ee5da4a9579f37eec0313daa3d0302e87bda2 100644
--- a/Filters/Imaging/vtkPairwiseExtractHistogram2D.h
+++ b/Filters/Imaging/vtkPairwiseExtractHistogram2D.h
@@ -59,7 +59,7 @@ class VTKFILTERSIMAGING_EXPORT vtkPairwiseExtractHistogram2D : public vtkStatist
public:
static vtkPairwiseExtractHistogram2D* New();
vtkTypeMacro(vtkPairwiseExtractHistogram2D, vtkStatisticsAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -157,11 +157,11 @@ public:
/**
* Given a collection of models, calculate aggregate model. Not used
*/
- void Aggregate( vtkDataObjectCollection*, vtkMultiBlockDataSet* ) VTK_OVERRIDE {}
+ void Aggregate( vtkDataObjectCollection*, vtkMultiBlockDataSet* ) override {}
protected:
vtkPairwiseExtractHistogram2D();
- ~vtkPairwiseExtractHistogram2D() VTK_OVERRIDE;
+ ~vtkPairwiseExtractHistogram2D() override;
int NumberOfBins[2];
int ScalarType;
@@ -178,26 +178,26 @@ protected:
*/
void Learn( vtkTable* inData,
vtkTable* inParameters,
- vtkMultiBlockDataSet* outMeta ) VTK_OVERRIDE;
+ vtkMultiBlockDataSet* outMeta ) override;
/**
* Execute the calculations required by the Derive option. Not used.
*/
- void Derive( vtkMultiBlockDataSet* ) VTK_OVERRIDE {}
+ void Derive( vtkMultiBlockDataSet* ) override {}
/**
* Execute the assess option. Not implemented.
*/
void Assess( vtkTable*,
vtkMultiBlockDataSet*,
- vtkTable* ) VTK_OVERRIDE {}
+ vtkTable* ) override {}
/**
* Execute the calculations required by the Test option.
*/
void Test( vtkTable*,
vtkMultiBlockDataSet*,
- vtkTable* ) VTK_OVERRIDE { return; };
+ vtkTable* ) override { return; };
/**
* Provide the appropriate assessment functor.
@@ -205,14 +205,14 @@ protected:
void SelectAssessFunctor( vtkTable* vtkNotUsed(outData),
vtkDataObject* vtkNotUsed(inMeta),
vtkStringArray* vtkNotUsed(rowNames),
- AssessFunctor*& vtkNotUsed(dfunc) ) VTK_OVERRIDE {}
+ AssessFunctor*& vtkNotUsed(dfunc) ) override {}
/**
* Generate a new histogram filter
*/
virtual vtkExtractHistogram2D* NewHistogramFilter();
- int FillOutputPortInformation( int port, vtkInformation* info ) VTK_OVERRIDE;
+ int FillOutputPortInformation( int port, vtkInformation* info ) override;
vtkTimeStamp BuildTime;
private:
diff --git a/Filters/Modeling/vtkAdaptiveSubdivisionFilter.h b/Filters/Modeling/vtkAdaptiveSubdivisionFilter.h
index dbc793ca30ce427f471f6e3712935d5c58323e5f..d1b7729ca5d8dfa7b38417a1ff0599a09dd89861 100644
--- a/Filters/Modeling/vtkAdaptiveSubdivisionFilter.h
+++ b/Filters/Modeling/vtkAdaptiveSubdivisionFilter.h
@@ -84,7 +84,7 @@ public:
*/
static vtkAdaptiveSubdivisionFilter *New();
vtkTypeMacro(vtkAdaptiveSubdivisionFilter,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -160,11 +160,11 @@ public:
/**
* Modified GetMTime because of the dependence on the locator.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
protected:
vtkAdaptiveSubdivisionFilter();
- ~vtkAdaptiveSubdivisionFilter() VTK_OVERRIDE;
+ ~vtkAdaptiveSubdivisionFilter() override;
double MaximumEdgeLength;
double MaximumTriangleArea;
@@ -173,7 +173,7 @@ protected:
vtkIncrementalPointLocator *Locator;
int OutputPointsPrecision;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
private:
vtkAdaptiveSubdivisionFilter(const vtkAdaptiveSubdivisionFilter&) VTK_DELETE_FUNCTION;
diff --git a/Filters/Modeling/vtkBandedPolyDataContourFilter.h b/Filters/Modeling/vtkBandedPolyDataContourFilter.h
index b42c487a1343893d892adf53b04be3f72c307e4a..6eb22c6fa03a1280c7e3e82f3ceaadb745728279 100644
--- a/Filters/Modeling/vtkBandedPolyDataContourFilter.h
+++ b/Filters/Modeling/vtkBandedPolyDataContourFilter.h
@@ -60,7 +60,7 @@ class VTKFILTERSMODELING_EXPORT vtkBandedPolyDataContourFilter : public vtkPolyD
{
public:
vtkTypeMacro(vtkBandedPolyDataContourFilter,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct object with no contours defined.
@@ -153,13 +153,13 @@ public:
* Overload GetMTime because we delegate to vtkContourValues so its
* modified time must be taken into account.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
protected:
vtkBandedPolyDataContourFilter();
- ~vtkBandedPolyDataContourFilter() VTK_OVERRIDE;
+ ~vtkBandedPolyDataContourFilter() override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
int ComputeScalarIndex(double);
int IsContourValue(double val);
diff --git a/Filters/Modeling/vtkButterflySubdivisionFilter.h b/Filters/Modeling/vtkButterflySubdivisionFilter.h
index bc62ad7e39a29fc7daca34f212385955c6f72ce6..4068e02e13a3b3300c967bb0de56d0a80edc1809 100644
--- a/Filters/Modeling/vtkButterflySubdivisionFilter.h
+++ b/Filters/Modeling/vtkButterflySubdivisionFilter.h
@@ -65,11 +65,11 @@ public:
protected:
vtkButterflySubdivisionFilter () {}
- ~vtkButterflySubdivisionFilter () VTK_OVERRIDE {}
+ ~vtkButterflySubdivisionFilter () override {}
private:
int GenerateSubdivisionPoints(vtkPolyData *inputDS, vtkIntArray *edgeData,
- vtkPoints *outputPts, vtkPointData *outputPD) VTK_OVERRIDE;
+ vtkPoints *outputPts, vtkPointData *outputPD) override;
void GenerateButterflyStencil(vtkIdType p1, vtkIdType p2, vtkPolyData *polys,
vtkIdList *stencilIds, double *weights);
void GenerateLoopStencil(vtkIdType p1, vtkIdType p2, vtkPolyData *polys,
diff --git a/Filters/Modeling/vtkContourLoopExtraction.h b/Filters/Modeling/vtkContourLoopExtraction.h
index 361b9e953abcd8c93f60b245f431b4a01c55741c..1d27f27f84d36651ac655033b24a82b843f144c1 100644
--- a/Filters/Modeling/vtkContourLoopExtraction.h
+++ b/Filters/Modeling/vtkContourLoopExtraction.h
@@ -75,7 +75,7 @@ public:
*/
static vtkContourLoopExtraction *New();
vtkTypeMacro(vtkContourLoopExtraction,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -135,7 +135,7 @@ protected:
double Normal[3];
int RequestData(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
private:
vtkContourLoopExtraction(const vtkContourLoopExtraction&) VTK_DELETE_FUNCTION;
diff --git a/Filters/Modeling/vtkCookieCutter.h b/Filters/Modeling/vtkCookieCutter.h
index 050112cd7b8957530a6879d838fbdd3fc4f1b869..511346d3d0ce1dbe64c5e7d6162dfc4eff090617 100644
--- a/Filters/Modeling/vtkCookieCutter.h
+++ b/Filters/Modeling/vtkCookieCutter.h
@@ -45,7 +45,7 @@ public:
*/
static vtkCookieCutter *New();
vtkTypeMacro(vtkCookieCutter,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
@@ -73,10 +73,10 @@ protected:
~vtkCookieCutter() override;
int RequestData(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
int RequestUpdateExtent(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int, vtkInformation *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
+ int FillInputPortInformation(int, vtkInformation *) override;
private:
vtkCookieCutter(const vtkCookieCutter&) VTK_DELETE_FUNCTION;
diff --git a/Filters/Modeling/vtkDijkstraGraphGeodesicPath.h b/Filters/Modeling/vtkDijkstraGraphGeodesicPath.h
index fbedc4ef060bfcfb0f0de2a0a2a3d3785dbd8fe7..bf2c99a240dd56c259935ff2981c8b592d01a562 100644
--- a/Filters/Modeling/vtkDijkstraGraphGeodesicPath.h
+++ b/Filters/Modeling/vtkDijkstraGraphGeodesicPath.h
@@ -59,7 +59,7 @@ public:
* Standard methids for printing and determining type information.
*/
vtkTypeMacro(vtkDijkstraGraphGeodesicPath,vtkGraphGeodesicPath);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -112,10 +112,10 @@ public:
protected:
vtkDijkstraGraphGeodesicPath();
- ~vtkDijkstraGraphGeodesicPath() VTK_OVERRIDE;
+ ~vtkDijkstraGraphGeodesicPath() override;
int RequestData(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
// Build a graph description of the input.
virtual void BuildAdjacency( vtkDataSet *inData );
diff --git a/Filters/Modeling/vtkDijkstraImageGeodesicPath.h b/Filters/Modeling/vtkDijkstraImageGeodesicPath.h
index 80e72c45f25585c0d779d76050e5a6da14b90704..3124d7aa93601f1d2263a2fc377d08d2c6e05b83 100644
--- a/Filters/Modeling/vtkDijkstraImageGeodesicPath.h
+++ b/Filters/Modeling/vtkDijkstraImageGeodesicPath.h
@@ -70,7 +70,7 @@ public:
* Standard methids for printing and determining type information.
*/
vtkTypeMacro( vtkDijkstraImageGeodesicPath, vtkDijkstraGraphGeodesicPath );
- void PrintSelf( ostream& os, vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf( ostream& os, vtkIndent indent ) override;
//@}
//@{
@@ -107,21 +107,21 @@ public:
protected:
vtkDijkstraImageGeodesicPath();
- ~vtkDijkstraImageGeodesicPath() VTK_OVERRIDE;
+ ~vtkDijkstraImageGeodesicPath() override;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
int RequestData(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
// Build a graph description of the image
- void BuildAdjacency( vtkDataSet *inData ) VTK_OVERRIDE;
+ void BuildAdjacency( vtkDataSet *inData ) override;
// Update static costs without rebuilding adjacencyh when static weights change
void UpdateStaticCosts( vtkImageData *image );
// Override parent class methods.
- double CalculateStaticEdgeCost( vtkDataSet *inData , vtkIdType u, vtkIdType v) VTK_OVERRIDE;
- double CalculateDynamicEdgeCost( vtkDataSet *inData , vtkIdType u, vtkIdType v) VTK_OVERRIDE;
+ double CalculateStaticEdgeCost( vtkDataSet *inData , vtkIdType u, vtkIdType v) override;
+ double CalculateDynamicEdgeCost( vtkDataSet *inData , vtkIdType u, vtkIdType v) override;
double PixelSize;
double ImageWeight;
diff --git a/Filters/Modeling/vtkFillHolesFilter.h b/Filters/Modeling/vtkFillHolesFilter.h
index 2ee53710fad4115efc9cf793e587fe40247ec137..8f7e0d04c4666adfe36c291e247fc31a7165b0e5 100644
--- a/Filters/Modeling/vtkFillHolesFilter.h
+++ b/Filters/Modeling/vtkFillHolesFilter.h
@@ -53,7 +53,7 @@ public:
*/
static vtkFillHolesFilter *New();
vtkTypeMacro(vtkFillHolesFilter,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -69,9 +69,9 @@ public:
protected:
vtkFillHolesFilter();
- ~vtkFillHolesFilter() VTK_OVERRIDE;
+ ~vtkFillHolesFilter() override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
double HoleSize;
diff --git a/Filters/Modeling/vtkGeodesicPath.h b/Filters/Modeling/vtkGeodesicPath.h
index c26e5b866cb4d1c40174fdcfe0f3b86d461d47dc..fcddac1828b0d1502e2e92c30aaf835b2d78e9af 100644
--- a/Filters/Modeling/vtkGeodesicPath.h
+++ b/Filters/Modeling/vtkGeodesicPath.h
@@ -37,14 +37,14 @@ public:
* Standard methids for printing and determining type information.
*/
vtkTypeMacro(vtkGeodesicPath,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
protected:
vtkGeodesicPath();
- ~vtkGeodesicPath() VTK_OVERRIDE;
+ ~vtkGeodesicPath() override;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
private:
vtkGeodesicPath(const vtkGeodesicPath&) VTK_DELETE_FUNCTION;
diff --git a/Filters/Modeling/vtkGraphGeodesicPath.h b/Filters/Modeling/vtkGraphGeodesicPath.h
index 90bf7c92eda57c6f95ba2d246685defbc62160b2..da0e80d583c0041c57f3f666b5e1c9ba74b0458d 100644
--- a/Filters/Modeling/vtkGraphGeodesicPath.h
+++ b/Filters/Modeling/vtkGraphGeodesicPath.h
@@ -37,7 +37,7 @@ public:
* Standard methids for printing and determining type information.
*/
vtkTypeMacro(vtkGraphGeodesicPath,vtkGeodesicPath);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -58,7 +58,7 @@ public:
protected:
vtkGraphGeodesicPath();
- ~vtkGraphGeodesicPath() VTK_OVERRIDE;
+ ~vtkGraphGeodesicPath() override;
vtkIdType StartVertex;
vtkIdType EndVertex;
diff --git a/Filters/Modeling/vtkLinearExtrusionFilter.h b/Filters/Modeling/vtkLinearExtrusionFilter.h
index 2d8405d66aca2bbe43bf7aec9adcc5d52a446a3c..93269cdae50e0d54d4113f47b688ee4dc758ec4b 100644
--- a/Filters/Modeling/vtkLinearExtrusionFilter.h
+++ b/Filters/Modeling/vtkLinearExtrusionFilter.h
@@ -64,7 +64,7 @@ class VTKFILTERSMODELING_EXPORT vtkLinearExtrusionFilter : public vtkPolyDataAlg
{
public:
vtkTypeMacro(vtkLinearExtrusionFilter,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Create object with normal extrusion type, capping on, scale factor=1.0,
@@ -123,9 +123,9 @@ public:
protected:
vtkLinearExtrusionFilter();
- ~vtkLinearExtrusionFilter() VTK_OVERRIDE {}
+ ~vtkLinearExtrusionFilter() override {}
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
int ExtrusionType;
int Capping;
double ScaleFactor;
diff --git a/Filters/Modeling/vtkLinearSubdivisionFilter.h b/Filters/Modeling/vtkLinearSubdivisionFilter.h
index 521c70e7a05a24d527bac0976520f5028ff695c9..124fdca736dafbd6c5fde38fdc9cb141498975b9 100644
--- a/Filters/Modeling/vtkLinearSubdivisionFilter.h
+++ b/Filters/Modeling/vtkLinearSubdivisionFilter.h
@@ -52,12 +52,12 @@ public:
protected:
vtkLinearSubdivisionFilter () {}
- ~vtkLinearSubdivisionFilter () VTK_OVERRIDE {}
+ ~vtkLinearSubdivisionFilter () override {}
int GenerateSubdivisionPoints (vtkPolyData *inputDS,
vtkIntArray *edgeData,
vtkPoints *outputPts,
- vtkPointData *outputPD) VTK_OVERRIDE;
+ vtkPointData *outputPD) override;
private:
vtkLinearSubdivisionFilter(const vtkLinearSubdivisionFilter&) VTK_DELETE_FUNCTION;
diff --git a/Filters/Modeling/vtkLoopSubdivisionFilter.h b/Filters/Modeling/vtkLoopSubdivisionFilter.h
index 904b4f339b4a80b23489a213e779937c0fd649d8..4fb1e702c5c2ce1598880a6efb25b58b549b915a 100644
--- a/Filters/Modeling/vtkLoopSubdivisionFilter.h
+++ b/Filters/Modeling/vtkLoopSubdivisionFilter.h
@@ -67,17 +67,17 @@ public:
protected:
vtkLoopSubdivisionFilter () {}
- ~vtkLoopSubdivisionFilter () VTK_OVERRIDE {}
+ ~vtkLoopSubdivisionFilter () override {}
int GenerateSubdivisionPoints (vtkPolyData *inputDS, vtkIntArray *edgeData,
vtkPoints *outputPts,
- vtkPointData *outputPD) VTK_OVERRIDE;
+ vtkPointData *outputPD) override;
int GenerateEvenStencil (vtkIdType p1, vtkPolyData *polys,
vtkIdList *stencilIds, double *weights);
void GenerateOddStencil (vtkIdType p1, vtkIdType p2, vtkPolyData *polys,
vtkIdList *stencilIds, double *weights);
- int RequestUpdateExtent(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestUpdateExtent(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
private:
vtkLoopSubdivisionFilter(const vtkLoopSubdivisionFilter&) VTK_DELETE_FUNCTION;
diff --git a/Filters/Modeling/vtkOutlineFilter.h b/Filters/Modeling/vtkOutlineFilter.h
index 3f78a84af273e25493d8c3b012d4bed52483cdd9..0932c095ac14206c38aeda312a3d6711cce258be 100644
--- a/Filters/Modeling/vtkOutlineFilter.h
+++ b/Filters/Modeling/vtkOutlineFilter.h
@@ -34,7 +34,7 @@ class VTKFILTERSMODELING_EXPORT vtkOutlineFilter : public vtkPolyDataAlgorithm
public:
static vtkOutlineFilter *New();
vtkTypeMacro(vtkOutlineFilter,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -47,12 +47,12 @@ public:
protected:
vtkOutlineFilter();
- ~vtkOutlineFilter() VTK_OVERRIDE;
+ ~vtkOutlineFilter() override;
int GenerateFaces;
vtkOutlineSource *OutlineSource;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
private:
vtkOutlineFilter(const vtkOutlineFilter&) VTK_DELETE_FUNCTION;
diff --git a/Filters/Modeling/vtkPolyDataPointSampler.h b/Filters/Modeling/vtkPolyDataPointSampler.h
index 42004e8538c10903f32e036e698d2bc675b08049..0b7604846333c8a392cb9d7c36511a5d0327fe3d 100644
--- a/Filters/Modeling/vtkPolyDataPointSampler.h
+++ b/Filters/Modeling/vtkPolyDataPointSampler.h
@@ -57,7 +57,7 @@ public:
* Standard macros for type information and printing.
*/
vtkTypeMacro(vtkPolyDataPointSampler,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -114,9 +114,9 @@ public:
protected:
vtkPolyDataPointSampler();
- ~vtkPolyDataPointSampler() VTK_OVERRIDE {}
+ ~vtkPolyDataPointSampler() override {}
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
double Distance;
double Distance2;
diff --git a/Filters/Modeling/vtkProjectedTexture.h b/Filters/Modeling/vtkProjectedTexture.h
index 651689744828405bbf8ec79cc6ee6269c7af54fd..815db3516a57d01795f7284eda316a0be2565375 100644
--- a/Filters/Modeling/vtkProjectedTexture.h
+++ b/Filters/Modeling/vtkProjectedTexture.h
@@ -43,7 +43,7 @@ class VTKFILTERSMODELING_EXPORT vtkProjectedTexture : public vtkDataSetAlgorithm
public:
static vtkProjectedTexture *New();
vtkTypeMacro(vtkProjectedTexture,vtkDataSetAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -130,9 +130,9 @@ public:
protected:
vtkProjectedTexture();
- ~vtkProjectedTexture() VTK_OVERRIDE {}
+ ~vtkProjectedTexture() override {}
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
void ComputeNormal();
int CameraMode;
diff --git a/Filters/Modeling/vtkQuadRotationalExtrusionFilter.h b/Filters/Modeling/vtkQuadRotationalExtrusionFilter.h
index c434661fc9529d8e57baaa1b82362935422160fb..ea0f77dfe9ebd8e7e2790d5c099164e605f2a4a0 100644
--- a/Filters/Modeling/vtkQuadRotationalExtrusionFilter.h
+++ b/Filters/Modeling/vtkQuadRotationalExtrusionFilter.h
@@ -73,7 +73,7 @@ class VTKFILTERSMODELING_EXPORT vtkQuadRotationalExtrusionFilter : public vtkMul
{
public:
vtkTypeMacro(vtkQuadRotationalExtrusionFilter,vtkMultiBlockDataSetAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Create object with capping on, angle of 360 degrees, resolution = 12, and
@@ -152,12 +152,12 @@ class VTKFILTERSMODELING_EXPORT vtkQuadRotationalExtrusionFilter : public vtkMul
protected:
vtkQuadRotationalExtrusionFilter();
- ~vtkQuadRotationalExtrusionFilter() VTK_OVERRIDE {}
+ ~vtkQuadRotationalExtrusionFilter() override {}
- int FillInputPortInformation( int , vtkInformation* ) VTK_OVERRIDE;
+ int FillInputPortInformation( int , vtkInformation* ) override;
int RequestData( vtkInformation*,
vtkInformationVector**,
- vtkInformationVector* ) VTK_OVERRIDE;
+ vtkInformationVector* ) override;
int RotateAroundAxis( double,
vtkIdType,
diff --git a/Filters/Modeling/vtkRibbonFilter.h b/Filters/Modeling/vtkRibbonFilter.h
index a729b8ebb3353b7a35c44c5efc23e9f1cb82c688..3acaf43bdbef2f737314ca4cab7a8deff93a33d7 100644
--- a/Filters/Modeling/vtkRibbonFilter.h
+++ b/Filters/Modeling/vtkRibbonFilter.h
@@ -55,7 +55,7 @@ class VTKFILTERSMODELING_EXPORT vtkRibbonFilter : public vtkPolyDataAlgorithm
{
public:
vtkTypeMacro(vtkRibbonFilter,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct ribbon so that width is 0.1, the width does
@@ -151,9 +151,9 @@ public:
protected:
vtkRibbonFilter();
- ~vtkRibbonFilter() VTK_OVERRIDE;
+ ~vtkRibbonFilter() override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
double Width;
double Angle;
int VaryWidth; //controls whether width varies with scalar data
diff --git a/Filters/Modeling/vtkRotationalExtrusionFilter.h b/Filters/Modeling/vtkRotationalExtrusionFilter.h
index 8b38e046578065b41c10aff2bc969b9233c65967..40ae135af80e51bf218d2584843fabc01b61bbe9 100644
--- a/Filters/Modeling/vtkRotationalExtrusionFilter.h
+++ b/Filters/Modeling/vtkRotationalExtrusionFilter.h
@@ -65,7 +65,7 @@ class VTKFILTERSMODELING_EXPORT vtkRotationalExtrusionFilter : public vtkPolyDat
{
public:
vtkTypeMacro(vtkRotationalExtrusionFilter,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Create object with capping on, angle of 360 degrees, resolution = 12, and
@@ -118,9 +118,9 @@ public:
protected:
vtkRotationalExtrusionFilter();
- ~vtkRotationalExtrusionFilter() VTK_OVERRIDE {}
+ ~vtkRotationalExtrusionFilter() override {}
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
int Resolution;
int Capping;
double Angle;
diff --git a/Filters/Modeling/vtkRuledSurfaceFilter.h b/Filters/Modeling/vtkRuledSurfaceFilter.h
index 6c5289019e30721e13cf9984a241d9c4131c0bb0..8d8fd08e4068123ef79db96db33483828cbdff76 100644
--- a/Filters/Modeling/vtkRuledSurfaceFilter.h
+++ b/Filters/Modeling/vtkRuledSurfaceFilter.h
@@ -68,7 +68,7 @@ class VTKFILTERSMODELING_EXPORT vtkRuledSurfaceFilter : public vtkPolyDataAlgori
{
public:
vtkTypeMacro(vtkRuledSurfaceFilter,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct object with OnRatio=1, Offset=0. DistanceFactor=3.0,
@@ -171,10 +171,10 @@ public:
protected:
vtkRuledSurfaceFilter();
- ~vtkRuledSurfaceFilter() VTK_OVERRIDE;
+ ~vtkRuledSurfaceFilter() override;
// Usual data generation method
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
double DistanceFactor;
int OnRatio;
diff --git a/Filters/Modeling/vtkSectorSource.h b/Filters/Modeling/vtkSectorSource.h
index 0299356757c06e62e1cce8d7819c1246828615ff..13f0572084772ff21a7a1d8802d29d4944f16c97 100644
--- a/Filters/Modeling/vtkSectorSource.h
+++ b/Filters/Modeling/vtkSectorSource.h
@@ -35,7 +35,7 @@ class VTKFILTERSMODELING_EXPORT vtkSectorSource : public vtkPolyDataAlgorithm
public:
static vtkSectorSource *New();
vtkTypeMacro(vtkSectorSource,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -95,9 +95,9 @@ public:
protected:
vtkSectorSource();
- ~vtkSectorSource() VTK_OVERRIDE {}
+ ~vtkSectorSource() override {}
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
double InnerRadius;
double OuterRadius;
double ZCoord;
diff --git a/Filters/Modeling/vtkSelectEnclosedPoints.h b/Filters/Modeling/vtkSelectEnclosedPoints.h
index b8ba1890558338844ed35d7c59d2a6cc02323c1d..fd699d1c77335c96491325417c3e6368a72c1289 100644
--- a/Filters/Modeling/vtkSelectEnclosedPoints.h
+++ b/Filters/Modeling/vtkSelectEnclosedPoints.h
@@ -60,7 +60,7 @@ public:
* Standard methods for type information and printing.
*/
vtkTypeMacro(vtkSelectEnclosedPoints,vtkDataSetAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
@@ -137,7 +137,7 @@ public:
protected:
vtkSelectEnclosedPoints();
- ~vtkSelectEnclosedPoints() VTK_OVERRIDE;
+ ~vtkSelectEnclosedPoints() override;
int CheckSurface;
int InsideOut;
@@ -154,10 +154,10 @@ protected:
double Bounds[6];
double Length;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int, vtkInformation *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int FillInputPortInformation(int, vtkInformation *) override;
- void ReportReferences(vtkGarbageCollector*) VTK_OVERRIDE;
+ void ReportReferences(vtkGarbageCollector*) override;
private:
vtkSelectEnclosedPoints(const vtkSelectEnclosedPoints&) VTK_DELETE_FUNCTION;
diff --git a/Filters/Modeling/vtkSelectPolyData.h b/Filters/Modeling/vtkSelectPolyData.h
index 1125a87e87f5b9c68e62f0deaaea9a55a0830317..c9d5136f13df808df5d6add0e5cded161f84b3a6 100644
--- a/Filters/Modeling/vtkSelectPolyData.h
+++ b/Filters/Modeling/vtkSelectPolyData.h
@@ -100,7 +100,7 @@ public:
static vtkSelectPolyData *New();
vtkTypeMacro(vtkSelectPolyData,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -180,13 +180,13 @@ public:
vtkPolyData *GetSelectionEdges();
// Overload GetMTime() because we depend on Loop
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
protected:
vtkSelectPolyData();
- ~vtkSelectPolyData() VTK_OVERRIDE;
+ ~vtkSelectPolyData() override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
int GenerateSelectionScalars;
int InsideOut;
diff --git a/Filters/Modeling/vtkSpherePuzzle.h b/Filters/Modeling/vtkSpherePuzzle.h
index 48466c1c29c414f58a5b70b670f5821168fd84b9..8ae12f2a3f0dbc05acce12eceae1b2acf3afb209 100644
--- a/Filters/Modeling/vtkSpherePuzzle.h
+++ b/Filters/Modeling/vtkSpherePuzzle.h
@@ -33,7 +33,7 @@ class VTKFILTERSMODELING_EXPORT vtkSpherePuzzle : public vtkPolyDataAlgorithm
{
public:
vtkTypeMacro(vtkSpherePuzzle,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkSpherePuzzle *New();
@@ -76,9 +76,9 @@ public:
protected:
vtkSpherePuzzle();
- ~vtkSpherePuzzle() VTK_OVERRIDE;
+ ~vtkSpherePuzzle() override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
void MarkVertical(int section);
void MarkHorizontal(int section);
diff --git a/Filters/Modeling/vtkSpherePuzzleArrows.h b/Filters/Modeling/vtkSpherePuzzleArrows.h
index 4e933d0b08a97ff61425205b0d2ef6636febb436..c27db977fe01f34e785b2219f9f9afd4e2541050 100644
--- a/Filters/Modeling/vtkSpherePuzzleArrows.h
+++ b/Filters/Modeling/vtkSpherePuzzleArrows.h
@@ -33,7 +33,7 @@ class VTKFILTERSMODELING_EXPORT vtkSpherePuzzleArrows : public vtkPolyDataAlgori
{
public:
vtkTypeMacro(vtkSpherePuzzleArrows,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkSpherePuzzleArrows *New();
@@ -52,9 +52,9 @@ public:
protected:
vtkSpherePuzzleArrows();
- ~vtkSpherePuzzleArrows() VTK_OVERRIDE;
+ ~vtkSpherePuzzleArrows() override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
void AppendArrow(int id1, int id2, vtkPoints *pts, vtkCellArray *polys);
int Permutation[32];
diff --git a/Filters/Modeling/vtkSubdivideTetra.h b/Filters/Modeling/vtkSubdivideTetra.h
index 1336ba1c2c7eb198c88fca9fb6afc67cc54a1efb..3af62d44e5a2773fd638267a6ecbaf52067bb2f4 100644
--- a/Filters/Modeling/vtkSubdivideTetra.h
+++ b/Filters/Modeling/vtkSubdivideTetra.h
@@ -30,14 +30,14 @@ class VTKFILTERSMODELING_EXPORT vtkSubdivideTetra : public vtkUnstructuredGridAl
public:
static vtkSubdivideTetra *New();
vtkTypeMacro(vtkSubdivideTetra,vtkUnstructuredGridAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkSubdivideTetra();
- ~vtkSubdivideTetra() VTK_OVERRIDE {}
+ ~vtkSubdivideTetra() override {}
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
private:
vtkSubdivideTetra(const vtkSubdivideTetra&) VTK_DELETE_FUNCTION;
diff --git a/Filters/Modeling/vtkVolumeOfRevolutionFilter.h b/Filters/Modeling/vtkVolumeOfRevolutionFilter.h
index 4df63dafa1ecf7f53988fda8b8249d04115e7f04..9c3c8bab80bc3579c1a6cb01900e242552d313fd 100644
--- a/Filters/Modeling/vtkVolumeOfRevolutionFilter.h
+++ b/Filters/Modeling/vtkVolumeOfRevolutionFilter.h
@@ -42,7 +42,7 @@ class VTKFILTERSMODELING_EXPORT vtkVolumeOfRevolutionFilter :
{
public:
vtkTypeMacro(vtkVolumeOfRevolutionFilter,vtkUnstructuredGridAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Create object with sweep angle of 360 degrees, resolution = 12,
@@ -96,12 +96,12 @@ public:
protected:
vtkVolumeOfRevolutionFilter();
- ~vtkVolumeOfRevolutionFilter() VTK_OVERRIDE;
+ ~vtkVolumeOfRevolutionFilter() override;
int RequestData(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
- int FillInputPortInformation(int, vtkInformation *) VTK_OVERRIDE;
+ int FillInputPortInformation(int, vtkInformation *) override;
int Resolution;
double SweepAngle;
diff --git a/Filters/OpenTurns/vtkOTDensityMap.h b/Filters/OpenTurns/vtkOTDensityMap.h
index ba9cc02abe5b497ec704decbd1be383afc63ebd1..461c1f00d7a8a4a0ae00cdb7ae958fe1f76ff33e 100644
--- a/Filters/OpenTurns/vtkOTDensityMap.h
+++ b/Filters/OpenTurns/vtkOTDensityMap.h
@@ -44,12 +44,12 @@ class VTKFILTERSOPENTURNS_EXPORT vtkOTDensityMap : public vtkMultiBlockDataSetAl
public:
static vtkOTDensityMap* New();
vtkTypeMacro(vtkOTDensityMap, vtkMultiBlockDataSetAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Check contour values to return actual mtime
*/
- virtual vtkMTimeType GetMTime() VTK_OVERRIDE;
+ virtual vtkMTimeType GetMTime() override;
//@{
/**
@@ -120,11 +120,11 @@ public:
virtual void SetContourApproximationNumberOfPoints(int val);
//@}
- virtual int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ virtual int FillInputPortInformation(int port, vtkInformation* info) override;
virtual int RequestData(vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
/**
* Key to recover density in output metadata
diff --git a/Filters/OpenTurns/vtkOTFilter.h b/Filters/OpenTurns/vtkOTFilter.h
index 5a05048a54747277616cba7cd38c8b3c509fdb6b..96ef5b5c5c24d727ea4ca4e8c6ebcd6dd0eb77c1 100644
--- a/Filters/OpenTurns/vtkOTFilter.h
+++ b/Filters/OpenTurns/vtkOTFilter.h
@@ -47,7 +47,7 @@ class VTKFILTERSOPENTURNS_EXPORT vtkOTFilter : public vtkTableAlgorithm
{
public:
vtkTypeMacro(vtkOTFilter, vtkTableAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkOTFilter();
@@ -56,11 +56,11 @@ protected:
/**
* Set the input of this filter, a vtkTable
*/
- virtual int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ virtual int FillInputPortInformation(int port, vtkInformation* info) override;
virtual int RequestData(vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
/**
* Abstract method to process openturns data
diff --git a/Filters/OpenTurns/vtkOTKernelSmoothing.h b/Filters/OpenTurns/vtkOTKernelSmoothing.h
index 5945b4bc805cd4eb1fdbb7796504c17360a50cf3..dd2a6f808777d049e32b8159e8f68f5bb9b75253 100644
--- a/Filters/OpenTurns/vtkOTKernelSmoothing.h
+++ b/Filters/OpenTurns/vtkOTKernelSmoothing.h
@@ -35,7 +35,7 @@ class VTKFILTERSOPENTURNS_EXPORT vtkOTKernelSmoothing : public vtkOTFilter
public:
static vtkOTKernelSmoothing* New();
vtkTypeMacro(vtkOTKernelSmoothing, vtkOTFilter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -87,7 +87,7 @@ protected:
/**
* Do the actual computation and store it in output
*/
- virtual int Process(OT::Sample* input) VTK_OVERRIDE;
+ virtual int Process(OT::Sample* input) override;
void ComputePDF(OT::Sample* input,
OT::KernelSmoothing* ks,
diff --git a/Filters/OpenTurns/vtkOTScatterPlotMatrix.h b/Filters/OpenTurns/vtkOTScatterPlotMatrix.h
index 17723dffa9e455295caa462a37d63734f145b23f..97b87fd7276ce8102b401cb0d9f0e867975bfcbc 100644
--- a/Filters/OpenTurns/vtkOTScatterPlotMatrix.h
+++ b/Filters/OpenTurns/vtkOTScatterPlotMatrix.h
@@ -38,7 +38,7 @@ class VTKFILTERSOPENTURNS_EXPORT vtkOTScatterPlotMatrix : public vtkScatterPlotM
{
public:
vtkTypeMacro(vtkOTScatterPlotMatrix, vtkScatterPlotMatrix);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Creates a new object.
@@ -62,7 +62,7 @@ public:
protected:
vtkOTScatterPlotMatrix();
- ~vtkOTScatterPlotMatrix() VTK_OVERRIDE;
+ ~vtkOTScatterPlotMatrix() override;
/**
* Add a density map as a supplementary plot,
@@ -73,7 +73,7 @@ protected:
int plotType,
vtkStdString row,
vtkStdString column,
- int plotCorner = 0) VTK_OVERRIDE;
+ int plotCorner = 0) override;
private:
vtkOTScatterPlotMatrix(const vtkOTScatterPlotMatrix&) VTK_DELETE_FUNCTION;
diff --git a/Filters/Parallel/vtkAggregateDataSetFilter.h b/Filters/Parallel/vtkAggregateDataSetFilter.h
index 93aa1d952664117189383ee516cb7e6efd567ae7..2505dfc85d3ae75751e9015e2bd2ee8b08ba816a 100644
--- a/Filters/Parallel/vtkAggregateDataSetFilter.h
+++ b/Filters/Parallel/vtkAggregateDataSetFilter.h
@@ -34,7 +34,7 @@ class VTKFILTERSPARALLEL_EXPORT vtkAggregateDataSetFilter : public vtkPassInputT
public:
static vtkAggregateDataSetFilter* New();
vtkTypeMacro(vtkAggregateDataSetFilter, vtkPassInputTypeAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -53,11 +53,11 @@ public:
protected:
vtkAggregateDataSetFilter();
- ~vtkAggregateDataSetFilter() VTK_OVERRIDE;
+ ~vtkAggregateDataSetFilter() override;
int RequestData(vtkInformation* request, vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
int NumberOfTargetProcesses;
diff --git a/Filters/Parallel/vtkAngularPeriodicFilter.h b/Filters/Parallel/vtkAngularPeriodicFilter.h
index 9ab8f50409ded97e44515ed926c25d353506c9cf..1dda5d96acf9619b8ff2b58d9a50edf486402fe0 100644
--- a/Filters/Parallel/vtkAngularPeriodicFilter.h
+++ b/Filters/Parallel/vtkAngularPeriodicFilter.h
@@ -53,7 +53,7 @@ class VTKFILTERSPARALLEL_EXPORT vtkAngularPeriodicFilter : public vtkPeriodicFil
public:
static vtkAngularPeriodicFilter* New();
vtkTypeMacro(vtkAngularPeriodicFilter, vtkPeriodicFilter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -121,11 +121,11 @@ public:
protected:
vtkAngularPeriodicFilter();
- ~vtkAngularPeriodicFilter() VTK_OVERRIDE;
+ ~vtkAngularPeriodicFilter() override;
int RequestData(vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
/**
* Create a transform copy of the provided data array
@@ -147,7 +147,7 @@ protected:
*/
void SetPeriodNumber(vtkCompositeDataIterator* loc,
vtkCompositeDataSet* output,
- int nbPeriod) VTK_OVERRIDE;
+ int nbPeriod) override;
/**
* Compute periodic pointset, rotating point, using provided angle
@@ -167,7 +167,7 @@ protected:
*/
void CreatePeriodicDataSet(vtkCompositeDataIterator* loc,
vtkCompositeDataSet* output,
- vtkCompositeDataSet* input) VTK_OVERRIDE;
+ vtkCompositeDataSet* input) override;
/**
* Generate a name for a piece in the periodic dataset from the input dataset
diff --git a/Filters/Parallel/vtkCollectGraph.h b/Filters/Parallel/vtkCollectGraph.h
index 2b931fb5323a4fce69cae5529d8ff78a1f269dc6..f3ede76e3c966c006878aa6d9c952634d0d986db 100644
--- a/Filters/Parallel/vtkCollectGraph.h
+++ b/Filters/Parallel/vtkCollectGraph.h
@@ -38,7 +38,7 @@ class VTKFILTERSPARALLEL_EXPORT vtkCollectGraph : public vtkGraphAlgorithm
public:
static vtkCollectGraph *New();
vtkTypeMacro(vtkCollectGraph, vtkGraphAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -89,15 +89,15 @@ public:
protected:
vtkCollectGraph();
- ~vtkCollectGraph() VTK_OVERRIDE;
+ ~vtkCollectGraph() override;
int PassThrough;
int OutputType;
// Data generation method
- int RequestUpdateExtent(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int RequestDataObject(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestUpdateExtent(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int RequestDataObject(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
vtkMultiProcessController *Controller;
vtkSocketController *SocketController;
diff --git a/Filters/Parallel/vtkCollectPolyData.h b/Filters/Parallel/vtkCollectPolyData.h
index 4a4103d6aced295205e538dd7d5e4feaeb75d3b4..ec4a7d64328a8c5bdd40657c2842881a8910928c 100644
--- a/Filters/Parallel/vtkCollectPolyData.h
+++ b/Filters/Parallel/vtkCollectPolyData.h
@@ -34,7 +34,7 @@ class VTKFILTERSPARALLEL_EXPORT vtkCollectPolyData : public vtkPolyDataAlgorithm
public:
static vtkCollectPolyData *New();
vtkTypeMacro(vtkCollectPolyData, vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -66,13 +66,13 @@ public:
protected:
vtkCollectPolyData();
- ~vtkCollectPolyData() VTK_OVERRIDE;
+ ~vtkCollectPolyData() override;
int PassThrough;
// Data generation method
- int RequestUpdateExtent(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestUpdateExtent(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
vtkMultiProcessController *Controller;
vtkSocketController *SocketController;
diff --git a/Filters/Parallel/vtkCollectTable.h b/Filters/Parallel/vtkCollectTable.h
index 2d7f0ab3d2a5c0ccdd5bfd5b3ea96c532d498b8c..cf16e2b38f0fd5466c4de675f18faf5f118522cc 100644
--- a/Filters/Parallel/vtkCollectTable.h
+++ b/Filters/Parallel/vtkCollectTable.h
@@ -38,7 +38,7 @@ class VTKFILTERSPARALLEL_EXPORT vtkCollectTable : public vtkTableAlgorithm
public:
static vtkCollectTable *New();
vtkTypeMacro(vtkCollectTable, vtkTableAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -70,13 +70,13 @@ public:
protected:
vtkCollectTable();
- ~vtkCollectTable() VTK_OVERRIDE;
+ ~vtkCollectTable() override;
int PassThrough;
// Data generation method
- int RequestUpdateExtent(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestUpdateExtent(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
vtkMultiProcessController *Controller;
vtkSocketController *SocketController;
diff --git a/Filters/Parallel/vtkCutMaterial.h b/Filters/Parallel/vtkCutMaterial.h
index 8ebf8ed19dd4dcc297310ef0a331cb18f54a0ad1..029f94ac4fecd96cde15ddd287a046399257ce7f 100644
--- a/Filters/Parallel/vtkCutMaterial.h
+++ b/Filters/Parallel/vtkCutMaterial.h
@@ -33,7 +33,7 @@ class vtkPlane;
class VTKFILTERSPARALLEL_EXPORT vtkCutMaterial : public vtkPolyDataAlgorithm
{
public:
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
vtkTypeMacro(vtkCutMaterial,vtkPolyDataAlgorithm);
static vtkCutMaterial *New();
@@ -82,10 +82,10 @@ public:
protected:
vtkCutMaterial();
- ~vtkCutMaterial() VTK_OVERRIDE;
+ ~vtkCutMaterial() override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE; //generate output data
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override; //generate output data
+ int FillInputPortInformation(int port, vtkInformation *info) override;
void ComputeMaximumPoint(vtkDataSet *input);
void ComputeNormal();
diff --git a/Filters/Parallel/vtkDuplicatePolyData.h b/Filters/Parallel/vtkDuplicatePolyData.h
index c00459f9a7f299c7a81913e89cc099ee1fc66258..6a27744b27c5e8b180f95d282bcf643e1c16fb08 100644
--- a/Filters/Parallel/vtkDuplicatePolyData.h
+++ b/Filters/Parallel/vtkDuplicatePolyData.h
@@ -35,7 +35,7 @@ class VTKFILTERSPARALLEL_EXPORT vtkDuplicatePolyData : public vtkPolyDataAlgorit
public:
static vtkDuplicatePolyData *New();
vtkTypeMacro(vtkDuplicatePolyData, vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -84,11 +84,11 @@ public:
protected:
vtkDuplicatePolyData();
- ~vtkDuplicatePolyData() VTK_OVERRIDE;
+ ~vtkDuplicatePolyData() override;
// Data generation method
- int RequestUpdateExtent(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestUpdateExtent(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
void ClientExecute(vtkPolyData *output);
vtkMultiProcessController *Controller;
diff --git a/Filters/Parallel/vtkExtractCTHPart.h b/Filters/Parallel/vtkExtractCTHPart.h
index fd2e57ce6ce9faf66b158ea6821c463d3bdeb656..7a54f5bb95280fac62150d212fb34e5b78da6031 100644
--- a/Filters/Parallel/vtkExtractCTHPart.h
+++ b/Filters/Parallel/vtkExtractCTHPart.h
@@ -67,7 +67,7 @@ class VTKFILTERSPARALLEL_EXPORT vtkExtractCTHPart : public vtkMultiBlockDataSetA
public:
static vtkExtractCTHPart *New();
vtkTypeMacro(vtkExtractCTHPart,vtkMultiBlockDataSetAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -130,7 +130,7 @@ public:
/**
* Look at clip plane to compute MTime.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
//@{
/**
@@ -143,11 +143,11 @@ public:
protected:
vtkExtractCTHPart();
- ~vtkExtractCTHPart() VTK_OVERRIDE;
+ ~vtkExtractCTHPart() override;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
int RequestData(
- vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
/**
* Compute the bounds over the composite dataset, some sub-dataset
diff --git a/Filters/Parallel/vtkExtractPolyDataPiece.h b/Filters/Parallel/vtkExtractPolyDataPiece.h
index 13e35084a0bdeda7149e1530fe051e74d77541a3..f45df39def65c03bee1a8ed9e4c2f374671ef230 100644
--- a/Filters/Parallel/vtkExtractPolyDataPiece.h
+++ b/Filters/Parallel/vtkExtractPolyDataPiece.h
@@ -32,7 +32,7 @@ class VTKFILTERSPARALLEL_EXPORT vtkExtractPolyDataPiece : public vtkPolyDataAlgo
public:
static vtkExtractPolyDataPiece *New();
vtkTypeMacro(vtkExtractPolyDataPiece, vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -45,11 +45,11 @@ public:
protected:
vtkExtractPolyDataPiece();
- ~vtkExtractPolyDataPiece() VTK_OVERRIDE {}
+ ~vtkExtractPolyDataPiece() override {}
// Usual data generation method
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int RequestUpdateExtent(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int RequestUpdateExtent(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
// A method for labeling which piece the cells belong to.
void ComputeCellTags(vtkIntArray *cellTags, vtkIdList *pointOwnership,
diff --git a/Filters/Parallel/vtkExtractUnstructuredGridPiece.h b/Filters/Parallel/vtkExtractUnstructuredGridPiece.h
index daa52350537657641812b98c9bd33dc91378137a..707b4aa35f6e717c55e1eacb34408fd2527197b5 100644
--- a/Filters/Parallel/vtkExtractUnstructuredGridPiece.h
+++ b/Filters/Parallel/vtkExtractUnstructuredGridPiece.h
@@ -32,7 +32,7 @@ class VTKFILTERSPARALLEL_EXPORT vtkExtractUnstructuredGridPiece : public vtkUnst
public:
static vtkExtractUnstructuredGridPiece *New();
vtkTypeMacro(vtkExtractUnstructuredGridPiece, vtkUnstructuredGridAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -45,12 +45,12 @@ public:
protected:
vtkExtractUnstructuredGridPiece();
- ~vtkExtractUnstructuredGridPiece() VTK_OVERRIDE {}
+ ~vtkExtractUnstructuredGridPiece() override {}
// Usual data generation method
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int RequestUpdateExtent(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int RequestInformation(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int RequestUpdateExtent(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int RequestInformation(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
// A method for labeling which piece the cells belong to.
void ComputeCellTags(vtkIntArray *cellTags, vtkIdList *pointOwnership,
diff --git a/Filters/Parallel/vtkExtractUserDefinedPiece.h b/Filters/Parallel/vtkExtractUserDefinedPiece.h
index 2ed63688f7530e8cbc996ebab4805b75e307236f..41f8e00957a4612e32ea587f0598a4298f8c47f9 100644
--- a/Filters/Parallel/vtkExtractUserDefinedPiece.h
+++ b/Filters/Parallel/vtkExtractUserDefinedPiece.h
@@ -44,7 +44,7 @@ class VTKFILTERSPARALLEL_EXPORT vtkExtractUserDefinedPiece : public vtkExtractUn
public:
vtkTypeMacro(vtkExtractUserDefinedPiece, vtkExtractUnstructuredGridPiece);
static vtkExtractUserDefinedPiece *New();
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
typedef int (*UserDefFunc)(vtkIdType cellID, vtkUnstructuredGrid *grid, void *constantData);
@@ -65,9 +65,9 @@ public:
protected:
vtkExtractUserDefinedPiece();
- ~vtkExtractUserDefinedPiece() VTK_OVERRIDE;
+ ~vtkExtractUserDefinedPiece() override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
void ComputeCellTagsWithFunction(vtkIntArray *tags, vtkIdList *pointOwnership,
vtkUnstructuredGrid *input);
diff --git a/Filters/Parallel/vtkPCellDataToPointData.h b/Filters/Parallel/vtkPCellDataToPointData.h
index 7e56d1986485eea4d7301ecdaa9380ef5383ea9e..d0c9b3bce46dca9671e3741cb0022e9b2914d98b 100644
--- a/Filters/Parallel/vtkPCellDataToPointData.h
+++ b/Filters/Parallel/vtkPCellDataToPointData.h
@@ -33,7 +33,7 @@ class VTKFILTERSPARALLEL_EXPORT vtkPCellDataToPointData : public vtkCellDataToPo
{
public:
vtkTypeMacro(vtkPCellDataToPointData,vtkCellDataToPointData);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkPCellDataToPointData *New();
@@ -49,15 +49,15 @@ public:
protected:
vtkPCellDataToPointData();
- ~vtkPCellDataToPointData() VTK_OVERRIDE {}
+ ~vtkPCellDataToPointData() override {}
// Usual data generation method
int RequestData(vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
int RequestUpdateExtent(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
int PieceInvariant;
private:
diff --git a/Filters/Parallel/vtkPExtractArraysOverTime.h b/Filters/Parallel/vtkPExtractArraysOverTime.h
index 8da005443deec4746776099fd56d797eae5bb937..b7268255504454a43b7cb579b800320b546e03fe 100644
--- a/Filters/Parallel/vtkPExtractArraysOverTime.h
+++ b/Filters/Parallel/vtkPExtractArraysOverTime.h
@@ -46,7 +46,7 @@ class VTKFILTERSPARALLEL_EXPORT vtkPExtractArraysOverTime : public vtkExtractArr
public:
static vtkPExtractArraysOverTime *New();
vtkTypeMacro(vtkPExtractArraysOverTime,vtkExtractArraysOverTime);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -63,11 +63,11 @@ public:
protected:
vtkPExtractArraysOverTime();
- ~vtkPExtractArraysOverTime() VTK_OVERRIDE;
+ ~vtkPExtractArraysOverTime() override;
void PostExecute(vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
void AddRemoteData(vtkMultiBlockDataSet* routput,
vtkMultiBlockDataSet* output);
void MergeTables(vtkTable* routput, vtkTable* output);
diff --git a/Filters/Parallel/vtkPKdTree.h b/Filters/Parallel/vtkPKdTree.h
index 45306305c6fd0306c40b7974686a8c9afa80ef2c..eba8ce30f04ca5db1ea11a60b2310dcddf2679da 100644
--- a/Filters/Parallel/vtkPKdTree.h
+++ b/Filters/Parallel/vtkPKdTree.h
@@ -58,8 +58,8 @@ public:
vtkTypeMacro(vtkPKdTree, vtkKdTree);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
- void PrintTiming(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
+ void PrintTiming(ostream& os, vtkIndent indent) override;
void PrintTables(ostream& os, vtkIndent indent);
static vtkPKdTree *New();
@@ -70,7 +70,7 @@ public:
* tree. It must be called by all processes in the parallel
* application, or it will hang.
*/
- void BuildLocator() VTK_OVERRIDE;
+ void BuildLocator() override;
/**
* Get the total number of cells distributed across the data
@@ -317,7 +317,7 @@ public:
protected:
vtkPKdTree();
- ~vtkPKdTree() VTK_OVERRIDE;
+ ~vtkPKdTree() override;
void SingleProcessBuildLocator();
int MultiProcessBuildLocator(double *bounds);
diff --git a/Filters/Parallel/vtkPLinearExtrusionFilter.h b/Filters/Parallel/vtkPLinearExtrusionFilter.h
index 5ebb215ae47719e63a8cedc7b4be2181eaedce09..27486d7d0452db0f2d766110feb424c04e8e5d8d 100644
--- a/Filters/Parallel/vtkPLinearExtrusionFilter.h
+++ b/Filters/Parallel/vtkPLinearExtrusionFilter.h
@@ -32,7 +32,7 @@ class VTKFILTERSPARALLEL_EXPORT vtkPLinearExtrusionFilter : public vtkLinearExtr
{
public:
vtkTypeMacro(vtkPLinearExtrusionFilter,vtkLinearExtrusionFilter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Create an object with PieceInvariant off.
@@ -51,10 +51,10 @@ public:
protected:
vtkPLinearExtrusionFilter();
- ~vtkPLinearExtrusionFilter() VTK_OVERRIDE {}
+ ~vtkPLinearExtrusionFilter() override {}
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int RequestUpdateExtent(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int RequestUpdateExtent(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
int PieceInvariant;
private:
diff --git a/Filters/Parallel/vtkPMaskPoints.h b/Filters/Parallel/vtkPMaskPoints.h
index 73d2ddd6a8ac23fecc4975182aa005b0b0e4322d..11e9d52dbba798c467aea86eac98e241813c6e3b 100644
--- a/Filters/Parallel/vtkPMaskPoints.h
+++ b/Filters/Parallel/vtkPMaskPoints.h
@@ -34,7 +34,7 @@ class VTKFILTERSPARALLEL_EXPORT vtkPMaskPoints : public vtkMaskPoints
public:
static vtkPMaskPoints *New();
vtkTypeMacro(vtkPMaskPoints,vtkMaskPoints);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -46,13 +46,13 @@ public:
protected:
vtkPMaskPoints();
- ~vtkPMaskPoints() VTK_OVERRIDE;
+ ~vtkPMaskPoints() override;
- void InternalScatter(unsigned long*, unsigned long *, int, int) VTK_OVERRIDE;
- void InternalGather(unsigned long*, unsigned long*, int, int) VTK_OVERRIDE;
- int InternalGetNumberOfProcesses() VTK_OVERRIDE;
- int InternalGetLocalProcessId() VTK_OVERRIDE;
- void InternalBarrier() VTK_OVERRIDE;
+ void InternalScatter(unsigned long*, unsigned long *, int, int) override;
+ void InternalGather(unsigned long*, unsigned long*, int, int) override;
+ int InternalGetNumberOfProcesses() override;
+ int InternalGetLocalProcessId() override;
+ void InternalBarrier() override;
vtkMultiProcessController* Controller;
private:
diff --git a/Filters/Parallel/vtkPOutlineCornerFilter.h b/Filters/Parallel/vtkPOutlineCornerFilter.h
index e09bace0311273453e37abf5bfbc5642a3dc1c91..9b6452f89300cfae4419cf52c8ef277ec2a80c69 100644
--- a/Filters/Parallel/vtkPOutlineCornerFilter.h
+++ b/Filters/Parallel/vtkPOutlineCornerFilter.h
@@ -36,7 +36,7 @@ class VTKFILTERSPARALLEL_EXPORT vtkPOutlineCornerFilter : public vtkPolyDataAlgo
{
public:
vtkTypeMacro(vtkPOutlineCornerFilter,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct outline corner filter with default corner factor = 0.2
@@ -66,12 +66,12 @@ public:
protected:
vtkPOutlineCornerFilter();
- ~vtkPOutlineCornerFilter() VTK_OVERRIDE;
+ ~vtkPOutlineCornerFilter() override;
vtkMultiProcessController* Controller;
vtkOutlineCornerSource *OutlineCornerSource;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
double CornerFactor;
private:
diff --git a/Filters/Parallel/vtkPOutlineFilter.h b/Filters/Parallel/vtkPOutlineFilter.h
index 81915228102b61ef04ffb1fd67007fa4c1c022f7..6a0040ec11c945160cd3a58d24d6959b00cd2ecb 100644
--- a/Filters/Parallel/vtkPOutlineFilter.h
+++ b/Filters/Parallel/vtkPOutlineFilter.h
@@ -34,7 +34,7 @@ class VTKFILTERSPARALLEL_EXPORT vtkPOutlineFilter : public vtkPolyDataAlgorithm
public:
static vtkPOutlineFilter *New();
vtkTypeMacro(vtkPOutlineFilter,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -46,12 +46,12 @@ public:
protected:
vtkPOutlineFilter();
- ~vtkPOutlineFilter() VTK_OVERRIDE;
+ ~vtkPOutlineFilter() override;
vtkMultiProcessController* Controller;
vtkOutlineSource *OutlineSource;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
private:
vtkPOutlineFilter(const vtkPOutlineFilter&) VTK_DELETE_FUNCTION;
diff --git a/Filters/Parallel/vtkPOutlineFilterInternals.cxx b/Filters/Parallel/vtkPOutlineFilterInternals.cxx
index e06a534ef28e474e512b2ea94e4842492e2af3df..e4ad89e14f22b26362a935b4b7482d34642d5783 100644
--- a/Filters/Parallel/vtkPOutlineFilterInternals.cxx
+++ b/Filters/Parallel/vtkPOutlineFilterInternals.cxx
@@ -36,7 +36,7 @@ class AddBoundsListOperator : public vtkCommunicator::Operation
{
// Description:
// Performs a "B.AddBounds(A)" operation.
- void Function(const void *A, void *B, vtkIdType length, int datatype) VTK_OVERRIDE
+ void Function(const void *A, void *B, vtkIdType length, int datatype) override
{
(void)datatype;
assert((datatype == VTK_DOUBLE) && (length%6==0));
@@ -55,7 +55,7 @@ class AddBoundsListOperator : public vtkCommunicator::Operation
// Description:
// Sets Commutative to true for this operation
- int Commutative() VTK_OVERRIDE { return 1; }
+ int Commutative() override { return 1; }
};
// ----------------------------------------------------------------------------
diff --git a/Filters/Parallel/vtkPPolyDataNormals.h b/Filters/Parallel/vtkPPolyDataNormals.h
index a3ceaffc51f347b6e2af06b248ca07a50df4a731..a47b23371f17fe610beb29d0e78322fa67ec68d7 100644
--- a/Filters/Parallel/vtkPPolyDataNormals.h
+++ b/Filters/Parallel/vtkPPolyDataNormals.h
@@ -28,7 +28,7 @@ class VTKFILTERSPARALLEL_EXPORT vtkPPolyDataNormals : public vtkPolyDataNormals
{
public:
vtkTypeMacro(vtkPPolyDataNormals,vtkPolyDataNormals);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkPPolyDataNormals *New();
@@ -44,11 +44,11 @@ public:
protected:
vtkPPolyDataNormals();
- ~vtkPPolyDataNormals() VTK_OVERRIDE {}
+ ~vtkPPolyDataNormals() override {}
// Usual data generation method
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int RequestUpdateExtent(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int RequestUpdateExtent(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
int PieceInvariant;
private:
diff --git a/Filters/Parallel/vtkPProbeFilter.h b/Filters/Parallel/vtkPProbeFilter.h
index ca49878e779e969ab3981f811f6785a7e6ff933f..46a30e77a4cd4facba1457dd3f2fe1e2c3cec396 100644
--- a/Filters/Parallel/vtkPProbeFilter.h
+++ b/Filters/Parallel/vtkPProbeFilter.h
@@ -33,7 +33,7 @@ class VTKFILTERSPARALLEL_EXPORT vtkPProbeFilter : public vtkCompositeDataProbeFi
{
public:
vtkTypeMacro(vtkPProbeFilter,vtkCompositeDataProbeFilter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkPProbeFilter *New();
@@ -47,7 +47,7 @@ public:
protected:
vtkPProbeFilter();
- ~vtkPProbeFilter() VTK_OVERRIDE;
+ ~vtkPProbeFilter() override;
enum
{
@@ -55,9 +55,9 @@ protected:
};
// Usual data generation method
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int RequestUpdateExtent(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int RequestUpdateExtent(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
vtkMultiProcessController* Controller;
diff --git a/Filters/Parallel/vtkPProjectSphereFilter.h b/Filters/Parallel/vtkPProjectSphereFilter.h
index 809660ee5810ca708572c903613b7c388770ee8d..5d97ab179f4edf471d5d4fcc878126ff54ce1466 100644
--- a/Filters/Parallel/vtkPProjectSphereFilter.h
+++ b/Filters/Parallel/vtkPProjectSphereFilter.h
@@ -31,26 +31,26 @@ class VTKFILTERSPARALLEL_EXPORT vtkPProjectSphereFilter :
{
public:
vtkTypeMacro(vtkPProjectSphereFilter, vtkProjectSphereFilter);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
static vtkPProjectSphereFilter *New();
protected:
vtkPProjectSphereFilter();
- ~vtkPProjectSphereFilter() VTK_OVERRIDE;
+ ~vtkPProjectSphereFilter() override;
/**
* Parallel part of the algorithm to figure out the closest point
* to the centerline (i.e. line connecting -90 latitude to 90 latitude)
* if we don't build cells using points at the poles.
*/
- void ComputePointsClosestToCenterLine(double, vtkIdList*) VTK_OVERRIDE;
+ void ComputePointsClosestToCenterLine(double, vtkIdList*) override;
/**
* If TranslateZ is true then this is the method that computes
* the amount to translate.
*/
- double GetZTranslation(vtkPointSet* input) VTK_OVERRIDE;
+ double GetZTranslation(vtkPointSet* input) override;
private:
vtkPProjectSphereFilter(const vtkPProjectSphereFilter &) VTK_DELETE_FUNCTION;
diff --git a/Filters/Parallel/vtkPReflectionFilter.h b/Filters/Parallel/vtkPReflectionFilter.h
index 964e1ca26ed69cba055e4b616876f468982fb8eb..0c51da8fd03abeda3c347b4c54f5e92f0e206ae8 100644
--- a/Filters/Parallel/vtkPReflectionFilter.h
+++ b/Filters/Parallel/vtkPReflectionFilter.h
@@ -33,7 +33,7 @@ class VTKFILTERSPARALLEL_EXPORT vtkPReflectionFilter : public vtkReflectionFilte
public:
static vtkPReflectionFilter* New();
vtkTypeMacro(vtkPReflectionFilter, vtkReflectionFilter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -45,12 +45,12 @@ public:
protected:
vtkPReflectionFilter();
- ~vtkPReflectionFilter() VTK_OVERRIDE;
+ ~vtkPReflectionFilter() override;
/**
* Internal method to compute bounds.
*/
- int ComputeBounds(vtkDataObject* input, double bounds[6]) VTK_OVERRIDE;
+ int ComputeBounds(vtkDataObject* input, double bounds[6]) override;
vtkMultiProcessController* Controller;
private:
diff --git a/Filters/Parallel/vtkPResampleFilter.h b/Filters/Parallel/vtkPResampleFilter.h
index cd141992de22a6ab7ec1df4254ce35fca88ed10c..75a9111e15233c38a661c7e26b5cefd9eb2f9fff 100644
--- a/Filters/Parallel/vtkPResampleFilter.h
+++ b/Filters/Parallel/vtkPResampleFilter.h
@@ -30,7 +30,7 @@ class VTKFILTERSPARALLEL_EXPORT vtkPResampleFilter : public vtkImageAlgorithm
{
public:
vtkTypeMacro(vtkPResampleFilter,vtkImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkPResampleFilter *New();
@@ -71,13 +71,13 @@ public:
protected:
vtkPResampleFilter();
- ~vtkPResampleFilter() VTK_OVERRIDE;
+ ~vtkPResampleFilter() override;
// Usual data generation method
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int RequestUpdateExtent(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int RequestInformation(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int RequestUpdateExtent(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int RequestInformation(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
double* CalculateBounds(vtkDataSet* input);
diff --git a/Filters/Parallel/vtkPSphereSource.h b/Filters/Parallel/vtkPSphereSource.h
index b0a296e704c224ed79a38d3ce1199af5f17dd704..7d70f8681fc3acbff03e30d2c9c9a9ebbb7b1d07 100644
--- a/Filters/Parallel/vtkPSphereSource.h
+++ b/Filters/Parallel/vtkPSphereSource.h
@@ -34,7 +34,7 @@ public:
* and Theta directions. Theta ranges from (0,360) and phi (0,180) degrees.
*/
static vtkPSphereSource *New();
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
@@ -44,9 +44,9 @@ public:
protected:
vtkPSphereSource() {}
- ~vtkPSphereSource() VTK_OVERRIDE {}
+ ~vtkPSphereSource() override {}
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
private:
vtkPSphereSource(const vtkPSphereSource&) VTK_DELETE_FUNCTION;
void operator=(const vtkPSphereSource&) VTK_DELETE_FUNCTION;
diff --git a/Filters/Parallel/vtkPYoungsMaterialInterface.h b/Filters/Parallel/vtkPYoungsMaterialInterface.h
index 7285f744a0904ce6379b157bb3e81dbf4bb0deaf..80b6de25a0103d185ff51f6c8c216f6014225df5 100644
--- a/Filters/Parallel/vtkPYoungsMaterialInterface.h
+++ b/Filters/Parallel/vtkPYoungsMaterialInterface.h
@@ -43,12 +43,12 @@ class VTKFILTERSPARALLEL_EXPORT vtkPYoungsMaterialInterface : public vtkYoungsMa
public:
static vtkPYoungsMaterialInterface* New();
vtkTypeMacro(vtkPYoungsMaterialInterface,vtkYoungsMaterialInterface);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Parallel implementation of the material aggregation.
*/
- void Aggregate ( int, int* ) VTK_OVERRIDE;
+ void Aggregate ( int, int* ) override;
//@{
/**
@@ -61,7 +61,7 @@ public:
protected:
vtkPYoungsMaterialInterface ();
- ~vtkPYoungsMaterialInterface () VTK_OVERRIDE;
+ ~vtkPYoungsMaterialInterface () override;
vtkMultiProcessController* Controller;
diff --git a/Filters/Parallel/vtkPassThroughFilter.h b/Filters/Parallel/vtkPassThroughFilter.h
index 58122107680b1a227fd1ff261779d297a7a68312..c0dde30f5ed4a300344b414154c71f98f90b9055 100644
--- a/Filters/Parallel/vtkPassThroughFilter.h
+++ b/Filters/Parallel/vtkPassThroughFilter.h
@@ -33,7 +33,7 @@ class VTKFILTERSPARALLEL_EXPORT vtkPassThroughFilter : public vtkDataSetAlgorith
{
public:
vtkTypeMacro(vtkPassThroughFilter,vtkDataSetAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Create a new vtkPassThroughFilter.
@@ -44,9 +44,9 @@ public:
protected:
vtkPassThroughFilter() {}
- ~vtkPassThroughFilter() VTK_OVERRIDE {}
+ ~vtkPassThroughFilter() override {}
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
private:
vtkPassThroughFilter(const vtkPassThroughFilter&) VTK_DELETE_FUNCTION;
diff --git a/Filters/Parallel/vtkPeriodicFilter.h b/Filters/Parallel/vtkPeriodicFilter.h
index da929382dd0b56810c1bf4243618788110342caa..001b9a9ccc124e2ac5c2dc32d6736315f74fd970 100644
--- a/Filters/Parallel/vtkPeriodicFilter.h
+++ b/Filters/Parallel/vtkPeriodicFilter.h
@@ -53,7 +53,7 @@ class VTKFILTERSPARALLEL_EXPORT vtkPeriodicFilter : public vtkMultiBlockDataSetA
{
public:
vtkTypeMacro(vtkPeriodicFilter, vtkMultiBlockDataSetAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -102,14 +102,14 @@ public:
protected:
vtkPeriodicFilter();
- ~vtkPeriodicFilter() VTK_OVERRIDE;
+ ~vtkPeriodicFilter() override;
// see algorithm for more info
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
int RequestData(vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
/**
* Create a periodic data, leaf of the tree
diff --git a/Filters/Parallel/vtkPieceRequestFilter.h b/Filters/Parallel/vtkPieceRequestFilter.h
index 4fa9389f756518561bc75e9191457cdebdb5c351..05fffe77d88d11df877c1eb203cb13ec18e66130 100644
--- a/Filters/Parallel/vtkPieceRequestFilter.h
+++ b/Filters/Parallel/vtkPieceRequestFilter.h
@@ -33,7 +33,7 @@ class VTKFILTERSPARALLEL_EXPORT vtkPieceRequestFilter : public vtkAlgorithm
public:
static vtkPieceRequestFilter *New();
vtkTypeMacro(vtkPieceRequestFilter,vtkAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -72,11 +72,11 @@ public:
*/
int ProcessRequest(vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
protected:
vtkPieceRequestFilter();
- ~vtkPieceRequestFilter() VTK_OVERRIDE {}
+ ~vtkPieceRequestFilter() override {}
virtual int RequestDataObject(vtkInformation* request,
vtkInformationVector** inputVector,
@@ -90,8 +90,8 @@ protected:
vtkInformationVector**,
vtkInformationVector*);
- int FillOutputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillOutputPortInformation(int port, vtkInformation* info) override;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
int NumberOfPieces;
int Piece;
diff --git a/Filters/Parallel/vtkPieceScalars.h b/Filters/Parallel/vtkPieceScalars.h
index da41d2fd6c17eed18266e5191487c2c9e34561a5..5af4ae74c186b491b9397cc043c63903a49559c1 100644
--- a/Filters/Parallel/vtkPieceScalars.h
+++ b/Filters/Parallel/vtkPieceScalars.h
@@ -40,7 +40,7 @@ public:
static vtkPieceScalars *New();
vtkTypeMacro(vtkPieceScalars,vtkDataSetAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Option to centerate cell scalars of points scalars. Default is point scalars.
@@ -58,10 +58,10 @@ public:
protected:
vtkPieceScalars();
- ~vtkPieceScalars() VTK_OVERRIDE;
+ ~vtkPieceScalars() override;
// Append the pieces.
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
vtkIntArray *MakePieceScalars(int piece, vtkIdType numScalars);
vtkFloatArray *MakeRandomScalars(int piece, vtkIdType numScalars);
diff --git a/Filters/Parallel/vtkPipelineSize.h b/Filters/Parallel/vtkPipelineSize.h
index 212f4423f61f014f42ae5012b94b3da3d2e0c082..5442755a3c08637609cbd77149fe4329a572dc4c 100644
--- a/Filters/Parallel/vtkPipelineSize.h
+++ b/Filters/Parallel/vtkPipelineSize.h
@@ -30,7 +30,7 @@ class VTKFILTERSPARALLEL_EXPORT vtkPipelineSize : public vtkObject
public:
static vtkPipelineSize* New();
vtkTypeMacro(vtkPipelineSize,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Compute an estimate of how much memory a pipline will require in
diff --git a/Filters/Parallel/vtkProcessIdScalars.h b/Filters/Parallel/vtkProcessIdScalars.h
index 79d696ececf1812f84102521aa7b14ce09cfc358..5761201a21d0a81635af16e6f5dc687914e79476 100644
--- a/Filters/Parallel/vtkProcessIdScalars.h
+++ b/Filters/Parallel/vtkProcessIdScalars.h
@@ -41,7 +41,7 @@ public:
static vtkProcessIdScalars *New();
vtkTypeMacro(vtkProcessIdScalars,vtkDataSetAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Option to centerate cell scalars of points scalars. Default is point
@@ -71,11 +71,11 @@ public:
protected:
vtkProcessIdScalars();
- ~vtkProcessIdScalars() VTK_OVERRIDE;
+ ~vtkProcessIdScalars() override;
// Append the pieces.
int RequestData(
- vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
vtkIntArray *MakeProcessIdScalars(int piece, vtkIdType numScalars);
vtkFloatArray *MakeRandomScalars(int piece, vtkIdType numScalars);
diff --git a/Filters/Parallel/vtkRectilinearGridOutlineFilter.h b/Filters/Parallel/vtkRectilinearGridOutlineFilter.h
index 3573ec0e4461f014381b70d2c73ca8d9b964b097..121af627c8c5c72824fbf12bebed80cad2e3eaeb 100644
--- a/Filters/Parallel/vtkRectilinearGridOutlineFilter.h
+++ b/Filters/Parallel/vtkRectilinearGridOutlineFilter.h
@@ -33,14 +33,14 @@ class VTKFILTERSPARALLEL_EXPORT vtkRectilinearGridOutlineFilter : public vtkPoly
public:
static vtkRectilinearGridOutlineFilter *New();
vtkTypeMacro(vtkRectilinearGridOutlineFilter,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkRectilinearGridOutlineFilter() {}
- ~vtkRectilinearGridOutlineFilter() VTK_OVERRIDE {}
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int RequestInformation(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ ~vtkRectilinearGridOutlineFilter() override {}
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int RequestInformation(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
private:
vtkRectilinearGridOutlineFilter(const vtkRectilinearGridOutlineFilter&) VTK_DELETE_FUNCTION;
diff --git a/Filters/Parallel/vtkRemoveGhosts.h b/Filters/Parallel/vtkRemoveGhosts.h
index 921e365e6959ee2b0e908a837181a8d02d9b8b62..aad54b3661c665242667230fd1af55bef8369a73 100644
--- a/Filters/Parallel/vtkRemoveGhosts.h
+++ b/Filters/Parallel/vtkRemoveGhosts.h
@@ -35,22 +35,22 @@ class VTKFILTERSPARALLEL_EXPORT vtkRemoveGhosts : public vtkPassInputTypeAlgorit
{
public:
vtkTypeMacro(vtkRemoveGhosts, vtkPassInputTypeAlgorithm);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
static vtkRemoveGhosts *New();
protected:
vtkRemoveGhosts();
- ~vtkRemoveGhosts() VTK_OVERRIDE;
+ ~vtkRemoveGhosts() override;
int RequestUpdateExtent(vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
int RequestData(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
// see algorithm for more info
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
private:
vtkRemoveGhosts(const vtkRemoveGhosts &) VTK_DELETE_FUNCTION;
diff --git a/Filters/Parallel/vtkTransmitPolyDataPiece.h b/Filters/Parallel/vtkTransmitPolyDataPiece.h
index 616fa451ca01b3277fc8fac3ec740c212f7b71f5..e97417c280b0699f38bd2a2926a50f1a96a7ed6b 100644
--- a/Filters/Parallel/vtkTransmitPolyDataPiece.h
+++ b/Filters/Parallel/vtkTransmitPolyDataPiece.h
@@ -36,7 +36,7 @@ class VTKFILTERSPARALLEL_EXPORT vtkTransmitPolyDataPiece : public vtkPolyDataAlg
public:
static vtkTransmitPolyDataPiece *New();
vtkTypeMacro(vtkTransmitPolyDataPiece, vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -58,10 +58,10 @@ public:
protected:
vtkTransmitPolyDataPiece();
- ~vtkTransmitPolyDataPiece() VTK_OVERRIDE;
+ ~vtkTransmitPolyDataPiece() override;
// Data generation method
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
void RootExecute(vtkPolyData *input, vtkPolyData *output, vtkInformation *outInfo);
void SatelliteExecute(int procId, vtkPolyData *output, vtkInformation *outInfo);
diff --git a/Filters/Parallel/vtkTransmitRectilinearGridPiece.h b/Filters/Parallel/vtkTransmitRectilinearGridPiece.h
index d417799048f3a069232b2d8e5610107e4ad1115b..30c84357fbeb8d06eb208782098bb885407a27fe 100644
--- a/Filters/Parallel/vtkTransmitRectilinearGridPiece.h
+++ b/Filters/Parallel/vtkTransmitRectilinearGridPiece.h
@@ -39,11 +39,11 @@ class VTKFILTERSPARALLEL_EXPORT vtkTransmitRectilinearGridPiece : public vtkTran
public:
static vtkTransmitRectilinearGridPiece *New();
vtkTypeMacro(vtkTransmitRectilinearGridPiece, vtkTransmitStructuredDataPiece);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkTransmitRectilinearGridPiece();
- ~vtkTransmitRectilinearGridPiece() VTK_OVERRIDE;
+ ~vtkTransmitRectilinearGridPiece() override;
private:
vtkTransmitRectilinearGridPiece(const vtkTransmitRectilinearGridPiece&) VTK_DELETE_FUNCTION;
diff --git a/Filters/Parallel/vtkTransmitStructuredDataPiece.h b/Filters/Parallel/vtkTransmitStructuredDataPiece.h
index fed11570bccc492ef3f63288bbe0c4091b23da34..c83e84edbb29380dd3411139cbf1ef9b5c173e47 100644
--- a/Filters/Parallel/vtkTransmitStructuredDataPiece.h
+++ b/Filters/Parallel/vtkTransmitStructuredDataPiece.h
@@ -36,7 +36,7 @@ class VTKFILTERSPARALLEL_EXPORT vtkTransmitStructuredDataPiece : public vtkDataS
public:
static vtkTransmitStructuredDataPiece *New();
vtkTypeMacro(vtkTransmitStructuredDataPiece, vtkDataSetAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -58,16 +58,16 @@ public:
protected:
vtkTransmitStructuredDataPiece();
- ~vtkTransmitStructuredDataPiece() VTK_OVERRIDE;
+ ~vtkTransmitStructuredDataPiece() override;
// Data generation method
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
void RootExecute(vtkDataSet *input, vtkDataSet *output,
vtkInformation *outInfo);
void SatelliteExecute(int procId, vtkDataSet *output,
vtkInformation *outInfo);
- int RequestInformation(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int RequestUpdateExtent(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestInformation(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int RequestUpdateExtent(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
int CreateGhostCells;
vtkMultiProcessController *Controller;
diff --git a/Filters/Parallel/vtkTransmitStructuredGridPiece.h b/Filters/Parallel/vtkTransmitStructuredGridPiece.h
index fadd15c6d3f117b737950d734a21ee0aecd39af4..ba4d4225941fe1b9fa87794d1fd52948e107037a 100644
--- a/Filters/Parallel/vtkTransmitStructuredGridPiece.h
+++ b/Filters/Parallel/vtkTransmitStructuredGridPiece.h
@@ -39,11 +39,11 @@ class VTKFILTERSPARALLEL_EXPORT vtkTransmitStructuredGridPiece : public vtkTrans
public:
static vtkTransmitStructuredGridPiece *New();
vtkTypeMacro(vtkTransmitStructuredGridPiece, vtkTransmitStructuredDataPiece);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkTransmitStructuredGridPiece();
- ~vtkTransmitStructuredGridPiece() VTK_OVERRIDE;
+ ~vtkTransmitStructuredGridPiece() override;
private:
vtkTransmitStructuredGridPiece(const vtkTransmitStructuredGridPiece&) VTK_DELETE_FUNCTION;
diff --git a/Filters/Parallel/vtkTransmitUnstructuredGridPiece.h b/Filters/Parallel/vtkTransmitUnstructuredGridPiece.h
index d02a3c1fd62a7a0ecda96079bad18271712d5867..10f8aefa177b2cbb5acfb09ea42719a01022af72 100644
--- a/Filters/Parallel/vtkTransmitUnstructuredGridPiece.h
+++ b/Filters/Parallel/vtkTransmitUnstructuredGridPiece.h
@@ -36,7 +36,7 @@ class VTKFILTERSPARALLEL_EXPORT vtkTransmitUnstructuredGridPiece : public vtkUns
public:
static vtkTransmitUnstructuredGridPiece *New();
vtkTypeMacro(vtkTransmitUnstructuredGridPiece, vtkUnstructuredGridAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -58,10 +58,10 @@ public:
protected:
vtkTransmitUnstructuredGridPiece();
- ~vtkTransmitUnstructuredGridPiece() VTK_OVERRIDE;
+ ~vtkTransmitUnstructuredGridPiece() override;
// Data generation method
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
void RootExecute(vtkUnstructuredGrid *input, vtkUnstructuredGrid *output,
vtkInformation *outInfo);
void SatelliteExecute(int procId, vtkUnstructuredGrid *output,
diff --git a/Filters/ParallelDIY2/vtkPResampleToImage.h b/Filters/ParallelDIY2/vtkPResampleToImage.h
index 2a53849167cd9d3caed32d7950ebd9e67a1b9e81..31c8dd5a64f548d0772e6ad111550518995f73ac 100644
--- a/Filters/ParallelDIY2/vtkPResampleToImage.h
+++ b/Filters/ParallelDIY2/vtkPResampleToImage.h
@@ -36,7 +36,7 @@ class VTKFILTERSPARALLELDIY2_EXPORT vtkPResampleToImage : public vtkResampleToIm
{
public:
vtkTypeMacro(vtkPResampleToImage, vtkResampleToImage);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkPResampleToImage *New();
@@ -54,7 +54,7 @@ protected:
~vtkPResampleToImage();
virtual int RequestData(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
vtkMultiProcessController *Controller;
diff --git a/Filters/ParallelDIY2/vtkPResampleWithDataSet.cxx b/Filters/ParallelDIY2/vtkPResampleWithDataSet.cxx
index cad96226c638b2889a20eb1b02173909091e875b..d628deb78acd4014e0b820457d9664837061bdc5 100644
--- a/Filters/ParallelDIY2/vtkPResampleWithDataSet.cxx
+++ b/Filters/ParallelDIY2/vtkPResampleWithDataSet.cxx
@@ -153,7 +153,7 @@ public:
class RegularPartition : public Partition
{
public:
- void CreatePartition(const std::vector<vtkDataSet*> &blocks) VTK_OVERRIDE
+ void CreatePartition(const std::vector<vtkDataSet*> &blocks) override
{
// compute the bounds of the composite dataset
size_t totalNumberOfPoints = 0;
@@ -260,7 +260,7 @@ public:
}
}
- void FindPointsInBounds(const double bounds[6], std::vector<Point> &points) const VTK_OVERRIDE
+ void FindPointsInBounds(const double bounds[6], std::vector<Point> &points) const override
{
if (this->Nodes.empty())
{
@@ -352,7 +352,7 @@ private:
class BalancedPartition : public Partition
{
public:
- void CreatePartition(const std::vector<vtkDataSet*> &blocks) VTK_OVERRIDE
+ void CreatePartition(const std::vector<vtkDataSet*> &blocks) override
{
// count total number of points
vtkIdType totalNumberOfPoints = 0;
@@ -400,7 +400,7 @@ public:
&this->Splits[0], &this->Splits[splitsSize], 0);
}
- void FindPointsInBounds(const double bounds[6], std::vector<Point> &points) const VTK_OVERRIDE
+ void FindPointsInBounds(const double bounds[6], std::vector<Point> &points) const override
{
int tag = 0;
for (int i = 0; i < 3; ++i)
diff --git a/Filters/ParallelDIY2/vtkPResampleWithDataSet.h b/Filters/ParallelDIY2/vtkPResampleWithDataSet.h
index 9edece636ed82d26fd18c9123ed5725e173b360b..c05bdc2e4e17a7bcafed8872aa00c303e5cf76c4 100644
--- a/Filters/ParallelDIY2/vtkPResampleWithDataSet.h
+++ b/Filters/ParallelDIY2/vtkPResampleWithDataSet.h
@@ -35,7 +35,7 @@ class VTKFILTERSPARALLELDIY2_EXPORT vtkPResampleWithDataSet : public vtkResample
{
public:
vtkTypeMacro(vtkPResampleWithDataSet, vtkResampleWithDataSet);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkPResampleWithDataSet *New();
@@ -72,9 +72,9 @@ protected:
~vtkPResampleWithDataSet();
int RequestData(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
int RequestUpdateExtent(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
vtkMultiProcessController *Controller;
bool UseBalancedPartitionForPointsLookup;
diff --git a/Filters/ParallelFlowPaths/Testing/Cxx/TestPParticleTracers.cxx b/Filters/ParallelFlowPaths/Testing/Cxx/TestPParticleTracers.cxx
index 0f558fe26ea24c30d8fc9ff81a3da0a0ed2df042..6c19ee7cb98bee968baf881ec6494857b8b02952 100644
--- a/Filters/ParallelFlowPaths/Testing/Cxx/TestPParticleTracers.cxx
+++ b/Filters/ParallelFlowPaths/Testing/Cxx/TestPParticleTracers.cxx
@@ -139,7 +139,7 @@ protected:
int ProcessRequest(vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE
+ vtkInformationVector* outputVector) override
{
// generate the data
if(request->Has(vtkDemandDrivenPipeline::REQUEST_DATA()))
@@ -155,7 +155,7 @@ protected:
return this->Superclass::ProcessRequest(request, inputVector, outputVector);
}
- int FillOutputPortInformation(int, vtkInformation *info) VTK_OVERRIDE
+ int FillOutputPortInformation(int, vtkInformation *info) override
{
info->Set(vtkDataObject::DATA_TYPE_NAME(), "vtkImageData");
return 1;
diff --git a/Filters/ParallelFlowPaths/Testing/Cxx/TestPStreamAMR.cxx b/Filters/ParallelFlowPaths/Testing/Cxx/TestPStreamAMR.cxx
index 64cc117002bed0c1ce37d0a5901a3bffc354b948..4989e42792ca3749fa9b275dbaa1ded00d1254f1 100644
--- a/Filters/ParallelFlowPaths/Testing/Cxx/TestPStreamAMR.cxx
+++ b/Filters/ParallelFlowPaths/Testing/Cxx/TestPStreamAMR.cxx
@@ -68,7 +68,7 @@ public:
static TestAMRVectorSource *New();
- virtual int FillInputPortInformation(int, vtkInformation* info) VTK_OVERRIDE
+ virtual int FillInputPortInformation(int, vtkInformation* info) override
{
// now add our info
info->Set(vtkDataObject::DATA_TYPE_NAME(), "vtkOverlappingAMR");
@@ -91,7 +91,7 @@ protected:
// This is the method you should override.
virtual int RequestData(vtkInformation *,
vtkInformationVector **inputVector,
- vtkInformationVector *outputVector) VTK_OVERRIDE
+ vtkInformationVector *outputVector) override
{
vtkInformation* inInfo = inputVector[0]->GetInformationObject(0);
vtkInformation* outInfo = outputVector->GetInformationObject(0);
diff --git a/Filters/ParallelFlowPaths/Testing/Cxx/TestVectorFieldSource.h b/Filters/ParallelFlowPaths/Testing/Cxx/TestVectorFieldSource.h
index e6dbc4677267e4d615e4e2d4425532bcfd004ad1..6cdc4f1d2156cf8a9b2cdfb536c5b93aa3cf6b02 100644
--- a/Filters/ParallelFlowPaths/Testing/Cxx/TestVectorFieldSource.h
+++ b/Filters/ParallelFlowPaths/Testing/Cxx/TestVectorFieldSource.h
@@ -16,10 +16,10 @@ protected:
~TestVectorFieldSource();
virtual int RequestInformation(vtkInformation *request,
vtkInformationVector **inputInfoVectors,
- vtkInformationVector *outputInfoVector) VTK_OVERRIDE;
+ vtkInformationVector *outputInfoVector) override;
void GetSpacing(double dx[3]);
void GetSize(double dx[3]);
- virtual void ExecuteDataWithInformation(vtkDataObject *outData,vtkInformation *outInfo) VTK_OVERRIDE;
+ virtual void ExecuteDataWithInformation(vtkDataObject *outData,vtkInformation *outInfo) override;
private:
int Extent[6];
double BoundingBox[6];
diff --git a/Filters/ParallelFlowPaths/vtkPLagrangianParticleTracker.h b/Filters/ParallelFlowPaths/vtkPLagrangianParticleTracker.h
index 701c4e406b025ec6b84190739d3067ddc9acdff9..f095210032040a7ac066727717500f87c06bb8bb 100644
--- a/Filters/ParallelFlowPaths/vtkPLagrangianParticleTracker.h
+++ b/Filters/ParallelFlowPaths/vtkPLagrangianParticleTracker.h
@@ -53,7 +53,7 @@ public vtkLagrangianParticleTracker
{
public:
vtkTypeMacro(vtkPLagrangianParticleTracker, vtkLagrangianParticleTracker);
- virtual void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ virtual void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkPLagrangianParticleTracker* New();
protected:
@@ -61,11 +61,11 @@ protected:
~vtkPLagrangianParticleTracker();
virtual int RequestUpdateExtent(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
void GenerateParticles(const vtkBoundingBox* bounds, vtkDataSet* seeds,
vtkDataArray* initialVelocities, vtkDataArray* initialIntegrationTimes,
- vtkPointData* seedData, int nVar, std::queue<vtkLagrangianParticle*>& particles) VTK_OVERRIDE;
+ vtkPointData* seedData, int nVar, std::queue<vtkLagrangianParticle*>& particles) override;
/**
* Flags description :
@@ -81,25 +81,25 @@ protected:
* Master flag empty : all ranks, including master, have no more particles to integrate
* Master flag finished : all workers ranks have sent the worker flag finished
*/
- virtual void GetParticleFeed(std::queue<vtkLagrangianParticle*>& particleQueue) VTK_OVERRIDE;
+ virtual void GetParticleFeed(std::queue<vtkLagrangianParticle*>& particleQueue) override;
virtual int Integrate(vtkLagrangianParticle*, std::queue<vtkLagrangianParticle*>& particleQueue,
vtkPolyData* particlePathsOutput, vtkIdList* particlePathPointId,
- vtkDataObject* interactionOutput) VTK_OVERRIDE;
+ vtkDataObject* interactionOutput) override;
void SendParticle(vtkLagrangianParticle* particle);
void ReceiveParticles(std::queue<vtkLagrangianParticle*>& particleQueue);
bool FinalizeOutputs(vtkPolyData* particlePathsOutput,
- vtkDataObject* interractionOutput) VTK_OVERRIDE;
+ vtkDataObject* interractionOutput) override;
- bool CheckParticlePathsRenderingThreshold(vtkPolyData* particlePathsOutput) VTK_OVERRIDE;
+ bool CheckParticlePathsRenderingThreshold(vtkPolyData* particlePathsOutput) override;
- bool UpdateSurfaceCacheIfNeeded(vtkDataObject*& surfaces) VTK_OVERRIDE;
+ bool UpdateSurfaceCacheIfNeeded(vtkDataObject*& surfaces) override;
/**
* Get an unique id for a particle
*/
- virtual vtkIdType GetNewParticleId() VTK_OVERRIDE;
+ virtual vtkIdType GetNewParticleId() override;
//@{
/**
diff --git a/Filters/ParallelFlowPaths/vtkPParticlePathFilter.h b/Filters/ParallelFlowPaths/vtkPParticlePathFilter.h
index ab6fe30c45baa629adc68271812e10851bd48da6..601d5688afe2f7c41474db0483043fd494eab9c6 100644
--- a/Filters/ParallelFlowPaths/vtkPParticlePathFilter.h
+++ b/Filters/ParallelFlowPaths/vtkPParticlePathFilter.h
@@ -34,7 +34,7 @@ class VTKFILTERSPARALLELFLOWPATHS_EXPORT vtkPParticlePathFilter: public vtkPPar
{
public:
vtkTypeMacro(vtkPParticlePathFilter,vtkPParticleTracerBase)
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkPParticlePathFilter *New();
@@ -42,11 +42,11 @@ protected:
vtkPParticlePathFilter();
~vtkPParticlePathFilter();
- virtual void ResetCache() VTK_OVERRIDE;
- virtual int OutputParticles(vtkPolyData* poly) VTK_OVERRIDE;
- virtual void InitializeExtraPointDataArrays(vtkPointData* outputPD) VTK_OVERRIDE;
- virtual void AppendToExtraPointDataArrays(vtkParticleTracerBaseNamespace::ParticleInformation &) VTK_OVERRIDE;
- void Finalize() VTK_OVERRIDE;
+ virtual void ResetCache() override;
+ virtual int OutputParticles(vtkPolyData* poly) override;
+ virtual void InitializeExtraPointDataArrays(vtkPointData* outputPD) override;
+ virtual void AppendToExtraPointDataArrays(vtkParticleTracerBaseNamespace::ParticleInformation &) override;
+ void Finalize() override;
ParticlePathFilterInternal It;
vtkDoubleArray* SimulationTime;
diff --git a/Filters/ParallelFlowPaths/vtkPParticleTracer.h b/Filters/ParallelFlowPaths/vtkPParticleTracer.h
index 0bf4e9d211e7d90edc2c2eb5191bbb58a156a986..1bac1bf0b3a58270d0b97c9869fd1dfc4c294ef5 100644
--- a/Filters/ParallelFlowPaths/vtkPParticleTracer.h
+++ b/Filters/ParallelFlowPaths/vtkPParticleTracer.h
@@ -35,14 +35,14 @@ class VTKFILTERSPARALLELFLOWPATHS_EXPORT vtkPParticleTracer: public vtkPParticl
{
public:
vtkTypeMacro(vtkPParticleTracer,vtkPParticleTracerBase)
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkPParticleTracer *New();
protected:
vtkPParticleTracer();
~vtkPParticleTracer(){}
- virtual int OutputParticles(vtkPolyData* poly) VTK_OVERRIDE;
+ virtual int OutputParticles(vtkPolyData* poly) override;
private:
vtkPParticleTracer(const vtkPParticleTracer&) VTK_DELETE_FUNCTION;
void operator=(const vtkPParticleTracer&) VTK_DELETE_FUNCTION;
diff --git a/Filters/ParallelFlowPaths/vtkPParticleTracerBase.h b/Filters/ParallelFlowPaths/vtkPParticleTracerBase.h
index 0555ddc38bc9043a7cb4481e8af26d7d093c2fde..0f739ffa19cb8bb2f118218dcaa4035dbd513f1d 100644
--- a/Filters/ParallelFlowPaths/vtkPParticleTracerBase.h
+++ b/Filters/ParallelFlowPaths/vtkPParticleTracerBase.h
@@ -38,7 +38,7 @@ class VTKFILTERSPARALLELFLOWPATHS_EXPORT vtkPParticleTracerBase : public vtkPart
{
public:
vtkTypeMacro(vtkPParticleTracerBase,vtkParticleTracerBase);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -64,14 +64,14 @@ protected:
virtual int RequestUpdateExtent(vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
//
- virtual vtkPolyData* Execute(vtkInformationVector** inputVector) VTK_OVERRIDE;
+ virtual vtkPolyData* Execute(vtkInformationVector** inputVector) override;
virtual bool SendParticleToAnotherProcess(vtkParticleTracerBaseNamespace::ParticleInformation & info,
vtkParticleTracerBaseNamespace::ParticleInformation & previous,
- vtkPointData*) VTK_OVERRIDE;
+ vtkPointData*) override;
/**
* Before starting the particle trace, classify
@@ -83,14 +83,14 @@ protected:
virtual void AssignSeedsToProcessors(double time,
vtkDataSet *source, int sourceID, int ptId,
vtkParticleTracerBaseNamespace::ParticleVector &localSeedPoints,
- int &localAssignedCount) VTK_OVERRIDE;
+ int &localAssignedCount) override;
/**
* give each one a uniqu ID. We need to use MPI to find out
* who is using which numbers.
*/
virtual void AssignUniqueIds(
- vtkParticleTracerBaseNamespace::ParticleVector &localSeedPoints) VTK_OVERRIDE;
+ vtkParticleTracerBaseNamespace::ParticleVector &localSeedPoints) override;
/**
* this is used during classification of seed points and also between iterations
@@ -99,14 +99,14 @@ protected:
*/
virtual bool SendReceiveParticles(RemoteParticleVector &outofdomain, RemoteParticleVector &received);
- virtual bool UpdateParticleListFromOtherProcesses() VTK_OVERRIDE;
+ virtual bool UpdateParticleListFromOtherProcesses() override;
/**
* Method that checks that the input arrays are ordered the
* same on all data sets. This needs to be true for all
* blocks in a composite data set as well as across all processes.
*/
- virtual bool IsPointDataValid(vtkDataObject* input) VTK_OVERRIDE;
+ virtual bool IsPointDataValid(vtkDataObject* input) override;
//
diff --git a/Filters/ParallelFlowPaths/vtkPStreaklineFilter.h b/Filters/ParallelFlowPaths/vtkPStreaklineFilter.h
index 27193a067221b701812d5c75bcf83dcc792c135d..b4325f6abcd3faf299f302e56b4c8dc45b6db414 100644
--- a/Filters/ParallelFlowPaths/vtkPStreaklineFilter.h
+++ b/Filters/ParallelFlowPaths/vtkPStreaklineFilter.h
@@ -35,7 +35,7 @@ class VTKFILTERSPARALLELFLOWPATHS_EXPORT vtkPStreaklineFilter: public vtkPParti
{
public:
vtkTypeMacro(vtkPStreaklineFilter,vtkPParticleTracerBase)
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkPStreaklineFilter *New();
@@ -44,8 +44,8 @@ class VTKFILTERSPARALLELFLOWPATHS_EXPORT vtkPStreaklineFilter: public vtkPParti
~vtkPStreaklineFilter(){}
vtkPStreaklineFilter(const vtkPStreaklineFilter&) VTK_DELETE_FUNCTION;
void operator=(const vtkPStreaklineFilter&) VTK_DELETE_FUNCTION;
- virtual int OutputParticles(vtkPolyData* poly) VTK_OVERRIDE;
- virtual void Finalize() VTK_OVERRIDE;
+ virtual int OutputParticles(vtkPolyData* poly) override;
+ virtual void Finalize() override;
StreaklineFilterInternal It;
};
diff --git a/Filters/ParallelFlowPaths/vtkPStreamTracer.cxx b/Filters/ParallelFlowPaths/vtkPStreamTracer.cxx
index 56bf91f904053250a6caa83181f1a118006c14ca..7ed7ac5da65710f2e9c95d37d81c9ba538b56a6b 100644
--- a/Filters/ParallelFlowPaths/vtkPStreamTracer.cxx
+++ b/Filters/ParallelFlowPaths/vtkPStreamTracer.cxx
@@ -421,18 +421,18 @@ public:
vtkSetMacro(GridId,int)
vtkGetMacro(GridId,int)
- virtual int GetSize() VTK_OVERRIDE
+ virtual int GetSize() override
{
return PStreamTracerPoint::GetSize()+2*sizeof(int);
}
- virtual void Read(MyStream& stream) VTK_OVERRIDE
+ virtual void Read(MyStream& stream) override
{
PStreamTracerPoint::Read(stream);
stream>>Level;
stream>>GridId;
}
- virtual void Write(MyStream& stream) VTK_OVERRIDE
+ virtual void Write(MyStream& stream) override
{
PStreamTracerPoint::Write(stream);
stream<<Level<<GridId;
@@ -713,25 +713,25 @@ public:
this->Locator = nullptr;
}
- virtual void Initialize(vtkPStreamTracer* tracer) VTK_OVERRIDE
+ virtual void Initialize(vtkPStreamTracer* tracer) override
{
this->Superclass::Initialize(tracer);
this->Locator = vtkSmartPointer<ProcessLocator>::New();
this->Locator->Initialize(tracer->InputData);
}
- virtual ProcessLocator* GetProcessLocator() VTK_OVERRIDE
+ virtual ProcessLocator* GetProcessLocator() override
{
return this->Locator;
}
- virtual bool InBound(PStreamTracerPoint*) VTK_OVERRIDE
+ virtual bool InBound(PStreamTracerPoint*) override
{
return true;
}
- virtual vtkSmartPointer<PStreamTracerPoint> NewPoint(int id, double* x, int dir) VTK_OVERRIDE
+ virtual vtkSmartPointer<PStreamTracerPoint> NewPoint(int id, double* x, int dir) override
{
vtkSmartPointer<PStreamTracerPoint> p = vtkSmartPointer<PStreamTracerPoint>::New();
p->SetId(id);
@@ -755,7 +755,7 @@ public:
static AMRPStreamTracerUtils *New();
vtkSetMacro(AMR,vtkOverlappingAMR*);
- virtual void InitializeVelocityFunction(PStreamTracerPoint* point, vtkAbstractInterpolatedVelocityField* func) VTK_OVERRIDE
+ virtual void InitializeVelocityFunction(PStreamTracerPoint* point, vtkAbstractInterpolatedVelocityField* func) override
{
AMRPStreamTracerPoint* amrPoint = AMRPStreamTracerPoint::SafeDownCast(point);
assert(amrPoint);
@@ -776,7 +776,7 @@ public:
}
- virtual bool PreparePoint(PStreamTracerPoint* point, vtkAbstractInterpolatedVelocityField* func) VTK_OVERRIDE
+ virtual bool PreparePoint(PStreamTracerPoint* point, vtkAbstractInterpolatedVelocityField* func) override
{
AMRPStreamTracerPoint* amrPoint = AMRPStreamTracerPoint::SafeDownCast(point);
vtkAMRInterpolatedVelocityField* amrFunc = vtkAMRInterpolatedVelocityField::SafeDownCast(func);
@@ -801,7 +801,7 @@ public:
//this assume that p's AMR information has been set correctly
//it makes no attempt to look for it
- virtual bool InBound(PStreamTracerPoint* p) VTK_OVERRIDE
+ virtual bool InBound(PStreamTracerPoint* p) override
{
AMRPStreamTracerPoint* amrp = AMRPStreamTracerPoint::SafeDownCast(p);
if(amrp->GetLevel()<0)
@@ -813,7 +813,7 @@ public:
return grid!=nullptr;
}
- virtual vtkSmartPointer<PStreamTracerPoint> NewPoint(int id, double* x, int dir) VTK_OVERRIDE
+ virtual vtkSmartPointer<PStreamTracerPoint> NewPoint(int id, double* x, int dir) override
{
vtkSmartPointer<AMRPStreamTracerPoint> amrp = vtkSmartPointer<AMRPStreamTracerPoint>::New();
@@ -844,7 +844,7 @@ public:
return p;
}
- virtual void Initialize(vtkPStreamTracer* tracer) VTK_OVERRIDE
+ virtual void Initialize(vtkPStreamTracer* tracer) override
{
this->Superclass::Initialize(tracer);
AssertNe(this->InputData,nullptr);
diff --git a/Filters/ParallelFlowPaths/vtkPStreamTracer.h b/Filters/ParallelFlowPaths/vtkPStreamTracer.h
index edbe29609c42cc01af565aaa5a2f248e9d567afa..b765b0f7612f1848c9f6ef5b07c67f4c9d0b3025 100644
--- a/Filters/ParallelFlowPaths/vtkPStreamTracer.h
+++ b/Filters/ParallelFlowPaths/vtkPStreamTracer.h
@@ -43,7 +43,7 @@ class VTKFILTERSPARALLELFLOWPATHS_EXPORT vtkPStreamTracer : public vtkStreamTra
{
public:
vtkTypeMacro(vtkPStreamTracer,vtkStreamTracer);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -63,8 +63,8 @@ protected:
vtkPStreamTracer();
~vtkPStreamTracer();
- virtual int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- virtual int RequestUpdateExtent(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ virtual int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ virtual int RequestUpdateExtent(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
vtkMultiProcessController* Controller;
diff --git a/Filters/ParallelFlowPaths/vtkPTemporalStreamTracer.h b/Filters/ParallelFlowPaths/vtkPTemporalStreamTracer.h
index 85a593558d558bf3f7797546b823456c1bca70f2..d4c4952453a2f5b382bfa7298f08fb66db0b2154 100644
--- a/Filters/ParallelFlowPaths/vtkPTemporalStreamTracer.h
+++ b/Filters/ParallelFlowPaths/vtkPTemporalStreamTracer.h
@@ -55,7 +55,7 @@ class VTKFILTERSPARALLELFLOWPATHS_EXPORT vtkPTemporalStreamTracer : public vtkTe
public:
vtkTypeMacro(vtkPTemporalStreamTracer,vtkTemporalStreamTracer);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct object using 2nd order Runge Kutta
@@ -81,7 +81,7 @@ public:
//
virtual int RequestData(vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
//
@@ -96,14 +96,14 @@ public:
virtual void AssignSeedsToProcessors(
vtkDataSet *source, int sourceID, int ptId,
vtkTemporalStreamTracerNamespace::ParticleVector &LocalSeedPoints,
- int &LocalAssignedCount) VTK_OVERRIDE;
+ int &LocalAssignedCount) override;
/**
* give each one a uniqu ID. We need to use MPI to find out
* who is using which numbers.
*/
virtual void AssignUniqueIds(
- vtkTemporalStreamTracerNamespace::ParticleVector &LocalSeedPoints) VTK_OVERRIDE;
+ vtkTemporalStreamTracerNamespace::ParticleVector &LocalSeedPoints) override;
/**
* this is used during classification of seed points and also between iterations
@@ -112,7 +112,7 @@ public:
virtual void TransmitReceiveParticles(
vtkTemporalStreamTracerNamespace::ParticleVector &outofdomain,
vtkTemporalStreamTracerNamespace::ParticleVector &received,
- bool removeself) VTK_OVERRIDE;
+ bool removeself) override;
void AddParticleToMPISendList(
vtkTemporalStreamTracerNamespace::ParticleInformation &info);
diff --git a/Filters/ParallelGeometry/Testing/Cxx/TestPUnstructuredGridGhostCellsGenerator.cxx b/Filters/ParallelGeometry/Testing/Cxx/TestPUnstructuredGridGhostCellsGenerator.cxx
index 9dfe328ddd7d8ab4da6dff396f4174c3d1ffe7e9..d4135fbfc98a5ca4cfa17ac0ab3c7d26ac858912 100644
--- a/Filters/ParallelGeometry/Testing/Cxx/TestPUnstructuredGridGhostCellsGenerator.cxx
+++ b/Filters/ParallelGeometry/Testing/Cxx/TestPUnstructuredGridGhostCellsGenerator.cxx
@@ -44,7 +44,7 @@ public:
protected:
vtkRTAnalyticSource2() {}
- virtual void ExecuteDataWithInformation(vtkDataObject *output, vtkInformation *outInfo) VTK_OVERRIDE
+ virtual void ExecuteDataWithInformation(vtkDataObject *output, vtkInformation *outInfo) override
{
Superclass::ExecuteDataWithInformation(output, outInfo);
diff --git a/Filters/ParallelGeometry/vtkPDataSetGhostGenerator.h b/Filters/ParallelGeometry/vtkPDataSetGhostGenerator.h
index 08605e25f06d0abb24d53e6510f4c6ae03316694..bdbaf05d5284920e2cc58e54b5829fe8f4843a1a 100644
--- a/Filters/ParallelGeometry/vtkPDataSetGhostGenerator.h
+++ b/Filters/ParallelGeometry/vtkPDataSetGhostGenerator.h
@@ -38,7 +38,7 @@ class VTKFILTERSPARALLELGEOMETRY_EXPORT vtkPDataSetGhostGenerator :
{
public:
vtkTypeMacro(vtkPDataSetGhostGenerator,vtkDataSetGhostGenerator);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -67,7 +67,7 @@ protected:
* Creates ghost layers. Implemented by concrete implementations.
*/
virtual void GenerateGhostLayers(
- vtkMultiBlockDataSet *in, vtkMultiBlockDataSet *out) VTK_OVERRIDE = 0;
+ vtkMultiBlockDataSet *in, vtkMultiBlockDataSet *out) override = 0;
int Rank;
bool Initialized;
diff --git a/Filters/ParallelGeometry/vtkPStructuredGridConnectivity.h b/Filters/ParallelGeometry/vtkPStructuredGridConnectivity.h
index 1a4a7918ed12caa4b1659d6a7b11a85a45b2c69f..01d25d29ebd59c85dec85687ff501e6a94d99a82 100644
--- a/Filters/ParallelGeometry/vtkPStructuredGridConnectivity.h
+++ b/Filters/ParallelGeometry/vtkPStructuredGridConnectivity.h
@@ -51,7 +51,7 @@ class VTKFILTERSPARALLELGEOMETRY_EXPORT vtkPStructuredGridConnectivity :
public:
static vtkPStructuredGridConnectivity* New();
vtkTypeMacro(vtkPStructuredGridConnectivity,vtkStructuredGridConnectivity);
- void PrintSelf(ostream& os, vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent ) override;
//@{
/**
@@ -64,7 +64,7 @@ public:
/**
* Sets the total number of domains distributed among processors
*/
- void SetNumberOfGrids( const unsigned int N ) VTK_OVERRIDE;
+ void SetNumberOfGrids( const unsigned int N ) override;
/**
* See vtkStructuredGridConnectivity::RegisterGrid
@@ -74,7 +74,7 @@ public:
vtkUnsignedCharArray* cellGhostArray,
vtkPointData* pointData,
vtkCellData* cellData,
- vtkPoints* gridNodes ) VTK_OVERRIDE;
+ vtkPoints* gridNodes ) override;
/**
* Returns the number of local grids registers by the process that owns
@@ -113,13 +113,13 @@ public:
* data-set.
* See vtkStructuredGridConnectivity::ComputeNeighbors
*/
- void ComputeNeighbors() VTK_OVERRIDE;
+ void ComputeNeighbors() override;
/**
* Creates ghost layers on the grids owned by this process using data from
* both local and remote block neighbors.
*/
- virtual void CreateGhostLayers( const int N=1 ) VTK_OVERRIDE;
+ virtual void CreateGhostLayers( const int N=1 ) override;
protected:
vtkPStructuredGridConnectivity();
@@ -208,7 +208,7 @@ protected:
* extents from the neighboring grids of the grid corresponding to the given
* gridID.
*/
- virtual void TransferGhostDataFromNeighbors(const int gridID) VTK_OVERRIDE;
+ virtual void TransferGhostDataFromNeighbors(const int gridID) override;
/**
* Helper method to pack all the ghost data into send buffers.
diff --git a/Filters/ParallelGeometry/vtkPStructuredGridGhostDataGenerator.h b/Filters/ParallelGeometry/vtkPStructuredGridGhostDataGenerator.h
index 3660728d9551d4d9ee5d45063f976f316ba8c244..a517b53734368cb326159ee66b7e81f7d25f476b 100644
--- a/Filters/ParallelGeometry/vtkPStructuredGridGhostDataGenerator.h
+++ b/Filters/ParallelGeometry/vtkPStructuredGridGhostDataGenerator.h
@@ -63,7 +63,7 @@ class VTKFILTERSPARALLELGEOMETRY_EXPORT vtkPStructuredGridGhostDataGenerator:
public:
static vtkPStructuredGridGhostDataGenerator* New();
vtkTypeMacro(vtkPStructuredGridGhostDataGenerator,vtkPDataSetGhostGenerator);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkPStructuredGridGhostDataGenerator();
@@ -84,7 +84,7 @@ protected:
* Generates ghost layers.
*/
void GenerateGhostLayers(
- vtkMultiBlockDataSet *in, vtkMultiBlockDataSet *out) VTK_OVERRIDE;
+ vtkMultiBlockDataSet *in, vtkMultiBlockDataSet *out) override;
vtkPStructuredGridConnectivity *GridConnectivity;
private:
diff --git a/Filters/ParallelGeometry/vtkPUniformGridGhostDataGenerator.h b/Filters/ParallelGeometry/vtkPUniformGridGhostDataGenerator.h
index 48369600730cdf89d6e6895047109f157e365a29..8b08e472548553864428893c13f59c5c0e011684 100644
--- a/Filters/ParallelGeometry/vtkPUniformGridGhostDataGenerator.h
+++ b/Filters/ParallelGeometry/vtkPUniformGridGhostDataGenerator.h
@@ -64,7 +64,7 @@ class VTKFILTERSPARALLELGEOMETRY_EXPORT vtkPUniformGridGhostDataGenerator:
public:
static vtkPUniformGridGhostDataGenerator* New();
vtkTypeMacro(vtkPUniformGridGhostDataGenerator,vtkPDataSetGhostGenerator);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkPUniformGridGhostDataGenerator();
@@ -95,7 +95,7 @@ protected:
* Generates ghost-layers
*/
virtual void GenerateGhostLayers(
- vtkMultiBlockDataSet *in, vtkMultiBlockDataSet *out) VTK_OVERRIDE;
+ vtkMultiBlockDataSet *in, vtkMultiBlockDataSet *out) override;
double GlobalSpacing[3];
double GlobalOrigin[3];
diff --git a/Filters/ParallelGeometry/vtkPUnstructuredGridConnectivity.h b/Filters/ParallelGeometry/vtkPUnstructuredGridConnectivity.h
index a25913e44cf93a923369598ed5ef2b555e20a351..86d01fd62cec0449747cc03a0d06e2b57f044647 100644
--- a/Filters/ParallelGeometry/vtkPUnstructuredGridConnectivity.h
+++ b/Filters/ParallelGeometry/vtkPUnstructuredGridConnectivity.h
@@ -99,7 +99,7 @@ class VTKFILTERSPARALLELGEOMETRY_EXPORT vtkPUnstructuredGridConnectivity :
public:
static vtkPUnstructuredGridConnectivity* New();
vtkTypeMacro(vtkPUnstructuredGridConnectivity,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
diff --git a/Filters/ParallelGeometry/vtkPUnstructuredGridGhostCellsGenerator.h b/Filters/ParallelGeometry/vtkPUnstructuredGridGhostCellsGenerator.h
index caad810d5e9f042c38b54e13ca66f8dd54d9e0e0..aef08a5c49d01db0ca9867d8ce2fc37edc1229c2 100644
--- a/Filters/ParallelGeometry/vtkPUnstructuredGridGhostCellsGenerator.h
+++ b/Filters/ParallelGeometry/vtkPUnstructuredGridGhostCellsGenerator.h
@@ -86,7 +86,7 @@ class VTKFILTERSPARALLELGEOMETRY_EXPORT vtkPUnstructuredGridGhostCellsGenerator:
vtkTypeMacro(vtkPUnstructuredGridGhostCellsGenerator, vtkUnstructuredGridAlgorithm);
public:
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkPUnstructuredGridGhostCellsGenerator *New();
@@ -169,7 +169,7 @@ protected:
~vtkPUnstructuredGridGhostCellsGenerator();
virtual int RequestData(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
void GetFirstGhostLayer(int, vtkUnstructuredGrid *);
diff --git a/Filters/ParallelGeometry/vtkPUnstructuredGridGhostDataGenerator.h b/Filters/ParallelGeometry/vtkPUnstructuredGridGhostDataGenerator.h
index c255d50b8d5f95c8f1900a43e39ccede77f5ad49..7e20c378b09232fc87ccd1f1ec292c3aba83a690 100644
--- a/Filters/ParallelGeometry/vtkPUnstructuredGridGhostDataGenerator.h
+++ b/Filters/ParallelGeometry/vtkPUnstructuredGridGhostDataGenerator.h
@@ -58,18 +58,18 @@ class VTKFILTERSPARALLELGEOMETRY_EXPORT vtkPUnstructuredGridGhostDataGenerator:
public:
static vtkPUnstructuredGridGhostDataGenerator* New();
vtkTypeMacro(vtkPUnstructuredGridGhostDataGenerator,vtkUnstructuredGridAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkPUnstructuredGridGhostDataGenerator();
virtual ~vtkPUnstructuredGridGhostDataGenerator();
// Standard VTK pipeline routines
- virtual int FillInputPortInformation(int port,vtkInformation *info) VTK_OVERRIDE;
- virtual int FillOutputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ virtual int FillInputPortInformation(int port,vtkInformation *info) override;
+ virtual int FillOutputPortInformation(int port, vtkInformation *info) override;
virtual int RequestData(
vtkInformation *rqst, vtkInformationVector **inputVector,
- vtkInformationVector* outputVector ) VTK_OVERRIDE;
+ vtkInformationVector* outputVector ) override;
vtkPUnstructuredGridConnectivity* GhostZoneBuilder;
vtkMultiProcessController* Controller;
diff --git a/Filters/ParallelImaging/vtkExtractPiece.h b/Filters/ParallelImaging/vtkExtractPiece.h
index 3218d9750c4cfd9ccf2551f9d883cb01d9db5425..f94273befe0c6d0b6827449f6367bd560fe1502f 100644
--- a/Filters/ParallelImaging/vtkExtractPiece.h
+++ b/Filters/ParallelImaging/vtkExtractPiece.h
@@ -40,22 +40,22 @@ class VTKFILTERSPARALLELIMAGING_EXPORT vtkExtractPiece : public vtkCompositeData
public:
static vtkExtractPiece* New();
vtkTypeMacro(vtkExtractPiece, vtkCompositeDataSetAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkExtractPiece() {}
- ~vtkExtractPiece() VTK_OVERRIDE {}
+ ~vtkExtractPiece() override {}
int RequestDataObject(vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
int RequestUpdateExtent(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
int RequestData(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
void ExtractImageData(vtkImageData *imageData,
vtkCompositeDataSet *output,
diff --git a/Filters/ParallelImaging/vtkMemoryLimitImageDataStreamer.h b/Filters/ParallelImaging/vtkMemoryLimitImageDataStreamer.h
index c1cc1eab42f99239432e03f62e4d147b301a46e2..efe7379fc0717bf581b7781daa6b0e8c0dae7e84 100644
--- a/Filters/ParallelImaging/vtkMemoryLimitImageDataStreamer.h
+++ b/Filters/ParallelImaging/vtkMemoryLimitImageDataStreamer.h
@@ -33,7 +33,7 @@ class VTKFILTERSPARALLELIMAGING_EXPORT vtkMemoryLimitImageDataStreamer : public
public:
static vtkMemoryLimitImageDataStreamer *New();
vtkTypeMacro(vtkMemoryLimitImageDataStreamer,vtkImageDataStreamer);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -46,11 +46,11 @@ public:
// See the vtkAlgorithm for a desciption of what these do
int ProcessRequest(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
protected:
vtkMemoryLimitImageDataStreamer();
- ~vtkMemoryLimitImageDataStreamer() VTK_OVERRIDE {}
+ ~vtkMemoryLimitImageDataStreamer() override {}
unsigned long MemoryLimit;
private:
diff --git a/Filters/ParallelImaging/vtkPComputeHistogram2DOutliers.h b/Filters/ParallelImaging/vtkPComputeHistogram2DOutliers.h
index b173e02f10a131072d6f600a4f8840e8376953b5..3a668075e3d976ea56c2e3ae4e937ac118f04b3c 100644
--- a/Filters/ParallelImaging/vtkPComputeHistogram2DOutliers.h
+++ b/Filters/ParallelImaging/vtkPComputeHistogram2DOutliers.h
@@ -53,18 +53,18 @@ class VTKFILTERSPARALLELIMAGING_EXPORT vtkPComputeHistogram2DOutliers : public v
public:
static vtkPComputeHistogram2DOutliers* New();
vtkTypeMacro(vtkPComputeHistogram2DOutliers, vtkComputeHistogram2DOutliers);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
virtual void SetController(vtkMultiProcessController*);
vtkGetObjectMacro(Controller,vtkMultiProcessController);
protected:
vtkPComputeHistogram2DOutliers();
- ~vtkPComputeHistogram2DOutliers() VTK_OVERRIDE;
+ ~vtkPComputeHistogram2DOutliers() override;
int RequestData(
vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
vtkMultiProcessController* Controller;
private:
diff --git a/Filters/ParallelImaging/vtkPExtractHistogram2D.h b/Filters/ParallelImaging/vtkPExtractHistogram2D.h
index 2cf76ada6b0c37d5e5e32162da0d3ea491c08e1c..2e2243bcd1c5c9d681984162bf46c44a1d76ad4b 100644
--- a/Filters/ParallelImaging/vtkPExtractHistogram2D.h
+++ b/Filters/ParallelImaging/vtkPExtractHistogram2D.h
@@ -50,23 +50,23 @@ class VTKFILTERSPARALLELIMAGING_EXPORT vtkPExtractHistogram2D : public vtkExtrac
public:
static vtkPExtractHistogram2D* New();
vtkTypeMacro(vtkPExtractHistogram2D, vtkExtractHistogram2D);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
virtual void SetController(vtkMultiProcessController*);
vtkGetObjectMacro(Controller,vtkMultiProcessController);
protected:
vtkPExtractHistogram2D();
- ~vtkPExtractHistogram2D() VTK_OVERRIDE;
+ ~vtkPExtractHistogram2D() override;
vtkMultiProcessController* Controller;
- int ComputeBinExtents(vtkDataArray* col1, vtkDataArray* col2) VTK_OVERRIDE;
+ int ComputeBinExtents(vtkDataArray* col1, vtkDataArray* col2) override;
// Execute the calculations required by the Learn option.
void Learn( vtkTable* inData,
vtkTable* inParameters,
- vtkMultiBlockDataSet* outMeta ) VTK_OVERRIDE;
+ vtkMultiBlockDataSet* outMeta ) override;
private:
vtkPExtractHistogram2D(const vtkPExtractHistogram2D&) VTK_DELETE_FUNCTION;
diff --git a/Filters/ParallelImaging/vtkPPairwiseExtractHistogram2D.h b/Filters/ParallelImaging/vtkPPairwiseExtractHistogram2D.h
index d7f59a4326d26848b107ca43b3414ff7bdd630ef..8eaba5f965bd41987b766ce37ede2e149b8c2dce 100644
--- a/Filters/ParallelImaging/vtkPPairwiseExtractHistogram2D.h
+++ b/Filters/ParallelImaging/vtkPPairwiseExtractHistogram2D.h
@@ -55,21 +55,21 @@ class VTKFILTERSPARALLELIMAGING_EXPORT vtkPPairwiseExtractHistogram2D : public v
public:
static vtkPPairwiseExtractHistogram2D* New();
vtkTypeMacro(vtkPPairwiseExtractHistogram2D, vtkPairwiseExtractHistogram2D);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
virtual void SetController(vtkMultiProcessController*);
vtkGetObjectMacro(Controller,vtkMultiProcessController);
protected:
vtkPPairwiseExtractHistogram2D();
- ~vtkPPairwiseExtractHistogram2D() VTK_OVERRIDE;
+ ~vtkPPairwiseExtractHistogram2D() override;
vtkMultiProcessController* Controller;
/**
* Generate a new histogram filter, but actually generate a parallel one this time.
*/
- vtkExtractHistogram2D* NewHistogramFilter() VTK_OVERRIDE;
+ vtkExtractHistogram2D* NewHistogramFilter() override;
private:
vtkPPairwiseExtractHistogram2D(const vtkPPairwiseExtractHistogram2D&) VTK_DELETE_FUNCTION;
diff --git a/Filters/ParallelImaging/vtkTransmitImageDataPiece.h b/Filters/ParallelImaging/vtkTransmitImageDataPiece.h
index 725f7ceeef226d037f76e4b2fdb809d84fc98515..b39fdf2f0baed4a889d4f38029e03f234ceff02a 100644
--- a/Filters/ParallelImaging/vtkTransmitImageDataPiece.h
+++ b/Filters/ParallelImaging/vtkTransmitImageDataPiece.h
@@ -39,11 +39,11 @@ class VTKFILTERSPARALLELIMAGING_EXPORT vtkTransmitImageDataPiece : public vtkTra
public:
static vtkTransmitImageDataPiece *New();
vtkTypeMacro(vtkTransmitImageDataPiece, vtkTransmitStructuredDataPiece);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkTransmitImageDataPiece();
- ~vtkTransmitImageDataPiece() VTK_OVERRIDE;
+ ~vtkTransmitImageDataPiece() override;
private:
vtkTransmitImageDataPiece(const vtkTransmitImageDataPiece&) VTK_DELETE_FUNCTION;
diff --git a/Filters/ParallelMPI/vtkDistributedDataFilter.h b/Filters/ParallelMPI/vtkDistributedDataFilter.h
index ef06e038440274a3ac140e52f521a33cac450b3b..e18dd53e291bade23a8c89890031aa6184c3593d 100644
--- a/Filters/ParallelMPI/vtkDistributedDataFilter.h
+++ b/Filters/ParallelMPI/vtkDistributedDataFilter.h
@@ -109,7 +109,7 @@ class VTKFILTERSPARALLELMPI_EXPORT vtkDistributedDataFilter: public vtkDataObjec
vtkDataObjectAlgorithm);
public:
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkDistributedDataFilter *New();
@@ -204,7 +204,7 @@ public:
/**
* Ensure previous filters don't send up ghost cells
*/
- virtual int RequestUpdateExtent(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ virtual int RequestUpdateExtent(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
/**
* This class does a great deal of all-to-all communication
@@ -302,11 +302,11 @@ protected:
*/
virtual int RequestData(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
void SingleProcessExecute(vtkDataSet *input, vtkUnstructuredGrid *output);
virtual int RequestInformation(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
- virtual int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ vtkInformationVector *) override;
+ virtual int FillInputPortInformation(int port, vtkInformation *info) override;
/**
* Overridden to create the correct type of data output. If input is dataset,
@@ -315,7 +315,7 @@ protected:
*/
virtual int RequestDataObject(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
/**
* Implementation for request data.
diff --git a/Filters/ParallelMPI/vtkPExtractGrid.h b/Filters/ParallelMPI/vtkPExtractGrid.h
index 7456ff5372a723d2556426d817310e8302446205..30872b50147a7aee36b9322f8dc68fdddeb6d7c7 100644
--- a/Filters/ParallelMPI/vtkPExtractGrid.h
+++ b/Filters/ParallelMPI/vtkPExtractGrid.h
@@ -42,7 +42,7 @@ class VTKFILTERSPARALLELMPI_EXPORT vtkPExtractGrid: public vtkExtractGrid
public:
static vtkPExtractGrid* New();
vtkTypeMacro(vtkPExtractGrid,vtkExtractGrid);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkPExtractGrid();
@@ -50,11 +50,11 @@ protected:
// Standard VTK Pipeline methods
virtual int RequestData(
- vtkInformation*, vtkInformationVector**,vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformation*, vtkInformationVector**,vtkInformationVector*) override;
virtual int RequestInformation(
- vtkInformation*, vtkInformationVector**, vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformation*, vtkInformationVector**, vtkInformationVector*) override;
virtual int RequestUpdateExtent(
- vtkInformation*, vtkInformationVector**, vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformation*, vtkInformationVector**, vtkInformationVector*) override;
vtkMPIController* Controller;
diff --git a/Filters/ParallelMPI/vtkPExtractRectilinearGrid.h b/Filters/ParallelMPI/vtkPExtractRectilinearGrid.h
index 573330b508037b411afb8db3033cd5bb4847da2f..f41468bcfe4a5bbd4d301fb9c717e2d52c99760a 100644
--- a/Filters/ParallelMPI/vtkPExtractRectilinearGrid.h
+++ b/Filters/ParallelMPI/vtkPExtractRectilinearGrid.h
@@ -45,7 +45,7 @@ class VTKFILTERSPARALLELMPI_EXPORT vtkPExtractRectilinearGrid :
public:
static vtkPExtractRectilinearGrid* New();
vtkTypeMacro(vtkPExtractRectilinearGrid,vtkExtractRectilinearGrid);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkPExtractRectilinearGrid();
@@ -53,11 +53,11 @@ protected:
// Standard VTK Pipeline methods
virtual int RequestData(
- vtkInformation*, vtkInformationVector**,vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformation*, vtkInformationVector**,vtkInformationVector*) override;
virtual int RequestInformation(
- vtkInformation*, vtkInformationVector**, vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformation*, vtkInformationVector**, vtkInformationVector*) override;
virtual int RequestUpdateExtent(
- vtkInformation*, vtkInformationVector**, vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformation*, vtkInformationVector**, vtkInformationVector*) override;
vtkMPIController* Controller;
diff --git a/Filters/ParallelMPI/vtkPExtractVOI.h b/Filters/ParallelMPI/vtkPExtractVOI.h
index 3f3ee6c4156d632626e66b7fd2097a08869f6c50..37d53869a78d79ff8473176ad65473b81468ffa3 100644
--- a/Filters/ParallelMPI/vtkPExtractVOI.h
+++ b/Filters/ParallelMPI/vtkPExtractVOI.h
@@ -44,7 +44,7 @@ class VTKFILTERSPARALLELMPI_EXPORT vtkPExtractVOI : public vtkExtractVOI
public:
static vtkPExtractVOI* New();
vtkTypeMacro(vtkPExtractVOI,vtkExtractVOI);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkPExtractVOI();
@@ -52,11 +52,11 @@ protected:
// Standard VTK Pipeline methods
virtual int RequestData(
- vtkInformation*, vtkInformationVector**,vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformation*, vtkInformationVector**,vtkInformationVector*) override;
virtual int RequestInformation(
- vtkInformation*, vtkInformationVector**, vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformation*, vtkInformationVector**, vtkInformationVector*) override;
virtual int RequestUpdateExtent(
- vtkInformation*, vtkInformationVector**, vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformation*, vtkInformationVector**, vtkInformationVector*) override;
vtkMPIController* Controller;
diff --git a/Filters/ParallelMPI/vtkStructuredImplicitConnectivity.h b/Filters/ParallelMPI/vtkStructuredImplicitConnectivity.h
index 122fd9661907faae70584c097078abd22507d61f..2499bb17028f187931871ddf9196a677538fe1b3 100644
--- a/Filters/ParallelMPI/vtkStructuredImplicitConnectivity.h
+++ b/Filters/ParallelMPI/vtkStructuredImplicitConnectivity.h
@@ -69,7 +69,7 @@ class VTKFILTERSPARALLELMPI_EXPORT vtkStructuredImplicitConnectivity :
{
public:
static vtkStructuredImplicitConnectivity* New();
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
vtkTypeMacro(vtkStructuredImplicitConnectivity,vtkObject);
/**
diff --git a/Filters/ParallelStatistics/vtkPAutoCorrelativeStatistics.h b/Filters/ParallelStatistics/vtkPAutoCorrelativeStatistics.h
index 76268fd6a700915497c3131b59e70ee6d603b264..731a5a046687bbf3951404b3c36265d6926c026a 100644
--- a/Filters/ParallelStatistics/vtkPAutoCorrelativeStatistics.h
+++ b/Filters/ParallelStatistics/vtkPAutoCorrelativeStatistics.h
@@ -38,7 +38,7 @@ class VTKFILTERSPARALLELSTATISTICS_EXPORT vtkPAutoCorrelativeStatistics : public
public:
static vtkPAutoCorrelativeStatistics* New();
vtkTypeMacro(vtkPAutoCorrelativeStatistics, vtkAutoCorrelativeStatistics);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -54,7 +54,7 @@ public:
*/
void Learn( vtkTable* inData,
vtkTable* inParameters,
- vtkMultiBlockDataSet* outMeta ) VTK_OVERRIDE;
+ vtkMultiBlockDataSet* outMeta ) override;
/**
* Execute the calculations required by the Test option.
@@ -62,11 +62,11 @@ public:
*/
void Test( vtkTable*,
vtkMultiBlockDataSet*,
- vtkTable* ) VTK_OVERRIDE;
+ vtkTable* ) override;
protected:
vtkPAutoCorrelativeStatistics();
- ~vtkPAutoCorrelativeStatistics() VTK_OVERRIDE;
+ ~vtkPAutoCorrelativeStatistics() override;
vtkMultiProcessController* Controller;
private:
diff --git a/Filters/ParallelStatistics/vtkPBivariateLinearTableThreshold.h b/Filters/ParallelStatistics/vtkPBivariateLinearTableThreshold.h
index c1081f61cc1373ff87782d7213df2d2c58b10cf1..cdf61a68630439ae1546227eb50d24aefdc68b45 100644
--- a/Filters/ParallelStatistics/vtkPBivariateLinearTableThreshold.h
+++ b/Filters/ParallelStatistics/vtkPBivariateLinearTableThreshold.h
@@ -41,7 +41,7 @@ class VTKFILTERSPARALLELSTATISTICS_EXPORT vtkPBivariateLinearTableThreshold : pu
public:
static vtkPBivariateLinearTableThreshold* New();
vtkTypeMacro(vtkPBivariateLinearTableThreshold, vtkBivariateLinearTableThreshold);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -54,12 +54,12 @@ public:
protected:
vtkPBivariateLinearTableThreshold();
- ~vtkPBivariateLinearTableThreshold() VTK_OVERRIDE;
+ ~vtkPBivariateLinearTableThreshold() override;
int RequestData(
vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
vtkMultiProcessController* Controller;
private:
diff --git a/Filters/ParallelStatistics/vtkPContingencyStatistics.h b/Filters/ParallelStatistics/vtkPContingencyStatistics.h
index e460e3cad992fff5ca1c7c2d418be03b0ad6f62f..472176849e81586ab62c3d8697926baa3ea608ce 100644
--- a/Filters/ParallelStatistics/vtkPContingencyStatistics.h
+++ b/Filters/ParallelStatistics/vtkPContingencyStatistics.h
@@ -53,7 +53,7 @@ class VTKFILTERSPARALLELSTATISTICS_EXPORT vtkPContingencyStatistics : public vtk
public:
static vtkPContingencyStatistics* New();
vtkTypeMacro(vtkPContingencyStatistics, vtkContingencyStatistics);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -69,11 +69,11 @@ public:
*/
void Learn( vtkTable*,
vtkTable*,
- vtkMultiBlockDataSet* ) VTK_OVERRIDE;
+ vtkMultiBlockDataSet* ) override;
protected:
vtkPContingencyStatistics();
- ~vtkPContingencyStatistics() VTK_OVERRIDE;
+ ~vtkPContingencyStatistics() override;
/**
* Reduce the collection of local contingency tables to the global one
diff --git a/Filters/ParallelStatistics/vtkPCorrelativeStatistics.h b/Filters/ParallelStatistics/vtkPCorrelativeStatistics.h
index b03c1cf26e22fe9722a8dc84dd72d3ee4b8bf1e6..1b95df80509587de684efffabd6919c97366bcc5 100644
--- a/Filters/ParallelStatistics/vtkPCorrelativeStatistics.h
+++ b/Filters/ParallelStatistics/vtkPCorrelativeStatistics.h
@@ -43,7 +43,7 @@ class VTKFILTERSPARALLELSTATISTICS_EXPORT vtkPCorrelativeStatistics : public vtk
public:
static vtkPCorrelativeStatistics* New();
vtkTypeMacro(vtkPCorrelativeStatistics, vtkCorrelativeStatistics);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -59,7 +59,7 @@ public:
*/
void Learn( vtkTable* inData,
vtkTable* inParameters,
- vtkMultiBlockDataSet* outMeta ) VTK_OVERRIDE;
+ vtkMultiBlockDataSet* outMeta ) override;
/**
* Execute the calculations required by the Test option.
@@ -67,11 +67,11 @@ public:
*/
void Test( vtkTable*,
vtkMultiBlockDataSet*,
- vtkTable* ) VTK_OVERRIDE;
+ vtkTable* ) override;
protected:
vtkPCorrelativeStatistics();
- ~vtkPCorrelativeStatistics() VTK_OVERRIDE;
+ ~vtkPCorrelativeStatistics() override;
vtkMultiProcessController* Controller;
private:
diff --git a/Filters/ParallelStatistics/vtkPDescriptiveStatistics.h b/Filters/ParallelStatistics/vtkPDescriptiveStatistics.h
index f32811502f378ae5529841dbdefe218fbce3566c..928e844c63d3171a1a738b31e13fa018583644fb 100644
--- a/Filters/ParallelStatistics/vtkPDescriptiveStatistics.h
+++ b/Filters/ParallelStatistics/vtkPDescriptiveStatistics.h
@@ -43,7 +43,7 @@ class VTKFILTERSPARALLELSTATISTICS_EXPORT vtkPDescriptiveStatistics : public vtk
public:
static vtkPDescriptiveStatistics* New();
vtkTypeMacro(vtkPDescriptiveStatistics, vtkDescriptiveStatistics);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -59,11 +59,11 @@ public:
*/
void Learn( vtkTable* inData,
vtkTable* inParameters,
- vtkMultiBlockDataSet* outMeta ) VTK_OVERRIDE;
+ vtkMultiBlockDataSet* outMeta ) override;
protected:
vtkPDescriptiveStatistics();
- ~vtkPDescriptiveStatistics() VTK_OVERRIDE;
+ ~vtkPDescriptiveStatistics() override;
vtkMultiProcessController* Controller;
private:
diff --git a/Filters/ParallelStatistics/vtkPKMeansStatistics.h b/Filters/ParallelStatistics/vtkPKMeansStatistics.h
index 8adbb587cf71b479ec469f99ae23b808509d70a0..89b0108a50b0f04425bcfd8bbb3e3c1dbc29c9a8 100644
--- a/Filters/ParallelStatistics/vtkPKMeansStatistics.h
+++ b/Filters/ParallelStatistics/vtkPKMeansStatistics.h
@@ -43,7 +43,7 @@ class VTKFILTERSPARALLELSTATISTICS_EXPORT vtkPKMeansStatistics : public vtkKMean
public:
static vtkPKMeansStatistics* New();
vtkTypeMacro(vtkPKMeansStatistics, vtkKMeansStatistics);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -64,12 +64,12 @@ public:
vtkDoubleArray* error,
vtkIdTypeArray* startRunID,
vtkIdTypeArray* endRunID,
- vtkIntArray *computeRun ) VTK_OVERRIDE;
+ vtkIntArray *computeRun ) override;
/**
* Subroutine to get the total number of data objects.
*/
- vtkIdType GetTotalNumberOfObservations( vtkIdType numObservations ) VTK_OVERRIDE;
+ vtkIdType GetTotalNumberOfObservations( vtkIdType numObservations ) override;
/**
* Subroutine to initialize cluster centerss if not provided by the user.
@@ -78,12 +78,12 @@ public:
vtkIdTypeArray* numberOfClusters,
vtkTable* inData,
vtkTable* curClusterElements,
- vtkTable* newClusterElements) VTK_OVERRIDE;
+ vtkTable* newClusterElements) override;
protected:
vtkPKMeansStatistics();
- ~vtkPKMeansStatistics() VTK_OVERRIDE;
+ ~vtkPKMeansStatistics() override;
vtkMultiProcessController* Controller;
diff --git a/Filters/ParallelStatistics/vtkPMultiCorrelativeStatistics.h b/Filters/ParallelStatistics/vtkPMultiCorrelativeStatistics.h
index b69bbb829c181a1897fe315e3534c8970916bb62..c577d8cfd59a84a21b1ded5c48b38c695f42affc 100644
--- a/Filters/ParallelStatistics/vtkPMultiCorrelativeStatistics.h
+++ b/Filters/ParallelStatistics/vtkPMultiCorrelativeStatistics.h
@@ -42,7 +42,7 @@ class VTKFILTERSPARALLELSTATISTICS_EXPORT vtkPMultiCorrelativeStatistics : publi
public:
static vtkPMultiCorrelativeStatistics* New();
vtkTypeMacro(vtkPMultiCorrelativeStatistics, vtkMultiCorrelativeStatistics);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -61,16 +61,16 @@ public:
protected:
vtkPMultiCorrelativeStatistics();
- ~vtkPMultiCorrelativeStatistics() VTK_OVERRIDE;
+ ~vtkPMultiCorrelativeStatistics() override;
vtkMultiProcessController* Controller;
// Execute the parallel calculations required by the Learn option.
void Learn( vtkTable* inData,
vtkTable* inParameters,
- vtkMultiBlockDataSet* outMeta ) VTK_OVERRIDE;
+ vtkMultiBlockDataSet* outMeta ) override;
- vtkOrderStatistics* CreateOrderStatisticsInstance() VTK_OVERRIDE;
+ vtkOrderStatistics* CreateOrderStatisticsInstance() override;
private:
vtkPMultiCorrelativeStatistics(const vtkPMultiCorrelativeStatistics&) VTK_DELETE_FUNCTION;
diff --git a/Filters/ParallelStatistics/vtkPOrderStatistics.h b/Filters/ParallelStatistics/vtkPOrderStatistics.h
index eced8b74d81ba03d95bca6ffaa75bc7b301d15c0..dfc9e9b3859e3adb8a53f60f28d69d597128be3b 100644
--- a/Filters/ParallelStatistics/vtkPOrderStatistics.h
+++ b/Filters/ParallelStatistics/vtkPOrderStatistics.h
@@ -54,7 +54,7 @@ class VTKFILTERSPARALLELSTATISTICS_EXPORT vtkPOrderStatistics : public vtkOrderS
public:
static vtkPOrderStatistics* New();
vtkTypeMacro(vtkPOrderStatistics, vtkOrderStatistics);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -70,11 +70,11 @@ class VTKFILTERSPARALLELSTATISTICS_EXPORT vtkPOrderStatistics : public vtkOrderS
*/
void Learn( vtkTable*,
vtkTable*,
- vtkMultiBlockDataSet* ) VTK_OVERRIDE;
+ vtkMultiBlockDataSet* ) override;
protected:
vtkPOrderStatistics();
- ~vtkPOrderStatistics() VTK_OVERRIDE;
+ ~vtkPOrderStatistics() override;
/**
* Reduce the collection of local histograms to the global one for data inputs
diff --git a/Filters/ParallelStatistics/vtkPPCAStatistics.h b/Filters/ParallelStatistics/vtkPPCAStatistics.h
index bf48cdcc41df36a4af54fd5096735159bf9f274d..fe47994a7556ef7431498e8814095caf38b8f098 100644
--- a/Filters/ParallelStatistics/vtkPPCAStatistics.h
+++ b/Filters/ParallelStatistics/vtkPPCAStatistics.h
@@ -42,7 +42,7 @@ class VTKFILTERSPARALLELSTATISTICS_EXPORT vtkPPCAStatistics : public vtkPCAStati
{
public:
vtkTypeMacro(vtkPPCAStatistics, vtkPCAStatistics);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkPPCAStatistics* New();
//@{
@@ -57,14 +57,14 @@ public:
protected:
vtkPPCAStatistics();
- ~vtkPPCAStatistics() VTK_OVERRIDE;
+ ~vtkPPCAStatistics() override;
vtkMultiProcessController* Controller;
// Execute the parallel calculations required by the Learn option.
void Learn( vtkTable* inData,
vtkTable* inParameters,
- vtkMultiBlockDataSet* outMeta ) VTK_OVERRIDE;
+ vtkMultiBlockDataSet* outMeta ) override;
/**
* Execute the calculations required by the Test option.
@@ -72,9 +72,9 @@ protected:
*/
void Test( vtkTable*,
vtkMultiBlockDataSet*,
- vtkTable* ) VTK_OVERRIDE;
+ vtkTable* ) override;
- vtkOrderStatistics* CreateOrderStatisticsInstance() VTK_OVERRIDE;
+ vtkOrderStatistics* CreateOrderStatisticsInstance() override;
private:
vtkPPCAStatistics(const vtkPPCAStatistics&) VTK_DELETE_FUNCTION;
diff --git a/Filters/ParallelVerdict/vtkPCellSizeFilter.h b/Filters/ParallelVerdict/vtkPCellSizeFilter.h
index 09ef7975e1182afdf34ca861d1916f1395bfefbb..5c8d76799d09c3ddf601e455ad93f3a0e2ab2bb9 100644
--- a/Filters/ParallelVerdict/vtkPCellSizeFilter.h
+++ b/Filters/ParallelVerdict/vtkPCellSizeFilter.h
@@ -42,13 +42,13 @@ public:
protected:
vtkPCellSizeFilter();
- ~vtkPCellSizeFilter() VTK_OVERRIDE;
+ ~vtkPCellSizeFilter() override;
//@{
/**
* Method to compute the global sum information.
*/
- virtual void ComputeGlobalSum(vtkDoubleArray*) VTK_OVERRIDE;
+ virtual void ComputeGlobalSum(vtkDoubleArray*) override;
//@}
private:
diff --git a/Filters/Points/vtkBoundedPointSource.h b/Filters/Points/vtkBoundedPointSource.h
index 3586a876a1dbb099a48f530749514c05799483d3..e7b2175b569b0d535437b81c7255a80b4b6656d1 100644
--- a/Filters/Points/vtkBoundedPointSource.h
+++ b/Filters/Points/vtkBoundedPointSource.h
@@ -41,7 +41,7 @@ public:
*/
static vtkBoundedPointSource *New();
vtkTypeMacro(vtkBoundedPointSource,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -103,9 +103,9 @@ public:
protected:
vtkBoundedPointSource();
- ~vtkBoundedPointSource() VTK_OVERRIDE {}
+ ~vtkBoundedPointSource() override {}
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
vtkIdType NumberOfPoints;
double Bounds[6];
diff --git a/Filters/Points/vtkDensifyPointCloudFilter.h b/Filters/Points/vtkDensifyPointCloudFilter.h
index 9b99f5be024f3ff610e83f67e2b69555a1a9c129..f87f095cfafdf5e0fd1d3dfb52ae4d17932f91fc 100644
--- a/Filters/Points/vtkDensifyPointCloudFilter.h
+++ b/Filters/Points/vtkDensifyPointCloudFilter.h
@@ -61,7 +61,7 @@ public:
*/
static vtkDensifyPointCloudFilter *New();
vtkTypeMacro(vtkDensifyPointCloudFilter,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
@@ -158,7 +158,7 @@ public:
protected:
vtkDensifyPointCloudFilter();
- ~vtkDensifyPointCloudFilter() VTK_OVERRIDE;
+ ~vtkDensifyPointCloudFilter() override;
// Data members
int NeighborhoodType;
@@ -171,8 +171,8 @@ protected:
// Pipeline management
int RequestData(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ vtkInformationVector *) override;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
private:
vtkDensifyPointCloudFilter(const vtkDensifyPointCloudFilter&) VTK_DELETE_FUNCTION;
diff --git a/Filters/Points/vtkEllipsoidalGaussianKernel.h b/Filters/Points/vtkEllipsoidalGaussianKernel.h
index 2c174b6bf2e1040013f32f2c7a3fcd54ad77f241..03b118f61da219348c8305b3ac0cb8c255b4a4b9 100644
--- a/Filters/Points/vtkEllipsoidalGaussianKernel.h
+++ b/Filters/Points/vtkEllipsoidalGaussianKernel.h
@@ -65,7 +65,7 @@ public:
*/
static vtkEllipsoidalGaussianKernel *New();
vtkTypeMacro(vtkEllipsoidalGaussianKernel,vtkGeneralizedKernel);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
@@ -73,7 +73,7 @@ public:
* vectors.
*/
void Initialize(vtkAbstractPointLocator *loc, vtkDataSet *ds,
- vtkPointData *pd) VTK_OVERRIDE;
+ vtkPointData *pd) override;
// Re-use any superclass signatures that we don't override.
using vtkGeneralizedKernel::ComputeWeights;
@@ -93,7 +93,7 @@ public:
* which all probabilities are considered =1.
*/
vtkIdType ComputeWeights(double x[3], vtkIdList *pIds,
- vtkDoubleArray *prob, vtkDoubleArray *weights) VTK_OVERRIDE;
+ vtkDoubleArray *prob, vtkDoubleArray *weights) override;
//@{
/**
@@ -170,7 +170,7 @@ public:
protected:
vtkEllipsoidalGaussianKernel();
- ~vtkEllipsoidalGaussianKernel() VTK_OVERRIDE;
+ ~vtkEllipsoidalGaussianKernel() override;
bool UseNormals;
bool UseScalars;
@@ -187,7 +187,7 @@ protected:
vtkDataArray *NormalsArray;
vtkDataArray *ScalarsArray;
- void FreeStructures() VTK_OVERRIDE;
+ void FreeStructures() override;
private:
vtkEllipsoidalGaussianKernel(const vtkEllipsoidalGaussianKernel&) VTK_DELETE_FUNCTION;
diff --git a/Filters/Points/vtkEuclideanClusterExtraction.h b/Filters/Points/vtkEuclideanClusterExtraction.h
index 3485c9bc6401b4de1e25b705d493ac418f16d724..59a0bdf169b7c015aaecdbc79bb8b07d5b91af31 100644
--- a/Filters/Points/vtkEuclideanClusterExtraction.h
+++ b/Filters/Points/vtkEuclideanClusterExtraction.h
@@ -71,7 +71,7 @@ class VTKFILTERSPOINTS_EXPORT vtkEuclideanClusterExtraction : public vtkPolyData
{
public:
vtkTypeMacro(vtkEuclideanClusterExtraction,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct with default extraction mode to extract largest clusters.
@@ -191,7 +191,7 @@ public:
protected:
vtkEuclideanClusterExtraction();
- ~vtkEuclideanClusterExtraction() VTK_OVERRIDE;
+ ~vtkEuclideanClusterExtraction() override;
double Radius; //connection radius
bool ColorClusters; //boolean turns on/off scalar gen for separate clusters
@@ -209,8 +209,8 @@ protected:
// Configure the pipeline
int RequestData(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ vtkInformationVector *) override;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
// Internal method for propagating connected waves.
void InsertIntoWave(vtkIdList *wave, vtkIdType ptId);
diff --git a/Filters/Points/vtkExtractHierarchicalBins.h b/Filters/Points/vtkExtractHierarchicalBins.h
index 8ca56c2e84c8f3146c4ae5f53a999298935ce16f..0141b9f2f651d0989730ae95ba2d15bcf809f05b 100644
--- a/Filters/Points/vtkExtractHierarchicalBins.h
+++ b/Filters/Points/vtkExtractHierarchicalBins.h
@@ -57,7 +57,7 @@ public:
*/
static vtkExtractHierarchicalBins *New();
vtkTypeMacro(vtkExtractHierarchicalBins,vtkPointCloudFilter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -97,7 +97,7 @@ public:
protected:
vtkExtractHierarchicalBins();
- ~vtkExtractHierarchicalBins() VTK_OVERRIDE;
+ ~vtkExtractHierarchicalBins() override;
// Users can extract points from a particular level or bin.
int Level;
@@ -105,12 +105,12 @@ protected:
vtkHierarchicalBinningFilter *BinningFilter;
// for the binning filter
- void ReportReferences(vtkGarbageCollector*) VTK_OVERRIDE;
+ void ReportReferences(vtkGarbageCollector*) override;
// All derived classes must implement this method. Note that a side effect of
// the class is to populate the PointMap. Zero is returned if there is a failure.
- int FilterPoints(vtkPointSet *input) VTK_OVERRIDE;
+ int FilterPoints(vtkPointSet *input) override;
private:
vtkExtractHierarchicalBins(const vtkExtractHierarchicalBins&) VTK_DELETE_FUNCTION;
diff --git a/Filters/Points/vtkExtractPointCloudPiece.h b/Filters/Points/vtkExtractPointCloudPiece.h
index 57adfac24936f12a973a48eafd3ecf81067cccff..e4f0c9af1603f576d9bd0bb58e7e5cab6e36cd37 100644
--- a/Filters/Points/vtkExtractPointCloudPiece.h
+++ b/Filters/Points/vtkExtractPointCloudPiece.h
@@ -39,7 +39,7 @@ public:
*/
static vtkExtractPointCloudPiece *New();
vtkTypeMacro(vtkExtractPointCloudPiece, vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -55,11 +55,11 @@ public:
protected:
vtkExtractPointCloudPiece();
- ~vtkExtractPointCloudPiece() VTK_OVERRIDE {}
+ ~vtkExtractPointCloudPiece() override {}
// Usual data generation method
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int RequestUpdateExtent(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int RequestUpdateExtent(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
bool ModuloOrdering;
private:
diff --git a/Filters/Points/vtkExtractPoints.h b/Filters/Points/vtkExtractPoints.h
index 68d922e2eeea4235cd85ac95918db32ae01a8caa..b7f3a4dbf6931fb29b712842e915000a8e2028ec 100644
--- a/Filters/Points/vtkExtractPoints.h
+++ b/Filters/Points/vtkExtractPoints.h
@@ -67,7 +67,7 @@ public:
*/
static vtkExtractPoints *New();
vtkTypeMacro(vtkExtractPoints,vtkPointCloudFilter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -92,18 +92,18 @@ public:
/**
* Return the MTime taking into account changes to the implicit function
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
protected:
vtkExtractPoints();
- ~vtkExtractPoints() VTK_OVERRIDE;
+ ~vtkExtractPoints() override;
vtkImplicitFunction *ImplicitFunction;
bool ExtractInside;
// All derived classes must implement this method. Note that a side effect of
// the class is to populate the PointMap. Zero is returned if there is a failure.
- int FilterPoints(vtkPointSet *input) VTK_OVERRIDE;
+ int FilterPoints(vtkPointSet *input) override;
private:
vtkExtractPoints(const vtkExtractPoints&) VTK_DELETE_FUNCTION;
diff --git a/Filters/Points/vtkExtractSurface.h b/Filters/Points/vtkExtractSurface.h
index 94db5d598be4476f427ae92d9270f6de7c32854d..9103f7f2f7ebd891acf02ce0db1c2c53b99fab40 100644
--- a/Filters/Points/vtkExtractSurface.h
+++ b/Filters/Points/vtkExtractSurface.h
@@ -117,7 +117,7 @@ public:
*/
static vtkExtractSurface *New();
vtkTypeMacro(vtkExtractSurface,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -169,7 +169,7 @@ public:
protected:
vtkExtractSurface();
- ~vtkExtractSurface() VTK_OVERRIDE;
+ ~vtkExtractSurface() override;
double Radius;
bool HoleFilling;
@@ -177,10 +177,10 @@ protected:
int ComputeGradients;
int RequestData(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
int RequestUpdateExtent(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ vtkInformationVector *) override;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
private:
vtkExtractSurface(const vtkExtractSurface&) VTK_DELETE_FUNCTION;
diff --git a/Filters/Points/vtkFitImplicitFunction.h b/Filters/Points/vtkFitImplicitFunction.h
index 20a952b558a6c984ac05a046e90fec6ab91e94f9..09943e0f11f2bf45e9dfb54b6b7c75943c8fa4a8 100644
--- a/Filters/Points/vtkFitImplicitFunction.h
+++ b/Filters/Points/vtkFitImplicitFunction.h
@@ -69,7 +69,7 @@ public:
*/
static vtkFitImplicitFunction *New();
vtkTypeMacro(vtkFitImplicitFunction,vtkPointCloudFilter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -94,18 +94,18 @@ public:
/**
* Return the MTime taking into account changes to the implicit function.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
protected:
vtkFitImplicitFunction();
- ~vtkFitImplicitFunction() VTK_OVERRIDE;
+ ~vtkFitImplicitFunction() override;
vtkImplicitFunction *ImplicitFunction;
double Threshold;
// All derived classes must implement this method. Note that a side effect of
// the class is to populate the PointMap. Zero is returned if there is a failure.
- int FilterPoints(vtkPointSet *input) VTK_OVERRIDE;
+ int FilterPoints(vtkPointSet *input) override;
private:
vtkFitImplicitFunction(const vtkFitImplicitFunction&) VTK_DELETE_FUNCTION;
diff --git a/Filters/Points/vtkGaussianKernel.h b/Filters/Points/vtkGaussianKernel.h
index f126680cab5adc4453969b7703fcff7cdab60c6f..60f236a0db1cb835a7e82a99bb7fa4b1b104cea9 100644
--- a/Filters/Points/vtkGaussianKernel.h
+++ b/Filters/Points/vtkGaussianKernel.h
@@ -53,7 +53,7 @@ public:
*/
static vtkGaussianKernel *New();
vtkTypeMacro(vtkGaussianKernel,vtkGeneralizedKernel);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
@@ -61,7 +61,7 @@ public:
* computational values.
*/
void Initialize(vtkAbstractPointLocator *loc, vtkDataSet *ds,
- vtkPointData *pd) VTK_OVERRIDE;
+ vtkPointData *pd) override;
// Re-use any superclass signatures that we don't override.
using vtkGeneralizedKernel::ComputeWeights;
@@ -81,7 +81,7 @@ public:
* which all probabilities are considered =1.
*/
vtkIdType ComputeWeights(double x[3], vtkIdList *pIds,
- vtkDoubleArray *prob, vtkDoubleArray *weights) VTK_OVERRIDE;
+ vtkDoubleArray *prob, vtkDoubleArray *weights) override;
//@{
/**
@@ -95,7 +95,7 @@ public:
protected:
vtkGaussianKernel();
- ~vtkGaussianKernel() VTK_OVERRIDE;
+ ~vtkGaussianKernel() override;
double Sharpness;
diff --git a/Filters/Points/vtkGeneralizedKernel.h b/Filters/Points/vtkGeneralizedKernel.h
index a334824dd9a33650a8e71f33a1f851480b5a3f2b..0d15944c0128af612191d8b30834f977f20e2e08 100644
--- a/Filters/Points/vtkGeneralizedKernel.h
+++ b/Filters/Points/vtkGeneralizedKernel.h
@@ -75,7 +75,7 @@ public:
* Standard methods for type and printing.
*/
vtkTypeMacro(vtkGeneralizedKernel, vtkInterpolationKernel)
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
@@ -88,7 +88,7 @@ public:
* ComputeWeights(). Note that ptId is optional in most cases, although in
* some kernels it is used to facilitate basis computation.
*/
- vtkIdType ComputeBasis(double x[3], vtkIdList *pIds, vtkIdType ptId=0) VTK_OVERRIDE;
+ vtkIdType ComputeBasis(double x[3], vtkIdList *pIds, vtkIdType ptId=0) override;
/**
* Given a point x, a list of basis points pIds, and a probability
@@ -116,7 +116,7 @@ public:
* invoke ComputeWeights() and provide the interpolation basis points pIds
* directly.
*/
- vtkIdType ComputeWeights(double x[3], vtkIdList *pIds, vtkDoubleArray *weights) VTK_OVERRIDE
+ vtkIdType ComputeWeights(double x[3], vtkIdList *pIds, vtkDoubleArray *weights) override
{
return this->ComputeWeights(x,pIds,nullptr,weights);
}
@@ -181,7 +181,7 @@ public:
protected:
vtkGeneralizedKernel();
- ~vtkGeneralizedKernel() VTK_OVERRIDE;
+ ~vtkGeneralizedKernel() override;
int KernelFootprint;
double Radius;
diff --git a/Filters/Points/vtkHierarchicalBinningFilter.cxx b/Filters/Points/vtkHierarchicalBinningFilter.cxx
index a14c098c60ef5744755b92e646157cbc013492f2..d6e3d0c01db5fa4f846a6d23cbd33e6c2927d298 100644
--- a/Filters/Points/vtkHierarchicalBinningFilter.cxx
+++ b/Filters/Points/vtkHierarchicalBinningFilter.cxx
@@ -340,7 +340,7 @@ struct BinTree : public vtkBinTree
}
// Release allocated memory
- ~BinTree() VTK_OVERRIDE
+ ~BinTree() override
{
delete [] this->Map;
//Offsets data array deleted by superclass
@@ -545,7 +545,7 @@ struct BinTree : public vtkBinTree
}; //ShuffleArray
// Bin the points, produce output
- void Execute(vtkPointSet *input, vtkPolyData *output) VTK_OVERRIDE
+ void Execute(vtkPointSet *input, vtkPolyData *output) override
{
vtkPoints *inPts = input->GetPoints();
void *pts = inPts->GetVoidPointer(0);
@@ -658,7 +658,7 @@ struct BinTree : public vtkBinTree
}//for each candidate array
}
- vtkIdType GetLevelOffset(int level, vtkIdType& npts) VTK_OVERRIDE
+ vtkIdType GetLevelOffset(int level, vtkIdType& npts) override
{
vtkIdType offset = this->Offsets[this->Tree[level]->LevelOffset];
vtkIdType offset2 = this->Offsets[this->Tree[level+1]->LevelOffset];
@@ -667,7 +667,7 @@ struct BinTree : public vtkBinTree
return offset;
}
- vtkIdType GetBinOffset(int globalBin, vtkIdType& npts) VTK_OVERRIDE
+ vtkIdType GetBinOffset(int globalBin, vtkIdType& npts) override
{
vtkIdType offset = this->Offsets[globalBin];
vtkIdType offset2 = this->Offsets[globalBin+1];
@@ -676,7 +676,7 @@ struct BinTree : public vtkBinTree
return offset;
}
- vtkIdType GetLocalBinOffset(int level, int localBin, vtkIdType& npts) VTK_OVERRIDE
+ vtkIdType GetLocalBinOffset(int level, int localBin, vtkIdType& npts) override
{
vtkIdType offset = this->Offsets[this->Tree[level]->LevelOffset] + localBin;
vtkIdType offset2 = this->Offsets[this->Tree[level]->LevelOffset] + localBin + 1;
diff --git a/Filters/Points/vtkHierarchicalBinningFilter.h b/Filters/Points/vtkHierarchicalBinningFilter.h
index 918c8cf1f30f185348c8ca918227cc4a694d41a7..62c3f546476dd0d0912e3b27024e56f783108ae4 100644
--- a/Filters/Points/vtkHierarchicalBinningFilter.h
+++ b/Filters/Points/vtkHierarchicalBinningFilter.h
@@ -87,7 +87,7 @@ public:
*/
static vtkHierarchicalBinningFilter *New();
vtkTypeMacro(vtkHierarchicalBinningFilter,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -189,7 +189,7 @@ public:
protected:
vtkHierarchicalBinningFilter();
- ~vtkHierarchicalBinningFilter() VTK_OVERRIDE;
+ ~vtkHierarchicalBinningFilter() override;
// IVars
int NumberOfLevels;
@@ -202,8 +202,8 @@ protected:
vtkBinTree *Tree;
int RequestData(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ vtkInformationVector *) override;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
private:
vtkHierarchicalBinningFilter(const vtkHierarchicalBinningFilter&) VTK_DELETE_FUNCTION;
diff --git a/Filters/Points/vtkInterpolationKernel.h b/Filters/Points/vtkInterpolationKernel.h
index a96dbb5e84142112f33dc3783a4d1d10bb49cfd8..b9fda4ee40873f4737c6d71429001430cef9926b 100644
--- a/Filters/Points/vtkInterpolationKernel.h
+++ b/Filters/Points/vtkInterpolationKernel.h
@@ -69,7 +69,7 @@ public:
* Standard method for type and printing.
*/
vtkAbstractTypeMacro(vtkInterpolationKernel, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
@@ -122,7 +122,7 @@ public:
protected:
vtkInterpolationKernel();
- ~vtkInterpolationKernel() VTK_OVERRIDE;
+ ~vtkInterpolationKernel() override;
bool RequiresInitialization;
vtkAbstractPointLocator *Locator;
diff --git a/Filters/Points/vtkLinearKernel.h b/Filters/Points/vtkLinearKernel.h
index 67b8f8512c03640efe7fde80bed5965715425c9b..1431055cb867bf422a011279af529754d49a7fc1 100644
--- a/Filters/Points/vtkLinearKernel.h
+++ b/Filters/Points/vtkLinearKernel.h
@@ -44,7 +44,7 @@ public:
*/
static vtkLinearKernel *New();
vtkTypeMacro(vtkLinearKernel,vtkGeneralizedKernel);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
// Re-use any superclass signatures that we don't override.
@@ -65,11 +65,11 @@ public:
* which all probabilities are considered =1.
*/
vtkIdType ComputeWeights(double x[3], vtkIdList *pIds,
- vtkDoubleArray *prob, vtkDoubleArray *weights) VTK_OVERRIDE;
+ vtkDoubleArray *prob, vtkDoubleArray *weights) override;
protected:
vtkLinearKernel();
- ~vtkLinearKernel() VTK_OVERRIDE;
+ ~vtkLinearKernel() override;
private:
vtkLinearKernel(const vtkLinearKernel&) VTK_DELETE_FUNCTION;
diff --git a/Filters/Points/vtkMaskPointsFilter.h b/Filters/Points/vtkMaskPointsFilter.h
index 797cf792b20edad426fae49d7391748ef8de930f..983df1606f5ed3a55ba78056163e1e1ffe7066e9 100644
--- a/Filters/Points/vtkMaskPointsFilter.h
+++ b/Filters/Points/vtkMaskPointsFilter.h
@@ -67,7 +67,7 @@ public:
*/
static vtkMaskPointsFilter *New();
vtkTypeMacro(vtkMaskPointsFilter,vtkPointCloudFilter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -102,16 +102,16 @@ protected:
// All derived classes must implement this method. Note that a side effect of
// the class is to populate the PointMap. Zero is returned if there is a failure.
- int FilterPoints(vtkPointSet *input) VTK_OVERRIDE;
+ int FilterPoints(vtkPointSet *input) override;
// Support second input
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
int RequestData(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
int RequestInformation(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
int RequestUpdateExtent(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
vtkImageData *Mask; //just a placeholder during execution
private:
diff --git a/Filters/Points/vtkPCACurvatureEstimation.h b/Filters/Points/vtkPCACurvatureEstimation.h
index 68bf82108199d6ffd9e9fb6559e5e71fdd8a24ae..fb7d50ca33a7f8f9efb837f15bb2d8d642f9e140 100644
--- a/Filters/Points/vtkPCACurvatureEstimation.h
+++ b/Filters/Points/vtkPCACurvatureEstimation.h
@@ -67,7 +67,7 @@ public:
*/
static vtkPCACurvatureEstimation *New();
vtkTypeMacro(vtkPCACurvatureEstimation,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -93,15 +93,15 @@ public:
protected:
vtkPCACurvatureEstimation();
- ~vtkPCACurvatureEstimation() VTK_OVERRIDE;
+ ~vtkPCACurvatureEstimation() override;
// IVars
int SampleSize;
vtkAbstractPointLocator *Locator;
int RequestData(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ vtkInformationVector *) override;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
private:
vtkPCACurvatureEstimation(const vtkPCACurvatureEstimation&) VTK_DELETE_FUNCTION;
diff --git a/Filters/Points/vtkPCANormalEstimation.h b/Filters/Points/vtkPCANormalEstimation.h
index 714aca80cfd774c2f5492bb3e62eb84b8d6d4023..a7d186d3f77c313187f25d8f2d4b2e5911ed15bc 100644
--- a/Filters/Points/vtkPCANormalEstimation.h
+++ b/Filters/Points/vtkPCANormalEstimation.h
@@ -72,7 +72,7 @@ public:
*/
static vtkPCANormalEstimation *New();
vtkTypeMacro(vtkPCANormalEstimation,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -151,7 +151,7 @@ public:
protected:
vtkPCANormalEstimation();
- ~vtkPCANormalEstimation() VTK_OVERRIDE;
+ ~vtkPCANormalEstimation() override;
// IVars
int SampleSize;
@@ -166,8 +166,8 @@ protected:
// Pipeline management
int RequestData(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ vtkInformationVector *) override;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
private:
vtkPCANormalEstimation(const vtkPCANormalEstimation&) VTK_DELETE_FUNCTION;
diff --git a/Filters/Points/vtkPointCloudFilter.h b/Filters/Points/vtkPointCloudFilter.h
index ee17d66096fce01912676858cfda1cf502bc3f7d..a3d4f5807fb35d3dc6afc8808957c20781f9244e 100644
--- a/Filters/Points/vtkPointCloudFilter.h
+++ b/Filters/Points/vtkPointCloudFilter.h
@@ -71,7 +71,7 @@ public:
* Standard methods to obtain type information, and print information.
*/
vtkTypeMacro(vtkPointCloudFilter,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
@@ -117,7 +117,7 @@ public:
protected:
vtkPointCloudFilter();
- ~vtkPointCloudFilter() VTK_OVERRIDE;
+ ~vtkPointCloudFilter() override;
// All derived classes must implement this method. Note that a side effect of
// the class is to populate the PointMap. Zero is returned on error.
@@ -134,8 +134,8 @@ protected:
bool GenerateVertices;
int RequestData(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ vtkInformationVector *) override;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
void GenerateVerticesIfRequested(vtkPolyData *output);
diff --git a/Filters/Points/vtkPointDensityFilter.h b/Filters/Points/vtkPointDensityFilter.h
index 35acb8e4b84766ba004cf380b0b54bfd6eb3d126..1fba61a8d7fd4b928c735dba6c095829c61b2750 100644
--- a/Filters/Points/vtkPointDensityFilter.h
+++ b/Filters/Points/vtkPointDensityFilter.h
@@ -98,7 +98,7 @@ public:
*/
static vtkPointDensityFilter *New();
vtkTypeMacro(vtkPointDensityFilter,vtkImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -236,7 +236,7 @@ public:
protected:
vtkPointDensityFilter();
- ~vtkPointDensityFilter() VTK_OVERRIDE;
+ ~vtkPointDensityFilter() override;
int SampleDimensions[3]; // dimensions of volume over which to estimate density
double ModelBounds[6]; // bounding box of splatting dimensions
@@ -250,13 +250,13 @@ protected:
bool ComputeGradient; // Compute the gradient vector and magnitude
vtkAbstractPointLocator *Locator; //accelerate point searches
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
int RequestInformation (vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
int RequestData(vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
void ComputeModelBounds(vtkDataSet *input, vtkImageData *output,
vtkInformation *outInfo);
diff --git a/Filters/Points/vtkPointInterpolator.h b/Filters/Points/vtkPointInterpolator.h
index 13bd0d8ef8c9108af29dd52966e7fd349993ef4c..c1ebdf8e19dc9bd90e53453307e0374355b96a9a 100644
--- a/Filters/Points/vtkPointInterpolator.h
+++ b/Filters/Points/vtkPointInterpolator.h
@@ -87,7 +87,7 @@ public:
*/
static vtkPointInterpolator *New();
vtkTypeMacro(vtkPointInterpolator,vtkDataSetAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -268,11 +268,11 @@ public:
/**
* Get the MTime of this object also considering the locator and kernel.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
protected:
vtkPointInterpolator();
- ~vtkPointInterpolator() VTK_OVERRIDE;
+ ~vtkPointInterpolator() override;
vtkAbstractPointLocator *Locator;
vtkInterpolationKernel *Kernel;
@@ -291,11 +291,11 @@ protected:
bool PassFieldArrays;
int RequestData(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
int RequestInformation(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
int RequestUpdateExtent(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
/**
* Virtual for specialized subclass(es)
diff --git a/Filters/Points/vtkPointInterpolator2D.h b/Filters/Points/vtkPointInterpolator2D.h
index acfac88ee472841cca98e5c9f083a0565818f03e..3591e9cd187acfa66749e75f4c0fa62c4c5b7dfe 100644
--- a/Filters/Points/vtkPointInterpolator2D.h
+++ b/Filters/Points/vtkPointInterpolator2D.h
@@ -75,7 +75,7 @@ public:
*/
static vtkPointInterpolator2D *New();
vtkTypeMacro(vtkPointInterpolator2D,vtkPointInterpolator);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -101,7 +101,7 @@ public:
protected:
vtkPointInterpolator2D();
- ~vtkPointInterpolator2D() VTK_OVERRIDE;
+ ~vtkPointInterpolator2D() override;
// Interpolate z values?
bool InterpolateZ;
@@ -110,7 +110,7 @@ protected:
vtkStdString ZArrayName;
// The driver of the algorithm
- void Probe(vtkDataSet *input, vtkDataSet *source, vtkDataSet *output) VTK_OVERRIDE;
+ void Probe(vtkDataSet *input, vtkDataSet *source, vtkDataSet *output) override;
private:
vtkPointInterpolator2D(const vtkPointInterpolator2D&) VTK_DELETE_FUNCTION;
diff --git a/Filters/Points/vtkPointOccupancyFilter.h b/Filters/Points/vtkPointOccupancyFilter.h
index 6f795cb036181febddacc8e021226d8a547cfd9d..b5491386012801ef6961d6138148bac1ab62e4b7 100644
--- a/Filters/Points/vtkPointOccupancyFilter.h
+++ b/Filters/Points/vtkPointOccupancyFilter.h
@@ -55,7 +55,7 @@ public:
*/
static vtkPointOccupancyFilter *New();
vtkTypeMacro(vtkPointOccupancyFilter,vtkImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -101,13 +101,13 @@ protected:
unsigned char EmptyValue; // what value indicates a voxel is empty
unsigned char OccupiedValue; // what value indicates a voxel is occupied
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
int RequestInformation (vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
int RequestData(vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
void ComputeModelBounds(vtkDataSet *input, vtkImageData *output,
vtkInformation *outInfo);
diff --git a/Filters/Points/vtkProbabilisticVoronoiKernel.h b/Filters/Points/vtkProbabilisticVoronoiKernel.h
index 0451a364abb787fc3839435d5c51a9e429229001..3f28e7cada538a86e89969c51d30357b37f7cdd4 100644
--- a/Filters/Points/vtkProbabilisticVoronoiKernel.h
+++ b/Filters/Points/vtkProbabilisticVoronoiKernel.h
@@ -52,7 +52,7 @@ public:
*/
static vtkProbabilisticVoronoiKernel *New();
vtkTypeMacro(vtkProbabilisticVoronoiKernel,vtkGeneralizedKernel);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
// Re-use any superclass signatures that we don't override.
@@ -73,11 +73,11 @@ public:
* which all probabilities are considered =1.
*/
vtkIdType ComputeWeights(double x[3], vtkIdList *pIds,
- vtkDoubleArray *prob, vtkDoubleArray *weights) VTK_OVERRIDE;
+ vtkDoubleArray *prob, vtkDoubleArray *weights) override;
protected:
vtkProbabilisticVoronoiKernel();
- ~vtkProbabilisticVoronoiKernel() VTK_OVERRIDE;
+ ~vtkProbabilisticVoronoiKernel() override;
private:
vtkProbabilisticVoronoiKernel(const vtkProbabilisticVoronoiKernel&) VTK_DELETE_FUNCTION;
diff --git a/Filters/Points/vtkRadiusOutlierRemoval.h b/Filters/Points/vtkRadiusOutlierRemoval.h
index 9c4a8b81bd06502fac63ba111391a9a126dcb32e..198a2b1946d059a2911e5eada8fc82fe1bd4663d 100644
--- a/Filters/Points/vtkRadiusOutlierRemoval.h
+++ b/Filters/Points/vtkRadiusOutlierRemoval.h
@@ -66,7 +66,7 @@ public:
*/
static vtkRadiusOutlierRemoval *New();
vtkTypeMacro(vtkRadiusOutlierRemoval,vtkPointCloudFilter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -98,7 +98,7 @@ public:
protected:
vtkRadiusOutlierRemoval();
- ~vtkRadiusOutlierRemoval() VTK_OVERRIDE;
+ ~vtkRadiusOutlierRemoval() override;
double Radius;
int NumberOfNeighbors;
@@ -106,7 +106,7 @@ protected:
// All derived classes must implement this method. Note that a side effect of
// the class is to populate the PointMap. Zero is returned if there is a failure.
- int FilterPoints(vtkPointSet *input) VTK_OVERRIDE;
+ int FilterPoints(vtkPointSet *input) override;
private:
vtkRadiusOutlierRemoval(const vtkRadiusOutlierRemoval&) VTK_DELETE_FUNCTION;
diff --git a/Filters/Points/vtkSPHCubicKernel.h b/Filters/Points/vtkSPHCubicKernel.h
index a84adcd6e287178f579ec499ae57c36fdf7471f8..04a08c90765167bf838e01fd180fe879175e299f 100644
--- a/Filters/Points/vtkSPHCubicKernel.h
+++ b/Filters/Points/vtkSPHCubicKernel.h
@@ -54,7 +54,7 @@ public:
*/
static vtkSPHCubicKernel *New();
vtkTypeMacro(vtkSPHCubicKernel,vtkSPHKernel);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
@@ -62,13 +62,13 @@ public:
* after setting initial values like SpatialStep.
*/
void Initialize(vtkAbstractPointLocator *loc, vtkDataSet *ds,
- vtkPointData *pd) VTK_OVERRIDE;
+ vtkPointData *pd) override;
//@{
/**
* Compute weighting factor given a normalized distance from a sample point.
*/
- double ComputeFunctionWeight(const double d) VTK_OVERRIDE
+ double ComputeFunctionWeight(const double d) override
{
double tmp1 = 2.0 - std::min(d,2.0);
double tmp2 = 1.0 - std::min(d,1.0);
@@ -81,7 +81,7 @@ public:
* Compute weighting factor for derivative quantities given a normalized
* distance from a sample point.
*/
- double ComputeDerivWeight(const double d) VTK_OVERRIDE
+ double ComputeDerivWeight(const double d) override
{
double tmp1 = 2.0 - std::min(d,2.0);
double tmp2 = 1.0 - std::min(d,1.0);
@@ -91,7 +91,7 @@ public:
protected:
vtkSPHCubicKernel();
- ~vtkSPHCubicKernel() VTK_OVERRIDE;
+ ~vtkSPHCubicKernel() override;
private:
vtkSPHCubicKernel(const vtkSPHCubicKernel&) VTK_DELETE_FUNCTION;
diff --git a/Filters/Points/vtkSPHInterpolator.h b/Filters/Points/vtkSPHInterpolator.h
index 81e89c340fc54dd7a7f9802905a9ca4e51deea47..7638bc0821df0eb98c4feb8d3e80dc535b68b7e2 100644
--- a/Filters/Points/vtkSPHInterpolator.h
+++ b/Filters/Points/vtkSPHInterpolator.h
@@ -100,7 +100,7 @@ public:
*/
static vtkSPHInterpolator *New();
vtkTypeMacro(vtkSPHInterpolator,vtkDataSetAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -378,11 +378,11 @@ public:
/**
* Get the MTime of this object also considering the locator and kernel.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
protected:
vtkSPHInterpolator();
- ~vtkSPHInterpolator() VTK_OVERRIDE;
+ ~vtkSPHInterpolator() override;
vtkAbstractPointLocator *Locator;
vtkSPHKernel *Kernel;
@@ -411,11 +411,11 @@ protected:
bool PassFieldArrays;
int RequestData(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
int RequestInformation(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
int RequestUpdateExtent(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
/**
* Virtual for specialized subclass(es)
diff --git a/Filters/Points/vtkSPHKernel.h b/Filters/Points/vtkSPHKernel.h
index 62d2cbc57f3b0a2bc43523b8c6404e1e9a85e525..b2e2326f7de56b73e99f24ee45fe89357a29684e 100644
--- a/Filters/Points/vtkSPHKernel.h
+++ b/Filters/Points/vtkSPHKernel.h
@@ -73,7 +73,7 @@ public:
* Standard methods for instantiation, obtaining type information, and printing.
*/
vtkTypeMacro(vtkSPHKernel,vtkInterpolationKernel);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -135,7 +135,7 @@ public:
* after setting initial values like SpatialStep.
*/
void Initialize(vtkAbstractPointLocator *loc, vtkDataSet *ds,
- vtkPointData *pd) VTK_OVERRIDE;
+ vtkPointData *pd) override;
/**
* Given a point x (and optional associated ptId), determine the points
@@ -145,14 +145,14 @@ public:
* is called before ComputeWeights(). Note that while ptId is optional in most
* cases, if a cutoff array is provided, then ptId must be provided.
*/
- vtkIdType ComputeBasis(double x[3], vtkIdList *pIds, vtkIdType ptId=0) VTK_OVERRIDE;
+ vtkIdType ComputeBasis(double x[3], vtkIdList *pIds, vtkIdType ptId=0) override;
/**
* Given a point x, and a list of basis points pIds, compute interpolation
* weights associated with these basis points.
*/
vtkIdType ComputeWeights(double x[3], vtkIdList *pIds,
- vtkDoubleArray *weights) VTK_OVERRIDE;
+ vtkDoubleArray *weights) override;
/**
* Given a point x, and a list of basis points pIds, compute interpolation
@@ -185,7 +185,7 @@ public:
protected:
vtkSPHKernel();
- ~vtkSPHKernel() VTK_OVERRIDE;
+ ~vtkSPHKernel() override;
// Instance variables
double SpatialStep; //also known as smoothing length h
diff --git a/Filters/Points/vtkSPHQuarticKernel.h b/Filters/Points/vtkSPHQuarticKernel.h
index 37dd6893fedbb9871176ae91892cd8edaf62525a..db94b7c7137d00bd1c6d70094c9e2f6d3d52c2d1 100644
--- a/Filters/Points/vtkSPHQuarticKernel.h
+++ b/Filters/Points/vtkSPHQuarticKernel.h
@@ -54,7 +54,7 @@ public:
*/
static vtkSPHQuarticKernel *New();
vtkTypeMacro(vtkSPHQuarticKernel,vtkSPHKernel);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
@@ -62,13 +62,13 @@ public:
* after setting initial values like SpatialStep.
*/
void Initialize(vtkAbstractPointLocator *loc, vtkDataSet *ds,
- vtkPointData *pd) VTK_OVERRIDE;
+ vtkPointData *pd) override;
//@{
/**
* Compute weighting factor given a normalized distance from a sample point.
*/
- double ComputeFunctionWeight(const double d) VTK_OVERRIDE
+ double ComputeFunctionWeight(const double d) override
{
double tmp1 = 2.5 - std::min(d,2.5);
double tmp2 = 1.5 - std::min(d,1.5);
@@ -83,7 +83,7 @@ public:
* Compute weighting factor for derivative quantities given a normalized
* distance from a sample point.
*/
- double ComputeDerivWeight(const double d) VTK_OVERRIDE
+ double ComputeDerivWeight(const double d) override
{
double tmp1 = 2.5 - std::min(d,2.5);
double tmp2 = 1.5 - std::min(d,1.5);
@@ -94,7 +94,7 @@ public:
protected:
vtkSPHQuarticKernel();
- ~vtkSPHQuarticKernel() VTK_OVERRIDE;
+ ~vtkSPHQuarticKernel() override;
private:
vtkSPHQuarticKernel(const vtkSPHQuarticKernel&) VTK_DELETE_FUNCTION;
diff --git a/Filters/Points/vtkSPHQuinticKernel.h b/Filters/Points/vtkSPHQuinticKernel.h
index 6db319307ae13c19fa49a1a4516c14bf9b7cddfc..e22222717d5a2efe5848fa2fcc72210800f685b9 100644
--- a/Filters/Points/vtkSPHQuinticKernel.h
+++ b/Filters/Points/vtkSPHQuinticKernel.h
@@ -54,7 +54,7 @@ public:
*/
static vtkSPHQuinticKernel *New();
vtkTypeMacro(vtkSPHQuinticKernel,vtkSPHKernel);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
@@ -62,13 +62,13 @@ public:
* after setting initial values like SpatialStep.
*/
void Initialize(vtkAbstractPointLocator *loc, vtkDataSet *ds,
- vtkPointData *pd) VTK_OVERRIDE;
+ vtkPointData *pd) override;
//@{
/**
* Compute weighting factor given a normalized distance from a sample point.
*/
- double ComputeFunctionWeight(const double d) VTK_OVERRIDE
+ double ComputeFunctionWeight(const double d) override
{
double tmp1 = 3.0 - std::min(d,3.0);
double tmp2 = 2.0 - std::min(d,2.0);
@@ -83,7 +83,7 @@ public:
* Compute weighting factor for derivative quantities given a normalized
* distance from a sample point.
*/
- double ComputeDerivWeight(const double d) VTK_OVERRIDE
+ double ComputeDerivWeight(const double d) override
{
double tmp1 = 3.0 - std::min(d,3.0);
double tmp2 = 2.0 - std::min(d,2.0);
@@ -95,7 +95,7 @@ public:
protected:
vtkSPHQuinticKernel();
- ~vtkSPHQuinticKernel() VTK_OVERRIDE;
+ ~vtkSPHQuinticKernel() override;
private:
vtkSPHQuinticKernel(const vtkSPHQuinticKernel&) VTK_DELETE_FUNCTION;
diff --git a/Filters/Points/vtkShepardKernel.h b/Filters/Points/vtkShepardKernel.h
index 0145331d687575c91f4b8490dbdc773b1bc06ef0..a63652658212ea23e1e40e15ff245fb2d07a9fdc 100644
--- a/Filters/Points/vtkShepardKernel.h
+++ b/Filters/Points/vtkShepardKernel.h
@@ -51,7 +51,7 @@ public:
*/
static vtkShepardKernel *New();
vtkTypeMacro(vtkShepardKernel,vtkGeneralizedKernel);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
// Re-use any superclass signatures that we don't override.
@@ -72,7 +72,7 @@ public:
* which all probabilities are considered =1.
*/
vtkIdType ComputeWeights(double x[3], vtkIdList *pIds,
- vtkDoubleArray *prob, vtkDoubleArray *weights) VTK_OVERRIDE;
+ vtkDoubleArray *prob, vtkDoubleArray *weights) override;
//@{
/**
@@ -85,7 +85,7 @@ public:
protected:
vtkShepardKernel();
- ~vtkShepardKernel() VTK_OVERRIDE;
+ ~vtkShepardKernel() override;
// The exponent of the weights, =2 by default (l2 norm)
double PowerParameter;
diff --git a/Filters/Points/vtkSignedDistance.h b/Filters/Points/vtkSignedDistance.h
index 1af310b256102d911ef82b4a39b0665c3c9b3ac0..88abd9e5b47cb124ea8ebe8f313af0f6e38c54b6 100644
--- a/Filters/Points/vtkSignedDistance.h
+++ b/Filters/Points/vtkSignedDistance.h
@@ -86,7 +86,7 @@ public:
*/
static vtkSignedDistance *New();
vtkTypeMacro(vtkSignedDistance,vtkImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -153,11 +153,11 @@ public:
// See the vtkAlgorithm for a desciption of what these do
int ProcessRequest(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
protected:
vtkSignedDistance();
- ~vtkSignedDistance() VTK_OVERRIDE;
+ ~vtkSignedDistance() override;
int Dimensions[3];
double Bounds[6];
@@ -169,10 +169,10 @@ protected:
int RequestInformation (vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
int RequestData (vtkInformation *,
- vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
+ vtkInformationVector **, vtkInformationVector *) override;
+ int FillInputPortInformation(int, vtkInformation*) override;
private:
vtkSignedDistance(const vtkSignedDistance&) VTK_DELETE_FUNCTION;
diff --git a/Filters/Points/vtkStatisticalOutlierRemoval.h b/Filters/Points/vtkStatisticalOutlierRemoval.h
index e41fb485cd4832da294aa65f423c05ef4eee2501..bec11a7223c9a3e673907654d84abb854f266afa 100644
--- a/Filters/Points/vtkStatisticalOutlierRemoval.h
+++ b/Filters/Points/vtkStatisticalOutlierRemoval.h
@@ -67,7 +67,7 @@ public:
*/
static vtkStatisticalOutlierRemoval *New();
vtkTypeMacro(vtkStatisticalOutlierRemoval,vtkPointCloudFilter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -121,7 +121,7 @@ public:
protected:
vtkStatisticalOutlierRemoval();
- ~vtkStatisticalOutlierRemoval() VTK_OVERRIDE;
+ ~vtkStatisticalOutlierRemoval() override;
int SampleSize;
double StandardDeviationFactor;
@@ -133,7 +133,7 @@ protected:
// All derived classes must implement this method. Note that a side effect of
// the class is to populate the PointMap. Zero is returned if there is a failure.
- int FilterPoints(vtkPointSet *input) VTK_OVERRIDE;
+ int FilterPoints(vtkPointSet *input) override;
private:
vtkStatisticalOutlierRemoval(const vtkStatisticalOutlierRemoval&) VTK_DELETE_FUNCTION;
diff --git a/Filters/Points/vtkUnsignedDistance.h b/Filters/Points/vtkUnsignedDistance.h
index 05dc224897496f4f0012eaa08e1d77e79a43ef84..545b79020ad03f73186bac0a1a88a81d0261aae2 100644
--- a/Filters/Points/vtkUnsignedDistance.h
+++ b/Filters/Points/vtkUnsignedDistance.h
@@ -83,7 +83,7 @@ public:
*/
static vtkUnsignedDistance *New();
vtkTypeMacro(vtkUnsignedDistance,vtkImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -202,11 +202,11 @@ public:
// See the vtkAlgorithm for a desciption of what these do
int ProcessRequest(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
protected:
vtkUnsignedDistance();
- ~vtkUnsignedDistance() VTK_OVERRIDE;
+ ~vtkUnsignedDistance() override;
int Dimensions[3];
double Bounds[6];
@@ -223,10 +223,10 @@ protected:
int RequestInformation (vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
int RequestData (vtkInformation *,
- vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
+ vtkInformationVector **, vtkInformationVector *) override;
+ int FillInputPortInformation(int, vtkInformation*) override;
private:
vtkUnsignedDistance(const vtkUnsignedDistance&) VTK_DELETE_FUNCTION;
diff --git a/Filters/Points/vtkVoronoiKernel.h b/Filters/Points/vtkVoronoiKernel.h
index 162b96dd5a946f5f71cdc6bfe34fc5d6868f8393..7825c09611324c599cb825ef0b41028e828c5c09 100644
--- a/Filters/Points/vtkVoronoiKernel.h
+++ b/Filters/Points/vtkVoronoiKernel.h
@@ -48,7 +48,7 @@ public:
*/
static vtkVoronoiKernel *New();
vtkTypeMacro(vtkVoronoiKernel,vtkInterpolationKernel);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
@@ -58,7 +58,7 @@ public:
* method returns the number of points in the basis. Typically this method
* is called before ComputeWeights().
*/
- vtkIdType ComputeBasis(double x[3], vtkIdList *pIds, vtkIdType ptId=0) VTK_OVERRIDE;
+ vtkIdType ComputeBasis(double x[3], vtkIdList *pIds, vtkIdType ptId=0) override;
/**
* Given a point x, and a list of basis points pIds, compute interpolation
@@ -70,11 +70,11 @@ public:
* directly.
*/
vtkIdType ComputeWeights(double x[3], vtkIdList *pIds,
- vtkDoubleArray *weights) VTK_OVERRIDE;
+ vtkDoubleArray *weights) override;
protected:
vtkVoronoiKernel();
- ~vtkVoronoiKernel() VTK_OVERRIDE;
+ ~vtkVoronoiKernel() override;
private:
vtkVoronoiKernel(const vtkVoronoiKernel&) VTK_DELETE_FUNCTION;
diff --git a/Filters/Points/vtkVoxelGrid.h b/Filters/Points/vtkVoxelGrid.h
index bd956b0744be4f768bd6a04d4bd6e23b0d5703b5..9921c0cd7d4b12d67babf0dc1c7a976dbe7d9bd9 100644
--- a/Filters/Points/vtkVoxelGrid.h
+++ b/Filters/Points/vtkVoxelGrid.h
@@ -64,7 +64,7 @@ public:
*/
static vtkVoxelGrid *New();
vtkTypeMacro(vtkVoxelGrid,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
@@ -141,7 +141,7 @@ public:
protected:
vtkVoxelGrid();
- ~vtkVoxelGrid() VTK_OVERRIDE;
+ ~vtkVoxelGrid() override;
vtkStaticPointLocator *Locator;
int ConfigurationStyle;
@@ -152,8 +152,8 @@ protected:
vtkInterpolationKernel *Kernel;
int RequestData(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ vtkInformationVector *) override;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
private:
vtkVoxelGrid(const vtkVoxelGrid&) VTK_DELETE_FUNCTION;
diff --git a/Filters/Points/vtkWendlandQuinticKernel.h b/Filters/Points/vtkWendlandQuinticKernel.h
index 8ee2235cb5458ec5eabbe2aa5b3023b64739b282..c15aa9cbbf9b120c4ed174e3c89c2ea342315776 100644
--- a/Filters/Points/vtkWendlandQuinticKernel.h
+++ b/Filters/Points/vtkWendlandQuinticKernel.h
@@ -54,7 +54,7 @@ public:
*/
static vtkWendlandQuinticKernel *New();
vtkTypeMacro(vtkWendlandQuinticKernel,vtkSPHKernel);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
@@ -62,7 +62,7 @@ public:
* after setting initial values like SpatialStep.
*/
void Initialize(vtkAbstractPointLocator *loc, vtkDataSet *ds,
- vtkPointData *pd) VTK_OVERRIDE;
+ vtkPointData *pd) override;
//@{
/**
@@ -70,7 +70,7 @@ public:
* Note that the formulation is slightly different to avoid an extra operation
* (which has the effect of affecting the NormFactor by 1/16).
*/
- double ComputeFunctionWeight(const double d) VTK_OVERRIDE
+ double ComputeFunctionWeight(const double d) override
{
if ( d >= 2.0 )
{
@@ -89,7 +89,7 @@ public:
* Compute weighting factor for derivative quantities given a normalized
* distance from a sample point.
*/
- double ComputeDerivWeight(const double d) VTK_OVERRIDE
+ double ComputeDerivWeight(const double d) override
{
if ( d >= 2.0 )
{
@@ -106,7 +106,7 @@ public:
protected:
vtkWendlandQuinticKernel();
- ~vtkWendlandQuinticKernel() VTK_OVERRIDE;
+ ~vtkWendlandQuinticKernel() override;
private:
vtkWendlandQuinticKernel(const vtkWendlandQuinticKernel&) VTK_DELETE_FUNCTION;
diff --git a/Filters/Programmable/vtkProgrammableAttributeDataFilter.h b/Filters/Programmable/vtkProgrammableAttributeDataFilter.h
index ba11bcaeb87e7359b0a797cf89063fd483997716..a03fd4c6a5609c408168123589472d0568de5398 100644
--- a/Filters/Programmable/vtkProgrammableAttributeDataFilter.h
+++ b/Filters/Programmable/vtkProgrammableAttributeDataFilter.h
@@ -87,7 +87,7 @@ class VTKFILTERSPROGRAMMABLE_EXPORT vtkProgrammableAttributeDataFilter : public
public:
static vtkProgrammableAttributeDataFilter *New();
vtkTypeMacro(vtkProgrammableAttributeDataFilter,vtkDataSetAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Add a dataset to the list of data to process.
@@ -128,15 +128,15 @@ public:
protected:
vtkProgrammableAttributeDataFilter();
- ~vtkProgrammableAttributeDataFilter() VTK_OVERRIDE;
+ ~vtkProgrammableAttributeDataFilter() override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
vtkDataSetCollection *InputList; //list of datasets to process
ProgrammableMethodCallbackType ExecuteMethod; //function to invoke
ProgrammableMethodCallbackType ExecuteMethodArgDelete;
void *ExecuteMethodArg;
- void ReportReferences(vtkGarbageCollector*) VTK_OVERRIDE;
+ void ReportReferences(vtkGarbageCollector*) override;
private:
// hide the superclass' AddInput() from the user and the compiler
diff --git a/Filters/Programmable/vtkProgrammableFilter.h b/Filters/Programmable/vtkProgrammableFilter.h
index 36916d773b2cf7c9fafc3d4ae73cdfc9f889491e..eb43f3538d07d88748cf0ba927fa9bf0ed507ecc 100644
--- a/Filters/Programmable/vtkProgrammableFilter.h
+++ b/Filters/Programmable/vtkProgrammableFilter.h
@@ -51,7 +51,7 @@ class VTKFILTERSPROGRAMMABLE_EXPORT vtkProgrammableFilter : public vtkPassInputT
public:
static vtkProgrammableFilter *New();
vtkTypeMacro(vtkProgrammableFilter,vtkPassInputTypeAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Signature definition for programmable method callbacks. Methods passed to
@@ -126,10 +126,10 @@ public:
protected:
vtkProgrammableFilter();
- ~vtkProgrammableFilter() VTK_OVERRIDE;
+ ~vtkProgrammableFilter() override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
ProgrammableMethodCallbackType ExecuteMethod; //function to invoke
ProgrammableMethodCallbackType ExecuteMethodArgDelete;
diff --git a/Filters/Programmable/vtkProgrammableGlyphFilter.h b/Filters/Programmable/vtkProgrammableGlyphFilter.h
index 6939e401344429220cabc821a26c305496626b57..f7ee4ca3396e7d51d416c0c02680ef44a0be2766 100644
--- a/Filters/Programmable/vtkProgrammableGlyphFilter.h
+++ b/Filters/Programmable/vtkProgrammableGlyphFilter.h
@@ -73,7 +73,7 @@ class VTKFILTERSPROGRAMMABLE_EXPORT vtkProgrammableGlyphFilter : public vtkPolyD
{
public:
vtkTypeMacro(vtkProgrammableGlyphFilter,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct object with nullptr GlyphMethod() and no source object. The ColorMode
@@ -159,10 +159,10 @@ public:
protected:
vtkProgrammableGlyphFilter();
- ~vtkProgrammableGlyphFilter() VTK_OVERRIDE;
+ ~vtkProgrammableGlyphFilter() override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int, vtkInformation *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int FillInputPortInformation(int, vtkInformation *) override;
double Point[3]; // Coordinates of point
vtkIdType PointId; // Current point id during processing
diff --git a/Filters/Python/vtkPythonAlgorithm.h b/Filters/Python/vtkPythonAlgorithm.h
index 4616241a3a344a5d40f5be6b9db38977b0401c09..7a8862273955401146e724da3be5870062f1cc05 100644
--- a/Filters/Python/vtkPythonAlgorithm.h
+++ b/Filters/Python/vtkPythonAlgorithm.h
@@ -52,7 +52,7 @@ class VTKFILTERSPYTHON_EXPORT vtkPythonAlgorithm : public vtkAlgorithm
public:
static vtkPythonAlgorithm *New();
vtkTypeMacro(vtkPythonAlgorithm, vtkAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Specify the Python object to use to operate on the data. A reference will
@@ -67,13 +67,13 @@ public:
* Set the number of input ports used by the algorithm.
* This is made public so that it can be called from Python.
*/
- void SetNumberOfInputPorts(int n) VTK_OVERRIDE;
+ void SetNumberOfInputPorts(int n) override;
/**
* Set the number of output ports provided by the algorithm.
* This is made public so that it can be called from Python.
*/
- void SetNumberOfOutputPorts(int n) VTK_OVERRIDE;
+ void SetNumberOfOutputPorts(int n) override;
protected:
vtkPythonAlgorithm();
@@ -81,9 +81,9 @@ protected:
int ProcessRequest(vtkInformation* request,
vtkInformationVector** inInfo,
- vtkInformationVector* outInfo) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
- int FillOutputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ vtkInformationVector* outInfo) override;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
+ int FillOutputPortInformation(int port, vtkInformation* info) override;
private:
vtkPythonAlgorithm(const vtkPythonAlgorithm&) VTK_DELETE_FUNCTION;
diff --git a/Filters/SMP/vtkSMPContourGrid.h b/Filters/SMP/vtkSMPContourGrid.h
index f82b31c2eed4440825362ed1af611760b8022fe8..5a19586c5e54f383070e7c065763e21b64b2da1e 100644
--- a/Filters/SMP/vtkSMPContourGrid.h
+++ b/Filters/SMP/vtkSMPContourGrid.h
@@ -30,7 +30,7 @@ class VTKFILTERSSMP_EXPORT vtkSMPContourGrid : public vtkContourGrid
{
public:
vtkTypeMacro(vtkSMPContourGrid,vtkContourGrid);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Constructor.
@@ -57,16 +57,16 @@ public:
*/
int ProcessRequest(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
protected:
vtkSMPContourGrid();
- ~vtkSMPContourGrid() VTK_OVERRIDE;
+ ~vtkSMPContourGrid() override;
virtual int RequestDataObject(vtkInformation *, vtkInformationVector **, vtkInformationVector *);
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
- int FillOutputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillOutputPortInformation(int port, vtkInformation* info) override;
bool MergePieces;
diff --git a/Filters/SMP/vtkSMPContourGridManyPieces.h b/Filters/SMP/vtkSMPContourGridManyPieces.h
index ef55c3690ec42ac7148b1dca2793eb0150e468a0..597cd8e2a0be1dc42abd1125a01582fecb675cfe 100644
--- a/Filters/SMP/vtkSMPContourGridManyPieces.h
+++ b/Filters/SMP/vtkSMPContourGridManyPieces.h
@@ -36,7 +36,7 @@ class VTKFILTERSSMP_EXPORT vtkSMPContourGridManyPieces : public vtkContourGrid
{
public:
vtkTypeMacro(vtkSMPContourGridManyPieces,vtkContourGrid);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Constructor.
@@ -45,11 +45,11 @@ public:
protected:
vtkSMPContourGridManyPieces();
- ~vtkSMPContourGridManyPieces() VTK_OVERRIDE;
+ ~vtkSMPContourGridManyPieces() override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
- int FillOutputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillOutputPortInformation(int port, vtkInformation* info) override;
private:
vtkSMPContourGridManyPieces(const vtkSMPContourGridManyPieces&) VTK_DELETE_FUNCTION;
diff --git a/Filters/SMP/vtkSMPMergePoints.h b/Filters/SMP/vtkSMPMergePoints.h
index 07c645e8e07a197e3c07a5b48b1894db30933ce6..fa5f5bd349f782c83d2ff549ea4b158e04e7d948 100644
--- a/Filters/SMP/vtkSMPMergePoints.h
+++ b/Filters/SMP/vtkSMPMergePoints.h
@@ -43,7 +43,7 @@ class VTKFILTERSSMP_EXPORT vtkSMPMergePoints : public vtkMergePoints
public:
vtkTypeMacro(vtkSMPMergePoints, vtkMergePoints);
static vtkSMPMergePoints* New();
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
/**
* This should be called from 1 thread before any call to Merge.
@@ -101,14 +101,14 @@ public:
/**
* Returns the number of bins.
*/
- vtkIdType GetNumberOfBuckets() VTK_OVERRIDE
+ vtkIdType GetNumberOfBuckets() override
{
return this->NumberOfBuckets;
}
protected:
vtkSMPMergePoints();
- ~vtkSMPMergePoints() VTK_OVERRIDE;
+ ~vtkSMPMergePoints() override;
vtkAtomicIdType AtomicInsertionId;
diff --git a/Filters/SMP/vtkSMPTransform.h b/Filters/SMP/vtkSMPTransform.h
index 4b45d4a6bcfa0c125c1f9a5d7d2118b934dde499..1422ac94dd07665327543fbb3b5c698c35f8204a 100644
--- a/Filters/SMP/vtkSMPTransform.h
+++ b/Filters/SMP/vtkSMPTransform.h
@@ -36,25 +36,25 @@ class VTKFILTERSSMP_EXPORT vtkSMPTransform : public vtkTransform
public:
static vtkSMPTransform *New();
vtkTypeMacro(vtkSMPTransform, vtkTransform);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Apply the transformation to a series of points, and append the
* results to outPts.
*/
- void TransformPoints(vtkPoints *inPts, vtkPoints *outPts) VTK_OVERRIDE;
+ void TransformPoints(vtkPoints *inPts, vtkPoints *outPts) override;
/**
* Apply the transformation to a series of normals, and append the
* results to outNms.
*/
- void TransformNormals(vtkDataArray *inNms, vtkDataArray *outNms) VTK_OVERRIDE;
+ void TransformNormals(vtkDataArray *inNms, vtkDataArray *outNms) override;
/**
* Apply the transformation to a series of vectors, and append the
* results to outVrs.
*/
- void TransformVectors(vtkDataArray *inVrs, vtkDataArray *outVrs) VTK_OVERRIDE;
+ void TransformVectors(vtkDataArray *inVrs, vtkDataArray *outVrs) override;
/**
* Apply the transformation to a combination of points, normals
@@ -65,11 +65,11 @@ class VTKFILTERSSMP_EXPORT vtkSMPTransform : public vtkTransform
vtkDataArray *inNms,
vtkDataArray *outNms,
vtkDataArray *inVrs,
- vtkDataArray *outVrs) VTK_OVERRIDE;
+ vtkDataArray *outVrs) override;
protected:
vtkSMPTransform ();
- ~vtkSMPTransform () VTK_OVERRIDE {}
+ ~vtkSMPTransform () override {}
private:
vtkSMPTransform (const vtkSMPTransform&) VTK_DELETE_FUNCTION;
diff --git a/Filters/SMP/vtkSMPWarpVector.h b/Filters/SMP/vtkSMPWarpVector.h
index a508aea74a60931aef5ce6a6570bcfc7300147c0..96b4474db51d1751cc40fe3dfcff7c742370c430 100644
--- a/Filters/SMP/vtkSMPWarpVector.h
+++ b/Filters/SMP/vtkSMPWarpVector.h
@@ -34,11 +34,11 @@ class VTKFILTERSSMP_EXPORT vtkSMPWarpVector : public vtkWarpVector
public :
vtkTypeMacro(vtkSMPWarpVector,vtkWarpVector);
static vtkSMPWarpVector *New();
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected :
vtkSMPWarpVector();
- ~vtkSMPWarpVector() VTK_OVERRIDE;
+ ~vtkSMPWarpVector() override;
/**
@@ -46,7 +46,7 @@ protected :
*/
int RequestData(vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
private :
vtkSMPWarpVector(const vtkSMPWarpVector&) VTK_DELETE_FUNCTION;
diff --git a/Filters/SMP/vtkThreadedSynchronizedTemplates3D.h b/Filters/SMP/vtkThreadedSynchronizedTemplates3D.h
index 31a4e5e7b8a5012424c6d9fda7d50cfff0d55d44..8551eeabd00f615599f2af555a6767a25af18889 100644
--- a/Filters/SMP/vtkThreadedSynchronizedTemplates3D.h
+++ b/Filters/SMP/vtkThreadedSynchronizedTemplates3D.h
@@ -44,12 +44,12 @@ public:
static vtkThreadedSynchronizedTemplates3D *New();
vtkTypeMacro(vtkThreadedSynchronizedTemplates3D,vtkMultiBlockDataSetAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Because we delegate to vtkContourValues
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
//@{
/**
@@ -174,16 +174,16 @@ public:
protected:
vtkThreadedSynchronizedTemplates3D();
- ~vtkThreadedSynchronizedTemplates3D() VTK_OVERRIDE;
+ ~vtkThreadedSynchronizedTemplates3D() override;
int ComputeNormals;
int ComputeGradients;
int ComputeScalars;
vtkContourValues *ContourValues;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int RequestUpdateExtent(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int RequestUpdateExtent(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
int ArrayComponent;
diff --git a/Filters/SMP/vtkThreadedSynchronizedTemplatesCutter3D.h b/Filters/SMP/vtkThreadedSynchronizedTemplatesCutter3D.h
index faef66f358c6aa4d25b92890a35b71b0f627f774..4e45c0b8329a61085d84723bb563880de3f4a520 100644
--- a/Filters/SMP/vtkThreadedSynchronizedTemplatesCutter3D.h
+++ b/Filters/SMP/vtkThreadedSynchronizedTemplatesCutter3D.h
@@ -39,7 +39,7 @@ public:
static vtkThreadedSynchronizedTemplatesCutter3D *New();
vtkTypeMacro(vtkThreadedSynchronizedTemplatesCutter3D,vtkThreadedSynchronizedTemplates3D);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Needed by templated functions.
@@ -68,20 +68,20 @@ public:
* Override GetMTime because we delegate to vtkContourValues and refer to
* vtkImplicitFunction.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
protected:
vtkThreadedSynchronizedTemplatesCutter3D();
- ~vtkThreadedSynchronizedTemplatesCutter3D() VTK_OVERRIDE;
+ ~vtkThreadedSynchronizedTemplatesCutter3D() override;
vtkImplicitFunction *CutFunction;
int OutputPointsPrecision;
int RequestData(vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
- int FillOutputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillOutputPortInformation(int port, vtkInformation* info) override;
private:
vtkThreadedSynchronizedTemplatesCutter3D(const vtkThreadedSynchronizedTemplatesCutter3D&) VTK_DELETE_FUNCTION;
void operator=(const vtkThreadedSynchronizedTemplatesCutter3D&) VTK_DELETE_FUNCTION;
diff --git a/Filters/Selection/vtkCellDistanceSelector.h b/Filters/Selection/vtkCellDistanceSelector.h
index a9c0d3e169f025abc3ea799df05c8308c39a85e1..6c4fd8d019bb74c9f79a35a3325b0d07e291391e 100644
--- a/Filters/Selection/vtkCellDistanceSelector.h
+++ b/Filters/Selection/vtkCellDistanceSelector.h
@@ -52,7 +52,7 @@ class VTKFILTERSSELECTION_EXPORT vtkCellDistanceSelector : public vtkSelectionAl
{
public:
vtkTypeMacro(vtkCellDistanceSelector,vtkSelectionAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
static vtkCellDistanceSelector* New();
@@ -118,12 +118,12 @@ class VTKFILTERSSELECTION_EXPORT vtkCellDistanceSelector : public vtkSelectionAl
protected:
vtkCellDistanceSelector ();
- ~vtkCellDistanceSelector () VTK_OVERRIDE;
+ ~vtkCellDistanceSelector () override;
void AddSelectionNode(vtkSelection* output, vtkSmartPointer<vtkDataArray> outIndices, int partNumber, int d);
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
- int RequestData(vtkInformation*,vtkInformationVector**,vtkInformationVector*) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
+ int RequestData(vtkInformation*,vtkInformationVector**,vtkInformationVector*) override;
/**
* Tological radius from seed cells to be used to select cells
diff --git a/Filters/Selection/vtkKdTreeSelector.h b/Filters/Selection/vtkKdTreeSelector.h
index 5a405dca8e5239f0ea0a1ede45d2aa2d8d30e163..ce2db9ff054d77692eaa55c7aad305f00c0b2d30 100644
--- a/Filters/Selection/vtkKdTreeSelector.h
+++ b/Filters/Selection/vtkKdTreeSelector.h
@@ -41,7 +41,7 @@ class VTKFILTERSSELECTION_EXPORT vtkKdTreeSelector : public vtkSelectionAlgorith
public:
static vtkKdTreeSelector* New();
vtkTypeMacro(vtkKdTreeSelector, vtkSelectionAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -110,11 +110,11 @@ public:
vtkGetMacro(SingleSelectionThreshold, double);
//@}
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
protected:
vtkKdTreeSelector();
- ~vtkKdTreeSelector() VTK_OVERRIDE;
+ ~vtkKdTreeSelector() override;
vtkKdTree* KdTree;
double SelectionBounds[6];
@@ -125,12 +125,12 @@ protected:
int SelectionAttribute;
int FillInputPortInformation(
- int port, vtkInformation* info) VTK_OVERRIDE;
+ int port, vtkInformation* info) override;
int RequestData(
vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
private:
vtkKdTreeSelector(const vtkKdTreeSelector&) VTK_DELETE_FUNCTION;
diff --git a/Filters/Selection/vtkLinearSelector.h b/Filters/Selection/vtkLinearSelector.h
index 1ae7ed69acfd5d58991783b7716208ef65a79797..b0f7fba6ada699f9a6da95f77fee0cc92d5d32dd 100644
--- a/Filters/Selection/vtkLinearSelector.h
+++ b/Filters/Selection/vtkLinearSelector.h
@@ -44,7 +44,7 @@ class VTKFILTERSSELECTION_EXPORT vtkLinearSelector : public vtkSelectionAlgorith
{
public:
vtkTypeMacro(vtkLinearSelector,vtkSelectionAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkLinearSelector* New();
@@ -99,13 +99,13 @@ class VTKFILTERSSELECTION_EXPORT vtkLinearSelector : public vtkSelectionAlgorith
protected:
vtkLinearSelector();
- ~vtkLinearSelector() VTK_OVERRIDE;
+ ~vtkLinearSelector() override;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
int RequestData(vtkInformation *request,
vtkInformationVector **inputVector,
- vtkInformationVector *outputVector) VTK_OVERRIDE;
+ vtkInformationVector *outputVector) override;
/**
* The main routine that iterates over cells and looks for those that
diff --git a/Filters/Sources/vtkArcSource.h b/Filters/Sources/vtkArcSource.h
index b80053a7a1f76b73e3652931c35c2752a83a59f6..9ba82da14314dfc0017ab895d27ec333bf710571 100644
--- a/Filters/Sources/vtkArcSource.h
+++ b/Filters/Sources/vtkArcSource.h
@@ -47,7 +47,7 @@ class VTKFILTERSSOURCES_EXPORT vtkArcSource : public vtkPolyDataAlgorithm
public:
static vtkArcSource *New();
vtkTypeMacro(vtkArcSource,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -154,10 +154,10 @@ public:
protected:
vtkArcSource(int res=1);
- ~vtkArcSource() VTK_OVERRIDE {}
+ ~vtkArcSource() override {}
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int RequestInformation(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int RequestInformation(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
double Point1[3];
double Point2[3];
double Center[3];
diff --git a/Filters/Sources/vtkArrowSource.h b/Filters/Sources/vtkArrowSource.h
index e424e48f8949e5d0feafc74228cab8b7a8375f1e..d23715f4b03d444817dcf5ee273461e0723a66ea 100644
--- a/Filters/Sources/vtkArrowSource.h
+++ b/Filters/Sources/vtkArrowSource.h
@@ -40,7 +40,7 @@ public:
static vtkArrowSource *New();
vtkTypeMacro(vtkArrowSource,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -92,10 +92,10 @@ public:
protected:
vtkArrowSource();
- ~vtkArrowSource() VTK_OVERRIDE {}
+ ~vtkArrowSource() override {}
- int RequestInformation(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestInformation(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
int TipResolution;
double TipLength;
diff --git a/Filters/Sources/vtkButtonSource.h b/Filters/Sources/vtkButtonSource.h
index 2c14baca2a81d08c59f3a07dcdde443b77aa7e38..bf8ef27e630c3456ae46c01f6216cf7409e54630 100644
--- a/Filters/Sources/vtkButtonSource.h
+++ b/Filters/Sources/vtkButtonSource.h
@@ -53,7 +53,7 @@
class VTKFILTERSSOURCES_EXPORT vtkButtonSource : public vtkPolyDataAlgorithm
{
public:
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
vtkTypeMacro(vtkButtonSource,vtkPolyDataAlgorithm);
//@{
@@ -110,7 +110,7 @@ public:
protected:
vtkButtonSource();
- ~vtkButtonSource() VTK_OVERRIDE {}
+ ~vtkButtonSource() override {}
double Center[3];
double ShoulderTextureCoordinate[2];
diff --git a/Filters/Sources/vtkCellTypeSource.h b/Filters/Sources/vtkCellTypeSource.h
index da38376985c7963a4ff0743b9db5d5e7dbdd0a6a..0fbf3de27d94951720b93a323ef6aad20733faee 100644
--- a/Filters/Sources/vtkCellTypeSource.h
+++ b/Filters/Sources/vtkCellTypeSource.h
@@ -41,7 +41,7 @@ public:
*/
static vtkCellTypeSource *New();
vtkTypeMacro(vtkCellTypeSource,vtkUnstructuredGridAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -92,10 +92,10 @@ public:
protected:
vtkCellTypeSource();
- ~vtkCellTypeSource() VTK_OVERRIDE {}
+ ~vtkCellTypeSource() override {}
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int RequestInformation(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int RequestInformation(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
void GenerateTriangles(vtkUnstructuredGrid*, int extent[6]);
void GenerateQuads(vtkUnstructuredGrid*, int extent[6]);
diff --git a/Filters/Sources/vtkConeSource.h b/Filters/Sources/vtkConeSource.h
index 48813ab1ad8ecb4c644d3135ab028102ff5a7160..2f2fb91cad548fdd6897222c9dd4e630ac589e50 100644
--- a/Filters/Sources/vtkConeSource.h
+++ b/Filters/Sources/vtkConeSource.h
@@ -39,7 +39,7 @@ class VTKFILTERSSOURCES_EXPORT vtkConeSource : public vtkPolyDataAlgorithm
{
public:
vtkTypeMacro(vtkConeSource,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct with default resolution 6, height 1.0, radius 0.5, and
@@ -126,10 +126,10 @@ public:
protected:
vtkConeSource(int res=6);
- ~vtkConeSource() VTK_OVERRIDE {}
+ ~vtkConeSource() override {}
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int RequestInformation(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int RequestInformation(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
double Height;
double Radius;
diff --git a/Filters/Sources/vtkCubeSource.h b/Filters/Sources/vtkCubeSource.h
index fedefa4e5399c26e580d9c7784ca89d2a378b583..990b73d8df54ec86cef447ad41e1c2e3d6b48d68 100644
--- a/Filters/Sources/vtkCubeSource.h
+++ b/Filters/Sources/vtkCubeSource.h
@@ -32,7 +32,7 @@ class VTKFILTERSSOURCES_EXPORT vtkCubeSource : public vtkPolyDataAlgorithm
public:
static vtkCubeSource *New();
vtkTypeMacro(vtkCubeSource,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -88,9 +88,9 @@ public:
protected:
vtkCubeSource(double xL=1.0, double yL=1.0, double zL=1.0);
- ~vtkCubeSource() VTK_OVERRIDE {}
+ ~vtkCubeSource() override {}
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
double XLength;
double YLength;
double ZLength;
diff --git a/Filters/Sources/vtkCylinderSource.h b/Filters/Sources/vtkCylinderSource.h
index d2cdfa0bbdab7b4d5c5b580dcd9389a3dcf30bbe..cad01a1977d720719970d2d895ae90f283c6057b 100644
--- a/Filters/Sources/vtkCylinderSource.h
+++ b/Filters/Sources/vtkCylinderSource.h
@@ -38,7 +38,7 @@ class VTKFILTERSSOURCES_EXPORT vtkCylinderSource : public vtkPolyDataAlgorithm
public:
static vtkCylinderSource *New();
vtkTypeMacro(vtkCylinderSource,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -93,9 +93,9 @@ public:
protected:
vtkCylinderSource(int res=6);
- ~vtkCylinderSource() VTK_OVERRIDE {}
+ ~vtkCylinderSource() override {}
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
double Height;
double Radius;
double Center[3];
diff --git a/Filters/Sources/vtkDiagonalMatrixSource.h b/Filters/Sources/vtkDiagonalMatrixSource.h
index b0cf85fce1d786d00fde4a0745dc4942909e9503..5e1df4a0e233eda88835eaf2e7e920267197560e 100644
--- a/Filters/Sources/vtkDiagonalMatrixSource.h
+++ b/Filters/Sources/vtkDiagonalMatrixSource.h
@@ -39,7 +39,7 @@ class VTKFILTERSSOURCES_EXPORT vtkDiagonalMatrixSource : public vtkArrayDataAlgo
public:
static vtkDiagonalMatrixSource* New();
vtkTypeMacro(vtkDiagonalMatrixSource, vtkArrayDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
// Determines whether the output matrix will be dense or sparse
enum StorageType
@@ -103,12 +103,12 @@ public:
protected:
vtkDiagonalMatrixSource();
- ~vtkDiagonalMatrixSource() VTK_OVERRIDE;
+ ~vtkDiagonalMatrixSource() override;
int RequestData(
vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
private:
vtkDiagonalMatrixSource(const vtkDiagonalMatrixSource&) VTK_DELETE_FUNCTION;
diff --git a/Filters/Sources/vtkDiskSource.h b/Filters/Sources/vtkDiskSource.h
index ebc3c8d781c449227d1e8a3359b74751c8d3f287..56be2bfe674db5aaac7ad6abac15c9a23c09a6d7 100644
--- a/Filters/Sources/vtkDiskSource.h
+++ b/Filters/Sources/vtkDiskSource.h
@@ -35,7 +35,7 @@ class VTKFILTERSSOURCES_EXPORT vtkDiskSource : public vtkPolyDataAlgorithm
public:
static vtkDiskSource *New();
vtkTypeMacro(vtkDiskSource,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -81,9 +81,9 @@ public:
protected:
vtkDiskSource();
- ~vtkDiskSource() VTK_OVERRIDE {}
+ ~vtkDiskSource() override {}
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
double InnerRadius;
double OuterRadius;
int RadialResolution;
diff --git a/Filters/Sources/vtkEllipseArcSource.h b/Filters/Sources/vtkEllipseArcSource.h
index 6b049ef1f1f7260afd5b1bca43fde072337757e0..566eccde64b98ce2651b06be7729e6aca48c54d0 100644
--- a/Filters/Sources/vtkEllipseArcSource.h
+++ b/Filters/Sources/vtkEllipseArcSource.h
@@ -38,7 +38,7 @@ class VTKFILTERSSOURCES_EXPORT vtkEllipseArcSource : public vtkPolyDataAlgorithm
public:
static vtkEllipseArcSource *New();
vtkTypeMacro(vtkEllipseArcSource, vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -119,10 +119,10 @@ public:
protected:
vtkEllipseArcSource();
- ~vtkEllipseArcSource() VTK_OVERRIDE {}
+ ~vtkEllipseArcSource() override {}
int RequestData(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
double Center[3];
double Normal[3];
diff --git a/Filters/Sources/vtkEllipticalButtonSource.h b/Filters/Sources/vtkEllipticalButtonSource.h
index 0294e06b2f1505d695169a75b97bfe7c4ee28c46..b8fb6ee76f455ccf7a6d2933fedb04d8eb9d326b 100644
--- a/Filters/Sources/vtkEllipticalButtonSource.h
+++ b/Filters/Sources/vtkEllipticalButtonSource.h
@@ -50,7 +50,7 @@ class vtkPoints;
class VTKFILTERSSOURCES_EXPORT vtkEllipticalButtonSource : public vtkButtonSource
{
public:
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
vtkTypeMacro(vtkEllipticalButtonSource,vtkButtonSource);
/**
@@ -134,9 +134,9 @@ public:
protected:
vtkEllipticalButtonSource();
- ~vtkEllipticalButtonSource() VTK_OVERRIDE {}
+ ~vtkEllipticalButtonSource() override {}
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
double Width;
double Height;
diff --git a/Filters/Sources/vtkFrustumSource.h b/Filters/Sources/vtkFrustumSource.h
index f397f4e7cf094d66d58dbb1b713afa25706459c0..174cf620e76479dab385223b8f0ce96bb65c59ce 100644
--- a/Filters/Sources/vtkFrustumSource.h
+++ b/Filters/Sources/vtkFrustumSource.h
@@ -41,7 +41,7 @@ class VTKFILTERSSOURCES_EXPORT vtkFrustumSource : public vtkPolyDataAlgorithm
public:
static vtkFrustumSource *New();
vtkTypeMacro(vtkFrustumSource,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -80,7 +80,7 @@ public:
/**
* Modified GetMTime because of Planes.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
//@{
/**
@@ -98,11 +98,11 @@ protected:
*/
vtkFrustumSource();
- ~vtkFrustumSource() VTK_OVERRIDE;
+ ~vtkFrustumSource() override;
int RequestData(vtkInformation *request,
vtkInformationVector **inputVector,
- vtkInformationVector *outputVector) VTK_OVERRIDE;
+ vtkInformationVector *outputVector) override;
/**
* Compute the intersection of 3 planes.
diff --git a/Filters/Sources/vtkGlyphSource2D.h b/Filters/Sources/vtkGlyphSource2D.h
index 833e43121c72a52d0ac74c83d6993f385f046647..7c5d507280dda5ee0de84c376569d464697aa76d 100644
--- a/Filters/Sources/vtkGlyphSource2D.h
+++ b/Filters/Sources/vtkGlyphSource2D.h
@@ -57,7 +57,7 @@ class VTKFILTERSSOURCES_EXPORT vtkGlyphSource2D : public vtkPolyDataAlgorithm
{
public:
vtkTypeMacro(vtkGlyphSource2D,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct a vertex glyph centered at the origin, scale 1.0, white in
@@ -183,9 +183,9 @@ public:
protected:
vtkGlyphSource2D();
- ~vtkGlyphSource2D() VTK_OVERRIDE {}
+ ~vtkGlyphSource2D() override {}
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
double Center[3];
double Scale;
diff --git a/Filters/Sources/vtkGraphToPolyData.h b/Filters/Sources/vtkGraphToPolyData.h
index bba0fa4fb6d5639a8661473d871fbd65688d1c47..59d7dc605e12c052fd558ff698cddbc0171f1d34 100644
--- a/Filters/Sources/vtkGraphToPolyData.h
+++ b/Filters/Sources/vtkGraphToPolyData.h
@@ -43,7 +43,7 @@ class VTKFILTERSSOURCES_EXPORT vtkGraphToPolyData : public vtkPolyDataAlgorithm
public:
static vtkGraphToPolyData *New();
vtkTypeMacro(vtkGraphToPolyData,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -73,7 +73,7 @@ public:
protected:
vtkGraphToPolyData();
- ~vtkGraphToPolyData() VTK_OVERRIDE {}
+ ~vtkGraphToPolyData() override {}
bool EdgeGlyphOutput;
double EdgeGlyphPosition;
@@ -83,12 +83,12 @@ protected:
/**
* Convert the vtkGraph into vtkPolyData.
*/
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
/**
* Set the input type of the algorithm to vtkGraph.
*/
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
private:
vtkGraphToPolyData(const vtkGraphToPolyData&) VTK_DELETE_FUNCTION;
diff --git a/Filters/Sources/vtkHyperOctreeFractalSource.h b/Filters/Sources/vtkHyperOctreeFractalSource.h
index eac0f2086339cf348de38a19f0ec993d62db65b5..d4c8bb97809d35bc2c8a03b0aef0a834182f6457 100644
--- a/Filters/Sources/vtkHyperOctreeFractalSource.h
+++ b/Filters/Sources/vtkHyperOctreeFractalSource.h
@@ -34,7 +34,7 @@ class VTKFILTERSSOURCES_EXPORT vtkHyperOctreeFractalSource : public vtkHyperOctr
{
public:
vtkTypeMacro(vtkHyperOctreeFractalSource,vtkHyperOctreeAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkHyperOctreeFractalSource *New();
@@ -124,14 +124,14 @@ public:
protected:
vtkHyperOctreeFractalSource();
- ~vtkHyperOctreeFractalSource() VTK_OVERRIDE;
+ ~vtkHyperOctreeFractalSource() override;
int RequestInformation (vtkInformation * vtkNotUsed(request),
vtkInformationVector ** vtkNotUsed( inputVector ),
- vtkInformationVector *outputVector) VTK_OVERRIDE;
+ vtkInformationVector *outputVector) override;
int RequestData(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
void Subdivide(vtkHyperOctreeCursor *cursor,
int level, vtkHyperOctree *output,
diff --git a/Filters/Sources/vtkHyperTreeGridSource.h b/Filters/Sources/vtkHyperTreeGridSource.h
index 876e0c07ed2e85fc5ed1ff65a0867e47230b43eb..143294b4fc416c8cf2f209ac362a8f9ae2e1cbd7 100644
--- a/Filters/Sources/vtkHyperTreeGridSource.h
+++ b/Filters/Sources/vtkHyperTreeGridSource.h
@@ -63,7 +63,7 @@ class VTKFILTERSSOURCES_EXPORT vtkHyperTreeGridSource : public vtkHyperTreeGridA
{
public:
vtkTypeMacro(vtkHyperTreeGridSource,vtkHyperTreeGridAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkHyperTreeGridSource* New();
@@ -230,7 +230,7 @@ public:
/**
* Override GetMTime because we delegate to a vtkQuadric.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
//@{
/**
@@ -242,23 +242,23 @@ public:
protected:
vtkHyperTreeGridSource();
- ~vtkHyperTreeGridSource() VTK_OVERRIDE;
+ ~vtkHyperTreeGridSource() override;
int RequestInformation( vtkInformation*,
vtkInformationVector**,
- vtkInformationVector* ) VTK_OVERRIDE;
+ vtkInformationVector* ) override;
int RequestData( vtkInformation*,
vtkInformationVector**,
- vtkInformationVector* ) VTK_OVERRIDE;
+ vtkInformationVector* ) override;
- int FillOutputPortInformation( int, vtkInformation* ) VTK_OVERRIDE;
+ int FillOutputPortInformation( int, vtkInformation* ) override;
/**
* Main routine to process individual trees in the grid
*/
int ProcessTrees( vtkHyperTreeGrid*,
- vtkDataObject* ) VTK_OVERRIDE;
+ vtkDataObject* ) override;
/**
* Initialize grid from descriptor string when it is to be used
diff --git a/Filters/Sources/vtkLineSource.h b/Filters/Sources/vtkLineSource.h
index ff8fa73bfa8bbceb504fdd3337c769579d5bb34b..72cf34c01fb1e7179c0d656f9399dcaffb0e53f1 100644
--- a/Filters/Sources/vtkLineSource.h
+++ b/Filters/Sources/vtkLineSource.h
@@ -38,7 +38,7 @@ class VTKFILTERSSOURCES_EXPORT vtkLineSource : public vtkPolyDataAlgorithm
public:
static vtkLineSource *New();
vtkTypeMacro(vtkLineSource,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -86,10 +86,10 @@ public:
protected:
vtkLineSource(int res=1);
- ~vtkLineSource() VTK_OVERRIDE;
+ ~vtkLineSource() override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int RequestInformation(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int RequestInformation(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
double Point1[3];
double Point2[3];
int Resolution;
diff --git a/Filters/Sources/vtkOutlineCornerFilter.h b/Filters/Sources/vtkOutlineCornerFilter.h
index ecd52e03594fae0c6c1784a55c2d309774f73fc1..bc25d4712858a3c806392b51af233107dc08bfab 100644
--- a/Filters/Sources/vtkOutlineCornerFilter.h
+++ b/Filters/Sources/vtkOutlineCornerFilter.h
@@ -32,7 +32,7 @@ class VTKFILTERSSOURCES_EXPORT vtkOutlineCornerFilter : public vtkPolyDataAlgori
{
public:
vtkTypeMacro(vtkOutlineCornerFilter,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct outline corner filter with default corner factor = 0.2
@@ -50,11 +50,11 @@ public:
protected:
vtkOutlineCornerFilter();
- ~vtkOutlineCornerFilter() VTK_OVERRIDE;
+ ~vtkOutlineCornerFilter() override;
vtkOutlineCornerSource *OutlineCornerSource;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
double CornerFactor;
private:
diff --git a/Filters/Sources/vtkOutlineCornerSource.h b/Filters/Sources/vtkOutlineCornerSource.h
index fb606ab92a453907adcf771938f5e9f8f1c85f77..0269617faf624f2e7be2cb97907d4d6c42f338fc 100644
--- a/Filters/Sources/vtkOutlineCornerSource.h
+++ b/Filters/Sources/vtkOutlineCornerSource.h
@@ -30,7 +30,7 @@ class VTKFILTERSSOURCES_EXPORT vtkOutlineCornerSource : public vtkOutlineSource
{
public:
vtkTypeMacro(vtkOutlineCornerSource,vtkOutlineSource);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct outline corner source with default corner factor = 0.2
@@ -48,9 +48,9 @@ public:
protected:
vtkOutlineCornerSource();
- ~vtkOutlineCornerSource() VTK_OVERRIDE {}
+ ~vtkOutlineCornerSource() override {}
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
double CornerFactor;
private:
diff --git a/Filters/Sources/vtkOutlineSource.h b/Filters/Sources/vtkOutlineSource.h
index 94b9fe334fe27b7dad2d1c7be1f2892de4cfec7a..815905bfe75e0e2c8ff28a84ab91ad15f0b9fa6c 100644
--- a/Filters/Sources/vtkOutlineSource.h
+++ b/Filters/Sources/vtkOutlineSource.h
@@ -38,7 +38,7 @@ class VTKFILTERSSOURCES_EXPORT vtkOutlineSource : public vtkPolyDataAlgorithm
public:
static vtkOutlineSource *New();
vtkTypeMacro(vtkOutlineSource,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -94,9 +94,9 @@ public:
protected:
vtkOutlineSource();
- ~vtkOutlineSource() VTK_OVERRIDE {}
+ ~vtkOutlineSource() override {}
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
int BoxType;
int GenerateFaces;
int OutputPointsPrecision;
diff --git a/Filters/Sources/vtkParametricFunctionSource.h b/Filters/Sources/vtkParametricFunctionSource.h
index 7d00109369b298dedd1dbba09fcb36bf4e3e8965..a520702e70ab22a37cada31a406c9cd454562832 100644
--- a/Filters/Sources/vtkParametricFunctionSource.h
+++ b/Filters/Sources/vtkParametricFunctionSource.h
@@ -58,7 +58,7 @@ class VTKFILTERSSOURCES_EXPORT vtkParametricFunctionSource : public
{
public:
vtkTypeMacro(vtkParametricFunctionSource, vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Create a new instance with (50,50,50) points in the (u-v-w) directions.
@@ -190,7 +190,7 @@ class VTKFILTERSSOURCES_EXPORT vtkParametricFunctionSource : public
/**
* Return the MTime also considering the parametric function.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
//@{
/**
@@ -204,11 +204,11 @@ class VTKFILTERSSOURCES_EXPORT vtkParametricFunctionSource : public
protected:
vtkParametricFunctionSource();
- ~vtkParametricFunctionSource() VTK_OVERRIDE;
+ ~vtkParametricFunctionSource() override;
// Usual data generation method
int RequestData(vtkInformation *info, vtkInformationVector **input,
- vtkInformationVector *output) VTK_OVERRIDE;
+ vtkInformationVector *output) override;
// Variables
vtkParametricFunction *ParametricFunction;
diff --git a/Filters/Sources/vtkPlaneSource.h b/Filters/Sources/vtkPlaneSource.h
index 381608aee1104e6d8a0a27a2783c86592c3191fe..b2debcfc31d1cd3bad48d1175ed7604a9e55e651 100644
--- a/Filters/Sources/vtkPlaneSource.h
+++ b/Filters/Sources/vtkPlaneSource.h
@@ -54,7 +54,7 @@
class VTKFILTERSSOURCES_EXPORT vtkPlaneSource : public vtkPolyDataAlgorithm
{
public:
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
vtkTypeMacro(vtkPlaneSource,vtkPolyDataAlgorithm);
/**
@@ -155,9 +155,9 @@ public:
protected:
vtkPlaneSource();
- ~vtkPlaneSource() VTK_OVERRIDE {}
+ ~vtkPlaneSource() override {}
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
int XResolution;
int YResolution;
diff --git a/Filters/Sources/vtkPlatonicSolidSource.h b/Filters/Sources/vtkPlatonicSolidSource.h
index 423d47c07fec219e35c40868f0560c9dbf74b05d..e69073877e183ecdc83ed5dfb63a519c15a95d52 100644
--- a/Filters/Sources/vtkPlatonicSolidSource.h
+++ b/Filters/Sources/vtkPlatonicSolidSource.h
@@ -40,7 +40,7 @@ class VTKFILTERSSOURCES_EXPORT vtkPlatonicSolidSource : public vtkPolyDataAlgori
public:
static vtkPlatonicSolidSource *New();
vtkTypeMacro(vtkPlatonicSolidSource,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -72,9 +72,9 @@ public:
protected:
vtkPlatonicSolidSource();
- ~vtkPlatonicSolidSource() VTK_OVERRIDE {}
+ ~vtkPlatonicSolidSource() override {}
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
int SolidType;
int OutputPointsPrecision;
diff --git a/Filters/Sources/vtkPointSource.h b/Filters/Sources/vtkPointSource.h
index 6975e5f4fd6109d7ab31b24349b8e87d2b1b3b68..6506f5a7c8aba959a92b131d2495e8104aadf49f 100644
--- a/Filters/Sources/vtkPointSource.h
+++ b/Filters/Sources/vtkPointSource.h
@@ -40,7 +40,7 @@ class VTKFILTERSSOURCES_EXPORT vtkPointSource : public vtkPolyDataAlgorithm
public:
static vtkPointSource *New();
vtkTypeMacro(vtkPointSource,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -104,9 +104,9 @@ public:
protected:
vtkPointSource(vtkIdType numPts=10);
- ~vtkPointSource() VTK_OVERRIDE;
+ ~vtkPointSource() override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
double Random();
diff --git a/Filters/Sources/vtkPolyLineSource.h b/Filters/Sources/vtkPolyLineSource.h
index 58b98de17e7e1af7a0478c93f27c06d677d16791..dd56cbbc472316b7b430eea2a469d3c59b8e0576 100644
--- a/Filters/Sources/vtkPolyLineSource.h
+++ b/Filters/Sources/vtkPolyLineSource.h
@@ -33,7 +33,7 @@ class VTKFILTERSSOURCES_EXPORT vtkPolyLineSource : public vtkPolyDataAlgorithm
public:
static vtkPolyLineSource* New();
vtkTypeMacro(vtkPolyLineSource, vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -72,9 +72,9 @@ public:
protected:
vtkPolyLineSource();
- ~vtkPolyLineSource() VTK_OVERRIDE;
+ ~vtkPolyLineSource() override;
- int RequestData(vtkInformation*, vtkInformationVector**, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation*, vtkInformationVector**, vtkInformationVector *) override;
vtkPoints* Points;
diff --git a/Filters/Sources/vtkProgrammableDataObjectSource.h b/Filters/Sources/vtkProgrammableDataObjectSource.h
index daee2d61abcc53b7bb485d608ddc8d16cb46d9df..e9376c7e7b59b851d0e60d4d9c86e97d8a822990 100644
--- a/Filters/Sources/vtkProgrammableDataObjectSource.h
+++ b/Filters/Sources/vtkProgrammableDataObjectSource.h
@@ -44,7 +44,7 @@ class VTKFILTERSSOURCES_EXPORT vtkProgrammableDataObjectSource : public vtkDataO
public:
static vtkProgrammableDataObjectSource *New();
vtkTypeMacro(vtkProgrammableDataObjectSource,vtkDataObjectAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Signature definition for programmable method callbacks. Methods passed to
@@ -70,10 +70,10 @@ public:
protected:
vtkProgrammableDataObjectSource();
- ~vtkProgrammableDataObjectSource() VTK_OVERRIDE;
+ ~vtkProgrammableDataObjectSource() override;
int RequestData(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
ProgrammableMethodCallbackType ExecuteMethod; //function to invoke
ProgrammableMethodCallbackType ExecuteMethodArgDelete;
diff --git a/Filters/Sources/vtkProgrammableSource.h b/Filters/Sources/vtkProgrammableSource.h
index 26aab57f28e8071a7c59aa9561625428fc30fad0..202ca84d9f9429b40afdd8f385da77e5a167d65c 100644
--- a/Filters/Sources/vtkProgrammableSource.h
+++ b/Filters/Sources/vtkProgrammableSource.h
@@ -110,11 +110,11 @@ public:
protected:
vtkProgrammableSource();
- ~vtkProgrammableSource() VTK_OVERRIDE;
+ ~vtkProgrammableSource() override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int RequestDataObject(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int RequestInformation(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int RequestDataObject(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int RequestInformation(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
ProgrammableMethodCallbackType ExecuteMethod; //function to invoke
ProgrammableMethodCallbackType ExecuteMethodArgDelete;
diff --git a/Filters/Sources/vtkRectangularButtonSource.h b/Filters/Sources/vtkRectangularButtonSource.h
index 3da33bc20ede7e27864505aabd243047f243990e..fec21d6063df78c319af8fff5e7d2080df2a8877 100644
--- a/Filters/Sources/vtkRectangularButtonSource.h
+++ b/Filters/Sources/vtkRectangularButtonSource.h
@@ -54,7 +54,7 @@ class vtkPoints;
class VTKFILTERSSOURCES_EXPORT vtkRectangularButtonSource : public vtkButtonSource
{
public:
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
vtkTypeMacro(vtkRectangularButtonSource,vtkButtonSource);
/**
@@ -134,9 +134,9 @@ public:
protected:
vtkRectangularButtonSource();
- ~vtkRectangularButtonSource() VTK_OVERRIDE {}
+ ~vtkRectangularButtonSource() override {}
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
double Width;
double Height;
diff --git a/Filters/Sources/vtkRegularPolygonSource.h b/Filters/Sources/vtkRegularPolygonSource.h
index 0113bce00a29826585bd9df47823934a32a9716c..014046358f675522816d6ab8cdc66a7234135665 100644
--- a/Filters/Sources/vtkRegularPolygonSource.h
+++ b/Filters/Sources/vtkRegularPolygonSource.h
@@ -39,7 +39,7 @@ public:
*/
static vtkRegularPolygonSource *New();
vtkTypeMacro(vtkRegularPolygonSource,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -108,9 +108,9 @@ public:
protected:
vtkRegularPolygonSource();
- ~vtkRegularPolygonSource() VTK_OVERRIDE {}
+ ~vtkRegularPolygonSource() override {}
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
int NumberOfSides;
double Center[3];
diff --git a/Filters/Sources/vtkSelectionSource.h b/Filters/Sources/vtkSelectionSource.h
index e0a65fc65cb9208f3cc2cee1f28c6e506236eaca..a21c02cb0368905633d86d4b40ed179fc14a6ac7 100644
--- a/Filters/Sources/vtkSelectionSource.h
+++ b/Filters/Sources/vtkSelectionSource.h
@@ -36,7 +36,7 @@ class VTKFILTERSSOURCES_EXPORT vtkSelectionSource : public vtkSelectionAlgorithm
public:
static vtkSelectionSource *New();
vtkTypeMacro(vtkSelectionSource,vtkSelectionAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -175,14 +175,14 @@ public:
protected:
vtkSelectionSource();
- ~vtkSelectionSource() VTK_OVERRIDE;
+ ~vtkSelectionSource() override;
int RequestInformation(vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
int RequestData(vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
vtkSelectionSourceInternals* Internal;
diff --git a/Filters/Sources/vtkSphereSource.h b/Filters/Sources/vtkSphereSource.h
index 30a67e50466a975f6d14b5fce8ed4f4ed36580b0..424eee36aa5052516dbb7e99e8becbea3f05ad79 100644
--- a/Filters/Sources/vtkSphereSource.h
+++ b/Filters/Sources/vtkSphereSource.h
@@ -41,7 +41,7 @@ class VTKFILTERSSOURCES_EXPORT vtkSphereSource : public vtkPolyDataAlgorithm
{
public:
vtkTypeMacro(vtkSphereSource,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct sphere with radius=0.5 and default resolution 8 in both Phi
@@ -142,10 +142,10 @@ public:
protected:
vtkSphereSource(int res=8);
- ~vtkSphereSource() VTK_OVERRIDE {}
+ ~vtkSphereSource() override {}
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int RequestInformation(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int RequestInformation(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
double Radius;
double Center[3];
diff --git a/Filters/Sources/vtkSuperquadricSource.h b/Filters/Sources/vtkSuperquadricSource.h
index e887d583484303838bb321aa2a869ff4a4e7560f..a7be6ee6526b5f0e48a89bcb06994d48b05e9e76 100644
--- a/Filters/Sources/vtkSuperquadricSource.h
+++ b/Filters/Sources/vtkSuperquadricSource.h
@@ -69,7 +69,7 @@ public:
static vtkSuperquadricSource *New();
vtkTypeMacro(vtkSuperquadricSource,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -174,7 +174,7 @@ public:
protected:
vtkSuperquadricSource(int res=16);
- ~vtkSuperquadricSource() VTK_OVERRIDE {}
+ ~vtkSuperquadricSource() override {}
int Toroidal;
int AxisOfSymmetry;
@@ -182,7 +182,7 @@ protected:
double Size;
double PhiRoundness;
double ThetaRoundness;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
double Center[3];
double Scale[3];
int ThetaResolution;
diff --git a/Filters/Sources/vtkTessellatedBoxSource.h b/Filters/Sources/vtkTessellatedBoxSource.h
index 08e633801f96ed608e5e797b7f115cafb071b9c4..c9681758567f88b03040755a2bec53459309418b 100644
--- a/Filters/Sources/vtkTessellatedBoxSource.h
+++ b/Filters/Sources/vtkTessellatedBoxSource.h
@@ -43,7 +43,7 @@ class VTKFILTERSSOURCES_EXPORT vtkTessellatedBoxSource : public vtkPolyDataAlgor
public:
static vtkTessellatedBoxSource *New();
vtkTypeMacro(vtkTessellatedBoxSource,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -114,7 +114,7 @@ public:
protected:
vtkTessellatedBoxSource();
- ~vtkTessellatedBoxSource() VTK_OVERRIDE;
+ ~vtkTessellatedBoxSource() override;
/**
* Called by the superclass. Actual creation of the points and cells
@@ -122,7 +122,7 @@ protected:
*/
int RequestData(vtkInformation *request,
vtkInformationVector **inputVector,
- vtkInformationVector *outpuVector) VTK_OVERRIDE;
+ vtkInformationVector *outpuVector) override;
void DuplicateSharedPointsMethod(double *bounds,
diff --git a/Filters/Sources/vtkTextSource.h b/Filters/Sources/vtkTextSource.h
index ac8825be75ac1f572e89202f2d9abd608d36fcfc..6f7d69c91e582e63a15c5a754cbb4791ff056c2f 100644
--- a/Filters/Sources/vtkTextSource.h
+++ b/Filters/Sources/vtkTextSource.h
@@ -43,7 +43,7 @@ class VTKFILTERSSOURCES_EXPORT vtkTextSource : public vtkPolyDataAlgorithm
{
public:
vtkTypeMacro(vtkTextSource,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct object with no string set and backing enabled.
@@ -95,9 +95,9 @@ public:
protected:
vtkTextSource();
- ~vtkTextSource() VTK_OVERRIDE;
+ ~vtkTextSource() override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
char *Text;
int Backing;
double ForegroundColor[4];
diff --git a/Filters/Sources/vtkTexturedSphereSource.h b/Filters/Sources/vtkTexturedSphereSource.h
index bb4e15ddf85334f918e9dc0adf4b5bc9df27a71e..b0e9e209631bff3195ade08bd0ec3852da65da4e 100644
--- a/Filters/Sources/vtkTexturedSphereSource.h
+++ b/Filters/Sources/vtkTexturedSphereSource.h
@@ -35,7 +35,7 @@ class VTKFILTERSSOURCES_EXPORT vtkTexturedSphereSource : public vtkPolyDataAlgor
{
public:
vtkTypeMacro(vtkTexturedSphereSource,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct sphere with radius=0.5 and default resolution 8 in both Phi
@@ -95,9 +95,9 @@ public:
protected:
vtkTexturedSphereSource(int res=8);
- ~vtkTexturedSphereSource() VTK_OVERRIDE {}
+ ~vtkTexturedSphereSource() override {}
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
double Radius;
double Theta;
double Phi;
diff --git a/Filters/Statistics/vtkAutoCorrelativeStatistics.h b/Filters/Statistics/vtkAutoCorrelativeStatistics.h
index a33a18081931d18578df11ff2090c25932e0f276..32ccbe25c2cb8511c60528dbfdc9003e25806c40 100644
--- a/Filters/Statistics/vtkAutoCorrelativeStatistics.h
+++ b/Filters/Statistics/vtkAutoCorrelativeStatistics.h
@@ -53,7 +53,7 @@ class VTKFILTERSSTATISTICS_EXPORT vtkAutoCorrelativeStatistics : public vtkStati
{
public:
vtkTypeMacro(vtkAutoCorrelativeStatistics, vtkStatisticsAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkAutoCorrelativeStatistics* New();
//@{
@@ -73,11 +73,11 @@ public:
* Given a collection of models, calculate aggregate model
*/
void Aggregate( vtkDataObjectCollection*,
- vtkMultiBlockDataSet* ) VTK_OVERRIDE;
+ vtkMultiBlockDataSet* ) override;
protected:
vtkAutoCorrelativeStatistics();
- ~vtkAutoCorrelativeStatistics() VTK_OVERRIDE;
+ ~vtkAutoCorrelativeStatistics() override;
/**
* Execute the calculations required by the Learn option, given some input Data
@@ -85,26 +85,26 @@ protected:
*/
void Learn( vtkTable*,
vtkTable*,
- vtkMultiBlockDataSet* ) VTK_OVERRIDE;
+ vtkMultiBlockDataSet* ) override;
/**
* Execute the calculations required by the Derive option.
*/
- void Derive( vtkMultiBlockDataSet* ) VTK_OVERRIDE;
+ void Derive( vtkMultiBlockDataSet* ) override;
/**
* Execute the calculations required by the Test option.
*/
void Test( vtkTable*,
vtkMultiBlockDataSet*,
- vtkTable* ) VTK_OVERRIDE { return; };
+ vtkTable* ) override { return; };
/**
* Execute the calculations required by the Assess option.
*/
void Assess( vtkTable* inData,
vtkMultiBlockDataSet* inMeta,
- vtkTable* outData ) VTK_OVERRIDE
+ vtkTable* outData ) override
{ this->Superclass::Assess( inData, inMeta, outData, 1 ); }
/**
@@ -119,7 +119,7 @@ protected:
void SelectAssessFunctor( vtkTable* outData,
vtkDataObject* inMeta,
vtkStringArray* rowNames,
- AssessFunctor*& dfunc ) VTK_OVERRIDE;
+ AssessFunctor*& dfunc ) override;
vtkIdType SliceCardinality;
diff --git a/Filters/Statistics/vtkBivariateLinearTableThreshold.h b/Filters/Statistics/vtkBivariateLinearTableThreshold.h
index 91d5464b58d3d78d3e46ca531ef22fc6e8a887f5..45cc85dd5027a1fd55dd8da590ea8686f268f8cb 100644
--- a/Filters/Statistics/vtkBivariateLinearTableThreshold.h
+++ b/Filters/Statistics/vtkBivariateLinearTableThreshold.h
@@ -54,7 +54,7 @@ class VTKFILTERSSTATISTICS_EXPORT vtkBivariateLinearTableThreshold : public vtkT
public:
static vtkBivariateLinearTableThreshold* New();
vtkTypeMacro(vtkBivariateLinearTableThreshold, vtkTableAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -186,7 +186,7 @@ public:
protected:
vtkBivariateLinearTableThreshold();
- ~vtkBivariateLinearTableThreshold() VTK_OVERRIDE;
+ ~vtkBivariateLinearTableThreshold() override;
double ColumnRanges[2];
double DistanceThreshold;
@@ -202,10 +202,10 @@ protected:
int RequestData(
vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
- int FillInputPortInformation( int port, vtkInformation* info ) VTK_OVERRIDE;
- int FillOutputPortInformation( int port, vtkInformation* info ) VTK_OVERRIDE;
+ int FillInputPortInformation( int port, vtkInformation* info ) override;
+ int FillOutputPortInformation( int port, vtkInformation* info ) override;
/**
* Apply the current threshold to a vtkTable. Fills acceptedIds on success.
diff --git a/Filters/Statistics/vtkComputeQuartiles.h b/Filters/Statistics/vtkComputeQuartiles.h
index 50e9de886129e3da46f91d363d022d9c7f76562a..517dc0d970448eee5e2c929ced16394711418e5a 100644
--- a/Filters/Statistics/vtkComputeQuartiles.h
+++ b/Filters/Statistics/vtkComputeQuartiles.h
@@ -48,17 +48,17 @@ class VTKFILTERSSTATISTICS_EXPORT vtkComputeQuartiles : public vtkTableAlgorithm
public:
static vtkComputeQuartiles* New();
vtkTypeMacro(vtkComputeQuartiles, vtkTableAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkComputeQuartiles();
- ~vtkComputeQuartiles() VTK_OVERRIDE;
+ ~vtkComputeQuartiles() override;
- int FillInputPortInformation (int port, vtkInformation *info) VTK_OVERRIDE;
+ int FillInputPortInformation (int port, vtkInformation *info) override;
int RequestData(vtkInformation *request,
vtkInformationVector **inputVector,
- vtkInformationVector *outputVector) VTK_OVERRIDE;
+ vtkInformationVector *outputVector) override;
void ComputeTable(vtkDataObject*, vtkTable*, vtkIdType);
diff --git a/Filters/Statistics/vtkContingencyStatistics.cxx b/Filters/Statistics/vtkContingencyStatistics.cxx
index c3a98210f93d8561f1fd6208692c8b62d03068b7..01db59e2fc8dedd2e78adfaaaf71855921ca1fc2 100644
--- a/Filters/Statistics/vtkContingencyStatistics.cxx
+++ b/Filters/Statistics/vtkContingencyStatistics.cxx
@@ -73,9 +73,9 @@ public:
this->DataX = vtkArrayDownCast<vtkDataArray>(valsX);
this->DataY = vtkArrayDownCast<vtkDataArray>(valsY);
}
- ~BivariateContingenciesAndInformationFunctor() VTK_OVERRIDE { }
+ ~BivariateContingenciesAndInformationFunctor() override { }
void operator() ( vtkDoubleArray* result,
- vtkIdType id ) VTK_OVERRIDE
+ vtkIdType id ) override
{
Tuple x (this->DataX->GetNumberOfComponents ());
Tuple y (this->DataX->GetNumberOfComponents ());
@@ -125,9 +125,9 @@ public:
this->DataX = valsX;
this->DataY = valsY;
}
- ~BivariateContingenciesAndInformationFunctor() VTK_OVERRIDE { }
+ ~BivariateContingenciesAndInformationFunctor() override { }
void operator() ( vtkDoubleArray* result,
- vtkIdType id ) VTK_OVERRIDE
+ vtkIdType id ) override
{
TypeSpec x = this->DataX->GetVariantValue( id ).ToString ();
TypeSpec y = this->DataY->GetVariantValue( id ).ToString ();
diff --git a/Filters/Statistics/vtkContingencyStatistics.h b/Filters/Statistics/vtkContingencyStatistics.h
index 5fd4914c664fa10689a48b77a7b1cc758efa6d6f..bb9a72c3c89e816b2e6fd44676d7dc789dca4a74 100644
--- a/Filters/Statistics/vtkContingencyStatistics.h
+++ b/Filters/Statistics/vtkContingencyStatistics.h
@@ -57,7 +57,7 @@ class VTKFILTERSSTATISTICS_EXPORT vtkContingencyStatistics : public vtkStatistic
{
public:
vtkTypeMacro(vtkContingencyStatistics, vtkStatisticsAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkContingencyStatistics* New();
/**
@@ -65,37 +65,37 @@ public:
* NB: not implemented
*/
void Aggregate( vtkDataObjectCollection*,
- vtkMultiBlockDataSet* ) VTK_OVERRIDE { return; };
+ vtkMultiBlockDataSet* ) override { return; };
protected:
vtkContingencyStatistics();
- ~vtkContingencyStatistics() VTK_OVERRIDE;
+ ~vtkContingencyStatistics() override;
/**
* Execute the calculations required by the Learn option.
*/
void Learn( vtkTable*,
vtkTable*,
- vtkMultiBlockDataSet* ) VTK_OVERRIDE;
+ vtkMultiBlockDataSet* ) override;
/**
* Execute the calculations required by the Derive option.
*/
- void Derive( vtkMultiBlockDataSet* ) VTK_OVERRIDE;
+ void Derive( vtkMultiBlockDataSet* ) override;
/**
* Execute the calculations required by the Test option.
*/
void Test( vtkTable*,
vtkMultiBlockDataSet*,
- vtkTable* ) VTK_OVERRIDE;
+ vtkTable* ) override;
/**
* Execute the calculations required by the Assess option.
*/
void Assess( vtkTable*,
vtkMultiBlockDataSet*,
- vtkTable* ) VTK_OVERRIDE;
+ vtkTable* ) override;
/**
* Calculate p-value. This will be overridden using the object factory with an
@@ -111,7 +111,7 @@ protected:
void SelectAssessFunctor( vtkTable* outData,
vtkDataObject* inMeta,
vtkStringArray* rowNames,
- AssessFunctor*& dfunc ) VTK_OVERRIDE;
+ AssessFunctor*& dfunc ) override;
/**
* Provide the appropriate assessment functor.
* This one is the one that is actually used.
diff --git a/Filters/Statistics/vtkCorrelativeStatistics.cxx b/Filters/Statistics/vtkCorrelativeStatistics.cxx
index 9f3700ccb156e099942cc0cc3ac5367399a0ee1a..26c5f2ed88fe5e5a58d7ef6e5fedbf560c50813c 100644
--- a/Filters/Statistics/vtkCorrelativeStatistics.cxx
+++ b/Filters/Statistics/vtkCorrelativeStatistics.cxx
@@ -817,9 +817,9 @@ public:
this->InterYX = interYX;
this->InterXY = interXY;
}
- ~BivariateRegressionDeviationsFunctor() VTK_OVERRIDE { }
+ ~BivariateRegressionDeviationsFunctor() override { }
void operator() ( vtkDoubleArray* result,
- vtkIdType id ) VTK_OVERRIDE
+ vtkIdType id ) override
{
// First retrieve 2-d observation
double x = this->DataX->GetTuple1( id );
diff --git a/Filters/Statistics/vtkCorrelativeStatistics.h b/Filters/Statistics/vtkCorrelativeStatistics.h
index 0f1940eedb6c88d93fd6bacde8e1ed8d002ba87c..20e38cf71a4b6353f9b2d183edbdb7ebf6271eb2 100644
--- a/Filters/Statistics/vtkCorrelativeStatistics.h
+++ b/Filters/Statistics/vtkCorrelativeStatistics.h
@@ -57,44 +57,44 @@ class VTKFILTERSSTATISTICS_EXPORT vtkCorrelativeStatistics : public vtkStatistic
{
public:
vtkTypeMacro(vtkCorrelativeStatistics, vtkStatisticsAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkCorrelativeStatistics* New();
/**
* Given a collection of models, calculate aggregate model
*/
void Aggregate( vtkDataObjectCollection*,
- vtkMultiBlockDataSet* ) VTK_OVERRIDE;
+ vtkMultiBlockDataSet* ) override;
protected:
vtkCorrelativeStatistics();
- ~vtkCorrelativeStatistics() VTK_OVERRIDE;
+ ~vtkCorrelativeStatistics() override;
/**
* Execute the calculations required by the Learn option.
*/
void Learn( vtkTable*,
vtkTable*,
- vtkMultiBlockDataSet* ) VTK_OVERRIDE;
+ vtkMultiBlockDataSet* ) override;
/**
* Execute the calculations required by the Derive option.
*/
- void Derive( vtkMultiBlockDataSet* ) VTK_OVERRIDE;
+ void Derive( vtkMultiBlockDataSet* ) override;
/**
* Execute the calculations required by the Test option.
*/
void Test( vtkTable*,
vtkMultiBlockDataSet*,
- vtkTable* ) VTK_OVERRIDE;
+ vtkTable* ) override;
/**
* Execute the calculations required by the Assess option.
*/
void Assess( vtkTable* inData,
vtkMultiBlockDataSet* inMeta,
- vtkTable* outData ) VTK_OVERRIDE
+ vtkTable* outData ) override
{ this->Superclass::Assess( inData, inMeta, outData, 2 ); }
/**
@@ -109,7 +109,7 @@ protected:
void SelectAssessFunctor( vtkTable* outData,
vtkDataObject* inMeta,
vtkStringArray* rowNames,
- AssessFunctor*& dfunc ) VTK_OVERRIDE;
+ AssessFunctor*& dfunc ) override;
private:
vtkCorrelativeStatistics(const vtkCorrelativeStatistics&) VTK_DELETE_FUNCTION;
diff --git a/Filters/Statistics/vtkDescriptiveStatistics.cxx b/Filters/Statistics/vtkDescriptiveStatistics.cxx
index 329d051b981a416f1e444129c7ca026283831bfd..b47c4f199ec89f9a2898be1f4659e7c04041d1b5 100644
--- a/Filters/Statistics/vtkDescriptiveStatistics.cxx
+++ b/Filters/Statistics/vtkDescriptiveStatistics.cxx
@@ -622,9 +622,9 @@ public:
this->Data = vals;
this->Nominal = nominal;
}
- ~ZedDeviationDeviantFunctor() VTK_OVERRIDE { }
+ ~ZedDeviationDeviantFunctor() override { }
void operator() ( vtkDoubleArray* result,
- vtkIdType id ) VTK_OVERRIDE
+ vtkIdType id ) override
{
result->SetNumberOfValues( 1 );
result->SetValue( 0, ( this->Data->GetTuple1( id ) == this->Nominal ) ? 0. : 1. );
@@ -642,9 +642,9 @@ public:
this->Nominal = nominal;
this->Deviation = deviation;
}
- ~SignedTableColumnDeviantFunctor() VTK_OVERRIDE { }
+ ~SignedTableColumnDeviantFunctor() override { }
void operator() ( vtkDoubleArray* result,
- vtkIdType id ) VTK_OVERRIDE
+ vtkIdType id ) override
{
result->SetNumberOfValues( 1 );
result->SetValue( 0, ( this->Data->GetTuple1( id ) - this->Nominal ) / this->Deviation );
@@ -662,9 +662,9 @@ public:
this->Nominal = nominal;
this->Deviation = deviation;
}
- ~UnsignedTableColumnDeviantFunctor() VTK_OVERRIDE { }
+ ~UnsignedTableColumnDeviantFunctor() override { }
void operator() ( vtkDoubleArray* result,
- vtkIdType id ) VTK_OVERRIDE
+ vtkIdType id ) override
{
result->SetNumberOfValues( 1 );
result->SetValue( 0, fabs ( this->Data->GetTuple1( id ) - this->Nominal ) / this->Deviation );
diff --git a/Filters/Statistics/vtkDescriptiveStatistics.h b/Filters/Statistics/vtkDescriptiveStatistics.h
index 0539e6656208814afc8b256ddcdb30effeae849f..0151c117364643715e3ee91ad509e8e401cc2d70 100644
--- a/Filters/Statistics/vtkDescriptiveStatistics.h
+++ b/Filters/Statistics/vtkDescriptiveStatistics.h
@@ -62,7 +62,7 @@ class VTKFILTERSSTATISTICS_EXPORT vtkDescriptiveStatistics : public vtkStatistic
{
public:
vtkTypeMacro(vtkDescriptiveStatistics, vtkStatisticsAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkDescriptiveStatistics* New();
//@{
@@ -113,11 +113,11 @@ public:
* Given a collection of models, calculate aggregate model
*/
void Aggregate( vtkDataObjectCollection*,
- vtkMultiBlockDataSet* ) VTK_OVERRIDE;
+ vtkMultiBlockDataSet* ) override;
protected:
vtkDescriptiveStatistics();
- ~vtkDescriptiveStatistics() VTK_OVERRIDE;
+ ~vtkDescriptiveStatistics() override;
/**
* Execute the calculations required by the Learn option, given some input Data
@@ -125,26 +125,26 @@ protected:
*/
void Learn( vtkTable*,
vtkTable*,
- vtkMultiBlockDataSet* ) VTK_OVERRIDE;
+ vtkMultiBlockDataSet* ) override;
/**
* Execute the calculations required by the Derive option.
*/
- void Derive( vtkMultiBlockDataSet* ) VTK_OVERRIDE;
+ void Derive( vtkMultiBlockDataSet* ) override;
/**
* Execute the calculations required by the Test option.
*/
void Test( vtkTable*,
vtkMultiBlockDataSet*,
- vtkTable* ) VTK_OVERRIDE;
+ vtkTable* ) override;
/**
* Execute the calculations required by the Assess option.
*/
void Assess( vtkTable* inData,
vtkMultiBlockDataSet* inMeta,
- vtkTable* outData ) VTK_OVERRIDE
+ vtkTable* outData ) override
{ this->Superclass::Assess( inData, inMeta, outData, 1 ); }
/**
@@ -159,7 +159,7 @@ protected:
void SelectAssessFunctor( vtkTable* outData,
vtkDataObject* inMeta,
vtkStringArray* rowNames,
- AssessFunctor*& dfunc ) VTK_OVERRIDE;
+ AssessFunctor*& dfunc ) override;
int UnbiasedVariance;
int G1Skewness;
diff --git a/Filters/Statistics/vtkExtractFunctionalBagPlot.h b/Filters/Statistics/vtkExtractFunctionalBagPlot.h
index 8f577f700103dbe66f70caa938627b3c61b299b3..2fa0ebc6111b51dd90a3621ed156b25c244e3a1b 100644
--- a/Filters/Statistics/vtkExtractFunctionalBagPlot.h
+++ b/Filters/Statistics/vtkExtractFunctionalBagPlot.h
@@ -39,7 +39,7 @@ class VTKFILTERSSTATISTICS_EXPORT vtkExtractFunctionalBagPlot : public vtkTableA
public:
static vtkExtractFunctionalBagPlot* New();
vtkTypeMacro(vtkExtractFunctionalBagPlot, vtkTableAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
// Density value for the median quartile.
vtkSetMacro(DensityForP50, double);
@@ -54,11 +54,11 @@ public:
protected:
vtkExtractFunctionalBagPlot();
- ~vtkExtractFunctionalBagPlot() VTK_OVERRIDE;
+ ~vtkExtractFunctionalBagPlot() override;
int RequestData(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
char *P50String;
char *PUserString;
diff --git a/Filters/Statistics/vtkHighestDensityRegionsStatistics.h b/Filters/Statistics/vtkHighestDensityRegionsStatistics.h
index db4024c8d2a444a59efb240c26278e278bef5daf..718f4daf2e15e3391c75afd6987c13809c7c0e23 100644
--- a/Filters/Statistics/vtkHighestDensityRegionsStatistics.h
+++ b/Filters/Statistics/vtkHighestDensityRegionsStatistics.h
@@ -50,14 +50,14 @@ class VTKFILTERSSTATISTICS_EXPORT vtkHighestDensityRegionsStatistics :
{
public:
vtkTypeMacro(vtkHighestDensityRegionsStatistics, vtkStatisticsAlgorithm);
- void PrintSelf( ostream& os, vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf( ostream& os, vtkIndent indent ) override;
static vtkHighestDensityRegionsStatistics* New();
/**
* Given a collection of models, calculate aggregate model
*/
void Aggregate(vtkDataObjectCollection*,
- vtkMultiBlockDataSet*) VTK_OVERRIDE { return; }
+ vtkMultiBlockDataSet*) override { return; }
/**
* Set the width of the gaussian kernel.
@@ -90,33 +90,33 @@ public:
protected:
vtkHighestDensityRegionsStatistics();
- ~vtkHighestDensityRegionsStatistics() VTK_OVERRIDE;
+ ~vtkHighestDensityRegionsStatistics() override;
/**
* Execute the calculations required by the Learn option.
*/
void Learn(vtkTable*,
vtkTable*,
- vtkMultiBlockDataSet*) VTK_OVERRIDE;
+ vtkMultiBlockDataSet*) override;
/**
* Execute the calculations required by the Derive option.
*/
- void Derive(vtkMultiBlockDataSet*) VTK_OVERRIDE;
+ void Derive(vtkMultiBlockDataSet*) override;
/**
* Execute the calculations required by the Assess option.
*/
void Assess(vtkTable*,
vtkMultiBlockDataSet*,
- vtkTable*) VTK_OVERRIDE { return; }
+ vtkTable*) override { return; }
/**
* Execute the calculations required by the Test option.
*/
void Test(vtkTable*,
vtkMultiBlockDataSet*,
- vtkTable*) VTK_OVERRIDE { return; }
+ vtkTable*) override { return; }
/**
* Provide the appropriate assessment functor.
@@ -124,7 +124,7 @@ protected:
void SelectAssessFunctor(vtkTable*,
vtkDataObject*,
vtkStringArray*,
- AssessFunctor*&) VTK_OVERRIDE { return; }
+ AssessFunctor*&) override { return; }
//@{
/**
diff --git a/Filters/Statistics/vtkKMeansAssessFunctor.h b/Filters/Statistics/vtkKMeansAssessFunctor.h
index b84dab0e5738fdcd5ee306243aedc3c06b5dd400..fd8a95fd14e6b9441a9682b0d47de0073646b17c 100644
--- a/Filters/Statistics/vtkKMeansAssessFunctor.h
+++ b/Filters/Statistics/vtkKMeansAssessFunctor.h
@@ -10,8 +10,8 @@ class vtkKMeansAssessFunctor : public vtkStatisticsAlgorithm::AssessFunctor
public:
static vtkKMeansAssessFunctor* New();
vtkKMeansAssessFunctor() { }
- ~vtkKMeansAssessFunctor() VTK_OVERRIDE;
- void operator () ( vtkDoubleArray* result, vtkIdType row ) VTK_OVERRIDE;
+ ~vtkKMeansAssessFunctor() override;
+ void operator () ( vtkDoubleArray* result, vtkIdType row ) override;
bool Initialize( vtkTable *inData, vtkTable *reqModel, vtkKMeansDistanceFunctor *distFunc );
int GetNumberOfRuns() { return NumRuns; }
};
diff --git a/Filters/Statistics/vtkKMeansDistanceFunctor.h b/Filters/Statistics/vtkKMeansDistanceFunctor.h
index 730ddf2ec636754c81c291a4ba46b39b963de903..5293f1b5cf9fdaad6cb2a6065e9bcd9d98728026 100644
--- a/Filters/Statistics/vtkKMeansDistanceFunctor.h
+++ b/Filters/Statistics/vtkKMeansDistanceFunctor.h
@@ -25,7 +25,7 @@ class VTKFILTERSSTATISTICS_EXPORT vtkKMeansDistanceFunctor : public vtkObject
public:
static vtkKMeansDistanceFunctor* New();
vtkTypeMacro(vtkKMeansDistanceFunctor,vtkObject);
- void PrintSelf( ostream& os, vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf( ostream& os, vtkIndent indent ) override;
/**
* Return an empty tuple. These values are used as cluster center coordinates
@@ -98,7 +98,7 @@ public:
protected:
vtkKMeansDistanceFunctor();
- ~vtkKMeansDistanceFunctor() VTK_OVERRIDE;
+ ~vtkKMeansDistanceFunctor() override;
vtkVariantArray* EmptyTuple; // Used to quickly initialize Tuple for each datum
vtkTable* CenterUpdates; // Used to hold online computation of next iteration's cluster center coords.
diff --git a/Filters/Statistics/vtkKMeansDistanceFunctorCalculator.h b/Filters/Statistics/vtkKMeansDistanceFunctorCalculator.h
index ed8ad8b396e89adf7df5544071e37a8eb6101dab..2d3943c53151c6921437235b70e5d5e4b2fa7859 100644
--- a/Filters/Statistics/vtkKMeansDistanceFunctorCalculator.h
+++ b/Filters/Statistics/vtkKMeansDistanceFunctorCalculator.h
@@ -32,13 +32,13 @@ class VTKFILTERSSTATISTICS_EXPORT vtkKMeansDistanceFunctorCalculator : public vt
public:
static vtkKMeansDistanceFunctorCalculator* New();
vtkTypeMacro(vtkKMeansDistanceFunctorCalculator,vtkKMeansDistanceFunctor);
- void PrintSelf( ostream& os, vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf( ostream& os, vtkIndent indent ) override;
/**
* Compute the distance from one observation to another, returning the distance
* in the first argument.
*/
- void operator() ( double&, vtkVariantArray*, vtkVariantArray * ) VTK_OVERRIDE;
+ void operator() ( double&, vtkVariantArray*, vtkVariantArray * ) override;
//@{
/**
@@ -61,7 +61,7 @@ public:
protected:
vtkKMeansDistanceFunctorCalculator();
- ~vtkKMeansDistanceFunctorCalculator() VTK_OVERRIDE;
+ ~vtkKMeansDistanceFunctorCalculator() override;
char* DistanceExpression;
int TupleSize;
diff --git a/Filters/Statistics/vtkKMeansStatistics.h b/Filters/Statistics/vtkKMeansStatistics.h
index 79dae50af5252857f98c40de5da99870116c22e5..32f4604ff62575316cea8782d46a52f6f3fca8d0 100644
--- a/Filters/Statistics/vtkKMeansStatistics.h
+++ b/Filters/Statistics/vtkKMeansStatistics.h
@@ -109,7 +109,7 @@ class VTKFILTERSSTATISTICS_EXPORT vtkKMeansStatistics : public vtkStatisticsAlgo
{
public:
vtkTypeMacro(vtkKMeansStatistics, vtkStatisticsAlgorithm);
- void PrintSelf( ostream& os, vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf( ostream& os, vtkIndent indent ) override;
static vtkKMeansStatistics* New();
//@{
@@ -159,43 +159,43 @@ public:
* NB: not implemented
*/
void Aggregate( vtkDataObjectCollection*,
- vtkMultiBlockDataSet* ) VTK_OVERRIDE { return; };
+ vtkMultiBlockDataSet* ) override { return; };
/**
* A convenience method for setting properties by name.
*/
bool SetParameter(
- const char* parameter, int index, vtkVariant value ) VTK_OVERRIDE;
+ const char* parameter, int index, vtkVariant value ) override;
protected:
vtkKMeansStatistics();
- ~vtkKMeansStatistics() VTK_OVERRIDE;
+ ~vtkKMeansStatistics() override;
/**
* Execute the calculations required by the Learn option.
*/
void Learn( vtkTable*,
vtkTable*,
- vtkMultiBlockDataSet* ) VTK_OVERRIDE;
+ vtkMultiBlockDataSet* ) override;
/**
* Execute the calculations required by the Derive option.
*/
- void Derive( vtkMultiBlockDataSet* ) VTK_OVERRIDE;
+ void Derive( vtkMultiBlockDataSet* ) override;
/**
* Execute the calculations required by the Assess option.
*/
void Assess( vtkTable*,
vtkMultiBlockDataSet*,
- vtkTable* ) VTK_OVERRIDE;
+ vtkTable* ) override;
/**
* Execute the calculations required by the Test option.
*/
void Test( vtkTable*,
vtkMultiBlockDataSet*,
- vtkTable* ) VTK_OVERRIDE { return; };
+ vtkTable* ) override { return; };
/**
* Provide the appropriate assessment functor.
@@ -203,7 +203,7 @@ protected:
void SelectAssessFunctor( vtkTable* inData,
vtkDataObject* inMeta,
vtkStringArray* rowNames,
- AssessFunctor*& dfunc ) VTK_OVERRIDE;
+ AssessFunctor*& dfunc ) override;
/**
* Subroutine to update new cluster centers from the old centers.
diff --git a/Filters/Statistics/vtkMultiCorrelativeStatistics.h b/Filters/Statistics/vtkMultiCorrelativeStatistics.h
index 87a0e64f2bf83efbbc76dd551d8ddc667c266213..e112e8247e03b5de54d1e0e74bcdef26a7527443 100644
--- a/Filters/Statistics/vtkMultiCorrelativeStatistics.h
+++ b/Filters/Statistics/vtkMultiCorrelativeStatistics.h
@@ -90,14 +90,14 @@ class VTKFILTERSSTATISTICS_EXPORT vtkMultiCorrelativeStatistics : public vtkStat
{
public:
vtkTypeMacro(vtkMultiCorrelativeStatistics, vtkStatisticsAlgorithm);
- void PrintSelf( ostream& os, vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf( ostream& os, vtkIndent indent ) override;
static vtkMultiCorrelativeStatistics* New();
/**
* Given a collection of models, calculate aggregate model
*/
void Aggregate( vtkDataObjectCollection*,
- vtkMultiBlockDataSet* ) VTK_OVERRIDE;
+ vtkMultiBlockDataSet* ) override;
//@{
/**
@@ -112,33 +112,33 @@ public:
protected:
vtkMultiCorrelativeStatistics();
- ~vtkMultiCorrelativeStatistics() VTK_OVERRIDE;
+ ~vtkMultiCorrelativeStatistics() override;
/**
* Execute the calculations required by the Learn option.
*/
void Learn( vtkTable*,
vtkTable*,
- vtkMultiBlockDataSet* ) VTK_OVERRIDE;
+ vtkMultiBlockDataSet* ) override;
/**
* Execute the calculations required by the Derive option.
*/
- void Derive( vtkMultiBlockDataSet* ) VTK_OVERRIDE;
+ void Derive( vtkMultiBlockDataSet* ) override;
/**
* Execute the calculations required by the Assess option.
*/
void Assess( vtkTable*,
vtkMultiBlockDataSet*,
- vtkTable* ) VTK_OVERRIDE;
+ vtkTable* ) override;
/**
* Execute the calculations required by the Test option.
*/
void Test( vtkTable*,
vtkMultiBlockDataSet*,
- vtkTable* ) VTK_OVERRIDE { return; }
+ vtkTable* ) override { return; }
/**
* Provide the appropriate assessment functor.
@@ -146,7 +146,7 @@ protected:
void SelectAssessFunctor( vtkTable* inData,
vtkDataObject* inMeta,
vtkStringArray* rowNames,
- AssessFunctor*& dfunc ) VTK_OVERRIDE;
+ AssessFunctor*& dfunc ) override;
/**
* Computes the median of inData with vtkOrderStatistics.
diff --git a/Filters/Statistics/vtkMultiCorrelativeStatisticsAssessFunctor.h b/Filters/Statistics/vtkMultiCorrelativeStatisticsAssessFunctor.h
index 313af0167995927d48c4a03e1025587c78f96e94..6ec33327b0ce11bc662ff30eaeeb750f5f5d07e0 100644
--- a/Filters/Statistics/vtkMultiCorrelativeStatisticsAssessFunctor.h
+++ b/Filters/Statistics/vtkMultiCorrelativeStatisticsAssessFunctor.h
@@ -20,10 +20,10 @@ public:
static vtkMultiCorrelativeAssessFunctor* New();
vtkMultiCorrelativeAssessFunctor() { }
- ~vtkMultiCorrelativeAssessFunctor() VTK_OVERRIDE { }
+ ~vtkMultiCorrelativeAssessFunctor() override { }
virtual bool Initialize( vtkTable* inData, vtkTable* reqModel, bool cholesky = true );
- void operator () ( vtkDoubleArray* result, vtkIdType row ) VTK_OVERRIDE;
+ void operator () ( vtkDoubleArray* result, vtkIdType row ) override;
vtkIdType GetNumberOfColumns() { return static_cast<vtkIdType>( this->Columns.size() ); }
vtkDataArray* GetColumn( vtkIdType colIdx ) { return this->Columns[colIdx]; }
diff --git a/Filters/Statistics/vtkOrderStatistics.cxx b/Filters/Statistics/vtkOrderStatistics.cxx
index b5d94fde28cdb4d465f6887d821963b5c293f620..ad7222dbf373bdc7910504dc61b6ceab113cd556 100644
--- a/Filters/Statistics/vtkOrderStatistics.cxx
+++ b/Filters/Statistics/vtkOrderStatistics.cxx
@@ -842,11 +842,11 @@ public:
this->Data = vtkArrayDownCast<vtkDataArray>( vals );
this->Quantiles = vtkArrayDownCast<vtkDataArray>( quantiles );
}
- ~DataArrayQuantizer() VTK_OVERRIDE
+ ~DataArrayQuantizer() override
{
}
void operator() ( vtkDoubleArray* result,
- vtkIdType id ) VTK_OVERRIDE
+ vtkIdType id ) override
{
result->SetNumberOfValues( 1 );
@@ -883,11 +883,11 @@ public:
this->Data = vtkArrayDownCast<vtkStringArray>( vals );
this->Quantiles = vtkArrayDownCast<vtkStringArray>( quantiles );
}
- ~StringArrayQuantizer() VTK_OVERRIDE
+ ~StringArrayQuantizer() override
{
}
void operator() ( vtkDoubleArray* result,
- vtkIdType id ) VTK_OVERRIDE
+ vtkIdType id ) override
{
result->SetNumberOfValues( 1 );
@@ -924,11 +924,11 @@ public:
this->Data = vtkArrayDownCast<vtkVariantArray>( vals );
this->Quantiles = vtkArrayDownCast<vtkVariantArray>( quantiles );
}
- ~VariantArrayQuantizer() VTK_OVERRIDE
+ ~VariantArrayQuantizer() override
{
}
void operator() ( vtkDoubleArray* result,
- vtkIdType id ) VTK_OVERRIDE
+ vtkIdType id ) override
{
result->SetNumberOfValues( 1 );
diff --git a/Filters/Statistics/vtkOrderStatistics.h b/Filters/Statistics/vtkOrderStatistics.h
index 5878160f329851ac8010b2ebef9fe13cd6a9eb54..e0a31601cfd84a0730640b2da13514bc03a529f2 100644
--- a/Filters/Statistics/vtkOrderStatistics.h
+++ b/Filters/Statistics/vtkOrderStatistics.h
@@ -55,7 +55,7 @@ class VTKFILTERSSTATISTICS_EXPORT vtkOrderStatistics : public vtkStatisticsAlgor
{
public:
vtkTypeMacro(vtkOrderStatistics, vtkStatisticsAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkOrderStatistics* New();
/**
@@ -112,44 +112,44 @@ public:
*/
bool SetParameter( const char* parameter,
int index,
- vtkVariant value ) VTK_OVERRIDE;
+ vtkVariant value ) override;
/**
* Given a collection of models, calculate aggregate model
* NB: not implemented
*/
void Aggregate( vtkDataObjectCollection*,
- vtkMultiBlockDataSet* ) VTK_OVERRIDE { return; };
+ vtkMultiBlockDataSet* ) override { return; };
protected:
vtkOrderStatistics();
- ~vtkOrderStatistics() VTK_OVERRIDE;
+ ~vtkOrderStatistics() override;
/**
* Execute the calculations required by the Learn option.
*/
void Learn( vtkTable*,
vtkTable*,
- vtkMultiBlockDataSet* ) VTK_OVERRIDE;
+ vtkMultiBlockDataSet* ) override;
/**
* Execute the calculations required by the Derive option.
*/
- void Derive( vtkMultiBlockDataSet* ) VTK_OVERRIDE;
+ void Derive( vtkMultiBlockDataSet* ) override;
/**
* Execute the calculations required by the Test option.
*/
void Test( vtkTable*,
vtkMultiBlockDataSet*,
- vtkTable* ) VTK_OVERRIDE;
+ vtkTable* ) override;
/**
* Execute the calculations required by the Assess option.
*/
void Assess( vtkTable* inData,
vtkMultiBlockDataSet* inMeta,
- vtkTable* outData ) VTK_OVERRIDE
+ vtkTable* outData ) override
{ this->Superclass::Assess( inData, inMeta, outData, 1 ); }
/**
@@ -158,7 +158,7 @@ protected:
void SelectAssessFunctor( vtkTable* outData,
vtkDataObject* inMeta,
vtkStringArray* rowNames,
- AssessFunctor*& dfunc ) VTK_OVERRIDE;
+ AssessFunctor*& dfunc ) override;
vtkIdType NumberOfIntervals;
QuantileDefinitionType QuantileDefinition;
diff --git a/Filters/Statistics/vtkPCAStatistics.cxx b/Filters/Statistics/vtkPCAStatistics.cxx
index 7c2c78f8e23e0a51abd0ac48a384dc55faa681b9..7143a294c5acc8805823befc6d24f4c7d4873a61 100644
--- a/Filters/Statistics/vtkPCAStatistics.cxx
+++ b/Filters/Statistics/vtkPCAStatistics.cxx
@@ -199,12 +199,12 @@ public:
static vtkPCAAssessFunctor* New();
vtkPCAAssessFunctor() { }
- ~vtkPCAAssessFunctor() VTK_OVERRIDE { }
+ ~vtkPCAAssessFunctor() override { }
virtual bool InitializePCA(
vtkTable* inData, vtkTable* reqModel,
int normScheme, int basisScheme, int basisSize, double basisEnergy );
- void operator () ( vtkDoubleArray* result, vtkIdType row ) VTK_OVERRIDE;
+ void operator () ( vtkDoubleArray* result, vtkIdType row ) override;
std::vector<double> EigenValues;
std::vector<std::vector<double> > EigenVectors;
diff --git a/Filters/Statistics/vtkPCAStatistics.h b/Filters/Statistics/vtkPCAStatistics.h
index 692e65885c6fdfc57760e008182fd64b4b46bcd4..af4fcbb487b1132600f5e4bcd4bccd6f6d4b5967 100644
--- a/Filters/Statistics/vtkPCAStatistics.h
+++ b/Filters/Statistics/vtkPCAStatistics.h
@@ -63,7 +63,7 @@ class VTKFILTERSSTATISTICS_EXPORT vtkPCAStatistics : public vtkMultiCorrelativeS
{
public:
vtkTypeMacro(vtkPCAStatistics,vtkMultiCorrelativeStatistics);
- void PrintSelf( ostream& os, vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf( ostream& os, vtkIndent indent ) override;
static vtkPCAStatistics* New();
/**
@@ -238,37 +238,37 @@ public:
*/
bool SetParameter( const char* parameter,
int index,
- vtkVariant value ) VTK_OVERRIDE;
+ vtkVariant value ) override;
protected:
vtkPCAStatistics();
- ~vtkPCAStatistics() VTK_OVERRIDE;
+ ~vtkPCAStatistics() override;
/**
* This algorithm accepts a vtkTable containing normalization values for
* its fourth input (port 3).
* We override FillInputPortInformation to indicate this.
*/
- int FillInputPortInformation( int port, vtkInformation* info ) VTK_OVERRIDE;
+ int FillInputPortInformation( int port, vtkInformation* info ) override;
/**
* Execute the calculations required by the Derive option.
*/
- void Derive( vtkMultiBlockDataSet* ) VTK_OVERRIDE;
+ void Derive( vtkMultiBlockDataSet* ) override;
/**
* Execute the calculations required by the Test option.
*/
void Test( vtkTable*,
vtkMultiBlockDataSet*,
- vtkTable* ) VTK_OVERRIDE;
+ vtkTable* ) override;
/**
* Execute the calculations required by the Assess option.
*/
void Assess( vtkTable*,
vtkMultiBlockDataSet*,
- vtkTable* ) VTK_OVERRIDE;
+ vtkTable* ) override;
/**
* Calculate p-value. This will be overridden using the object factory with an
@@ -282,7 +282,7 @@ protected:
void SelectAssessFunctor( vtkTable* inData,
vtkDataObject* inMeta,
vtkStringArray* rowNames,
- AssessFunctor*& dfunc ) VTK_OVERRIDE;
+ AssessFunctor*& dfunc ) override;
int NormalizationScheme;
int BasisScheme;
diff --git a/Filters/Statistics/vtkStatisticsAlgorithm.h b/Filters/Statistics/vtkStatisticsAlgorithm.h
index b27b756d8ce515cb4c4587b6689c62bf6006bc7c..d71c11d8374ba5b34fc9d68139329e3e4e208d64 100644
--- a/Filters/Statistics/vtkStatisticsAlgorithm.h
+++ b/Filters/Statistics/vtkStatisticsAlgorithm.h
@@ -72,7 +72,7 @@ class VTKFILTERSSTATISTICS_EXPORT vtkStatisticsAlgorithm : public vtkTableAlgori
{
public:
vtkTypeMacro(vtkStatisticsAlgorithm, vtkTableAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* enumeration values to specify input port types
@@ -284,15 +284,15 @@ public:
protected:
vtkStatisticsAlgorithm();
- ~vtkStatisticsAlgorithm() VTK_OVERRIDE;
+ ~vtkStatisticsAlgorithm() override;
- int FillInputPortInformation( int port, vtkInformation* info ) VTK_OVERRIDE;
- int FillOutputPortInformation( int port, vtkInformation* info ) VTK_OVERRIDE;
+ int FillInputPortInformation( int port, vtkInformation* info ) override;
+ int FillOutputPortInformation( int port, vtkInformation* info ) override;
int RequestData(
vtkInformation*,
vtkInformationVector**,
- vtkInformationVector* ) VTK_OVERRIDE;
+ vtkInformationVector* ) override;
/**
* Execute the calculations required by the Learn option, given some input Data
diff --git a/Filters/Statistics/vtkStrahlerMetric.h b/Filters/Statistics/vtkStrahlerMetric.h
index a101c1afa027db9bc89c16d68ab6993aa20588b2..e2077560392342e429a6d3dacd1155eaceb9de34 100644
--- a/Filters/Statistics/vtkStrahlerMetric.h
+++ b/Filters/Statistics/vtkStrahlerMetric.h
@@ -54,7 +54,7 @@ class VTKFILTERSSTATISTICS_EXPORT vtkStrahlerMetric : public vtkTreeAlgorithm
public:
static vtkStrahlerMetric *New();
vtkTypeMacro(vtkStrahlerMetric,vtkTreeAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -85,9 +85,9 @@ public:
protected:
vtkStrahlerMetric();
- ~vtkStrahlerMetric() VTK_OVERRIDE;
+ ~vtkStrahlerMetric() override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
int Normalize;
float MaxStrahler;
diff --git a/Filters/Statistics/vtkStreamingStatistics.h b/Filters/Statistics/vtkStreamingStatistics.h
index 8cc8b10571e83aab1f33a214e32f500198c13286..29b6f788f89394bced2d2e9f2f22f5c0720c69c5 100644
--- a/Filters/Statistics/vtkStreamingStatistics.h
+++ b/Filters/Statistics/vtkStreamingStatistics.h
@@ -46,7 +46,7 @@ class VTKFILTERSSTATISTICS_EXPORT vtkStreamingStatistics : public vtkTableAlgori
{
public:
vtkTypeMacro(vtkStreamingStatistics, vtkTableAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkStreamingStatistics* New();
/**
@@ -73,15 +73,15 @@ public:
protected:
vtkStreamingStatistics();
- ~vtkStreamingStatistics() VTK_OVERRIDE;
+ ~vtkStreamingStatistics() override;
- int FillInputPortInformation( int port, vtkInformation* info ) VTK_OVERRIDE;
- int FillOutputPortInformation( int port, vtkInformation* info ) VTK_OVERRIDE;
+ int FillInputPortInformation( int port, vtkInformation* info ) override;
+ int FillOutputPortInformation( int port, vtkInformation* info ) override;
int RequestData(
vtkInformation*,
vtkInformationVector**,
- vtkInformationVector* ) VTK_OVERRIDE;
+ vtkInformationVector* ) override;
private:
vtkStreamingStatistics( const vtkStreamingStatistics& ) VTK_DELETE_FUNCTION;
diff --git a/Filters/Texture/vtkImplicitTextureCoords.h b/Filters/Texture/vtkImplicitTextureCoords.h
index fdff2ac045239c36174b33f9bca2e1425606c4b3..d625fe6ffaa6c47a6352f5c669eb09d0d36c35cd 100644
--- a/Filters/Texture/vtkImplicitTextureCoords.h
+++ b/Filters/Texture/vtkImplicitTextureCoords.h
@@ -58,7 +58,7 @@ class VTKFILTERSTEXTURE_EXPORT vtkImplicitTextureCoords : public vtkDataSetAlgor
{
public:
vtkTypeMacro(vtkImplicitTextureCoords,vtkDataSetAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Create object with texture dimension=2 and no r-s-t implicit functions
@@ -102,9 +102,9 @@ public:
protected:
vtkImplicitTextureCoords();
- ~vtkImplicitTextureCoords() VTK_OVERRIDE;
+ ~vtkImplicitTextureCoords() override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
vtkImplicitFunction *RFunction;
vtkImplicitFunction *SFunction;
diff --git a/Filters/Texture/vtkTextureMapToCylinder.h b/Filters/Texture/vtkTextureMapToCylinder.h
index be69e77996017ff0f49c69ac1ffbc6876879ee8b..786276bf13928eaac3b7f84b55b948b305ea85db 100644
--- a/Filters/Texture/vtkTextureMapToCylinder.h
+++ b/Filters/Texture/vtkTextureMapToCylinder.h
@@ -53,7 +53,7 @@ class VTKFILTERSTEXTURE_EXPORT vtkTextureMapToCylinder : public vtkDataSetAlgori
{
public:
vtkTypeMacro(vtkTextureMapToCylinder,vtkDataSetAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Create object with cylinder axis parallel to z-axis (points (0,0,-0.5)
@@ -102,9 +102,9 @@ public:
protected:
vtkTextureMapToCylinder();
- ~vtkTextureMapToCylinder() VTK_OVERRIDE {}
+ ~vtkTextureMapToCylinder() override {}
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
double Point1[3];
double Point2[3];
diff --git a/Filters/Texture/vtkTextureMapToPlane.h b/Filters/Texture/vtkTextureMapToPlane.h
index f7f51342e813e29e1e0fff0e00efcfd2cb99872a..b04cbfee74cdd49d0cc14e512c0ba18dee2b6500 100644
--- a/Filters/Texture/vtkTextureMapToPlane.h
+++ b/Filters/Texture/vtkTextureMapToPlane.h
@@ -47,7 +47,7 @@ class VTKFILTERSTEXTURE_EXPORT vtkTextureMapToPlane : public vtkDataSetAlgorithm
{
public:
vtkTypeMacro(vtkTextureMapToPlane,vtkDataSetAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct with s,t range=(0,1) and automatic plane generation turned on.
@@ -116,9 +116,9 @@ public:
protected:
vtkTextureMapToPlane();
- ~vtkTextureMapToPlane() VTK_OVERRIDE {}
+ ~vtkTextureMapToPlane() override {}
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
void ComputeNormal(vtkDataSet *output);
double Origin[3];
diff --git a/Filters/Texture/vtkTextureMapToSphere.h b/Filters/Texture/vtkTextureMapToSphere.h
index b819fd8f610290b33e2af5a983eeca4756a1a3ca..434de07dfdcaed881b2c88e1f6765b65d6cc9e4e 100644
--- a/Filters/Texture/vtkTextureMapToSphere.h
+++ b/Filters/Texture/vtkTextureMapToSphere.h
@@ -51,7 +51,7 @@ class VTKFILTERSTEXTURE_EXPORT vtkTextureMapToSphere : public vtkDataSetAlgorith
{
public:
vtkTypeMacro(vtkTextureMapToSphere,vtkDataSetAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Create object with Center (0,0,0) and the PreventSeam ivar is set to
@@ -91,9 +91,9 @@ public:
protected:
vtkTextureMapToSphere();
- ~vtkTextureMapToSphere() VTK_OVERRIDE {}
+ ~vtkTextureMapToSphere() override {}
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
double Center[3];
int AutomaticSphereGeneration;
diff --git a/Filters/Texture/vtkThresholdTextureCoords.h b/Filters/Texture/vtkThresholdTextureCoords.h
index eb83bcfe8eebeb56d36791b9bf7d58aa13ae2ba5..ded44847b26fb0f8d882458a227fb14bb5ddaa8d 100644
--- a/Filters/Texture/vtkThresholdTextureCoords.h
+++ b/Filters/Texture/vtkThresholdTextureCoords.h
@@ -46,7 +46,7 @@ class VTKFILTERSTEXTURE_EXPORT vtkThresholdTextureCoords : public vtkDataSetAlgo
public:
static vtkThresholdTextureCoords *New();
vtkTypeMacro(vtkThresholdTextureCoords,vtkDataSetAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Criterion is cells whose scalars are less than lower threshold.
@@ -98,10 +98,10 @@ public:
protected:
vtkThresholdTextureCoords();
- ~vtkThresholdTextureCoords() VTK_OVERRIDE {}
+ ~vtkThresholdTextureCoords() override {}
// Usual data generation method
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
double LowerThreshold;
double UpperThreshold;
diff --git a/Filters/Texture/vtkTransformTextureCoords.h b/Filters/Texture/vtkTransformTextureCoords.h
index b456fe2472fbdaad6b5ff0fda96131f58baaf7a2..989b9c60401191501ff051ac6be25e5e65ca7252 100644
--- a/Filters/Texture/vtkTransformTextureCoords.h
+++ b/Filters/Texture/vtkTransformTextureCoords.h
@@ -42,7 +42,7 @@ class VTKFILTERSTEXTURE_EXPORT vtkTransformTextureCoords : public vtkDataSetAlgo
{
public:
vtkTypeMacro(vtkTransformTextureCoords,vtkDataSetAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Create instance with Origin (0.5,0.5,0.5); Position (0,0,0); and Scale
@@ -120,9 +120,9 @@ public:
protected:
vtkTransformTextureCoords();
- ~vtkTransformTextureCoords() VTK_OVERRIDE {}
+ ~vtkTransformTextureCoords() override {}
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
double Origin[3]; //point around which map rotates
double Position[3]; //controls translation of map
diff --git a/Filters/Texture/vtkTriangularTCoords.h b/Filters/Texture/vtkTriangularTCoords.h
index 295234903b8cc04608829b6cc66a5b3d521aaa33..14b592cb3b21d6545f072a2ca8f7f404c0dd0cd0 100644
--- a/Filters/Texture/vtkTriangularTCoords.h
+++ b/Filters/Texture/vtkTriangularTCoords.h
@@ -40,14 +40,14 @@ class VTKFILTERSTEXTURE_EXPORT vtkTriangularTCoords : public vtkPolyDataAlgorith
public:
static vtkTriangularTCoords *New();
vtkTypeMacro(vtkTriangularTCoords,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkTriangularTCoords() {}
- ~vtkTriangularTCoords() VTK_OVERRIDE {}
+ ~vtkTriangularTCoords() override {}
// Usual data generation method
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
private:
vtkTriangularTCoords(const vtkTriangularTCoords&) VTK_DELETE_FUNCTION;
void operator=(const vtkTriangularTCoords&) VTK_DELETE_FUNCTION;
diff --git a/Filters/Topology/vtkFiberSurface.h b/Filters/Topology/vtkFiberSurface.h
index 5635680e257e574733c93cf2ee04f335e6d779a8..97b316dddee1245d33f7e446664d08813b10d3c1 100644
--- a/Filters/Topology/vtkFiberSurface.h
+++ b/Filters/Topology/vtkFiberSurface.h
@@ -324,7 +324,7 @@ class VTKFILTERSTOPOLOGY_EXPORT vtkFiberSurface : public vtkPolyDataAlgorithm
public:
static vtkFiberSurface* New();
vtkTypeMacro(vtkFiberSurface, vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Specify the first field name to be used in this filter.
@@ -387,8 +387,8 @@ public:
protected:
vtkFiberSurface();
- virtual int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
- virtual int RequestData(vtkInformation*, vtkInformationVector**, vtkInformationVector*) VTK_OVERRIDE;
+ virtual int FillInputPortInformation(int port, vtkInformation* info) override;
+ virtual int RequestData(vtkInformation*, vtkInformationVector**, vtkInformationVector*) override;
// name of the input array names.
char* Fields[2];
diff --git a/Filters/Verdict/vtkCellQuality.h b/Filters/Verdict/vtkCellQuality.h
index 0a113353ef83a1898829a6b8af2c1a9b72283239..5811ef2710e2008138e5a2c61567f0641a87b508 100644
--- a/Filters/Verdict/vtkCellQuality.h
+++ b/Filters/Verdict/vtkCellQuality.h
@@ -80,7 +80,7 @@ class VTKFILTERSVERDICT_EXPORT vtkCellQuality : public vtkDataSetAlgorithm
};
public:
- void PrintSelf (ostream&, vtkIndent) VTK_OVERRIDE;
+ void PrintSelf (ostream&, vtkIndent) override;
vtkTypeMacro(vtkCellQuality, vtkDataSetAlgorithm);
static vtkCellQuality* New ();
@@ -243,7 +243,7 @@ public:
double PolygonArea (vtkCell*);
protected:
- ~vtkCellQuality () VTK_OVERRIDE;
+ ~vtkCellQuality () override;
vtkCellQuality ();
/**
@@ -357,7 +357,7 @@ protected:
double ComputePixelQuality (vtkCell*);
int RequestData
- (vtkInformation*, vtkInformationVector**, vtkInformationVector*) VTK_OVERRIDE;
+ (vtkInformation*, vtkInformationVector**, vtkInformationVector*) override;
//@{
/**
diff --git a/Filters/Verdict/vtkCellSizeFilter.h b/Filters/Verdict/vtkCellSizeFilter.h
index d46add737c775c135006fa4952ce080cccb2ec0c..1531788c0ac4e1dc0b6c7fdb53cb4b91c5433fff 100644
--- a/Filters/Verdict/vtkCellSizeFilter.h
+++ b/Filters/Verdict/vtkCellSizeFilter.h
@@ -44,7 +44,7 @@ class VTKFILTERSVERDICT_EXPORT vtkCellSizeFilter : public vtkPassInputTypeAlgori
{
public:
vtkTypeMacro(vtkCellSizeFilter, vtkPassInputTypeAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkCellSizeFilter* New();
//@{
@@ -125,10 +125,10 @@ public:
protected:
vtkCellSizeFilter();
- ~vtkCellSizeFilter() VTK_OVERRIDE;
+ ~vtkCellSizeFilter() override;
int RequestData(vtkInformation* request, vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
bool ComputeDataSet(vtkDataSet* input, vtkDataSet* output, vtkDoubleArray* sum);
void IntegrateImageData(vtkImageData* input, vtkImageData* output, vtkDoubleArray* sum);
diff --git a/Filters/Verdict/vtkMatrixMathFilter.h b/Filters/Verdict/vtkMatrixMathFilter.h
index f13bdb8f60a98ee76e042bc8d37198b1eb21ea9b..92ae17ba3241a4c553af9268e37e97c8c106c271 100644
--- a/Filters/Verdict/vtkMatrixMathFilter.h
+++ b/Filters/Verdict/vtkMatrixMathFilter.h
@@ -52,7 +52,7 @@ class VTKFILTERSVERDICT_EXPORT vtkMatrixMathFilter : public vtkDataSetAlgorithm
};
public:
- void PrintSelf (ostream&, vtkIndent) VTK_OVERRIDE;
+ void PrintSelf (ostream&, vtkIndent) override;
vtkTypeMacro(vtkMatrixMathFilter, vtkDataSetAlgorithm);
static vtkMatrixMathFilter* New ();
@@ -81,11 +81,11 @@ public:
//@}
protected:
- ~vtkMatrixMathFilter () VTK_OVERRIDE;
+ ~vtkMatrixMathFilter () override;
vtkMatrixMathFilter ();
int RequestData
- (vtkInformation*, vtkInformationVector**, vtkInformationVector*) VTK_OVERRIDE;
+ (vtkInformation*, vtkInformationVector**, vtkInformationVector*) override;
int Operation;
diff --git a/Filters/Verdict/vtkMeshQuality.h b/Filters/Verdict/vtkMeshQuality.h
index f3485f379e6e45ee1be3c7a9570379a3e0b13e57..bdff6813ccb515c128e8eef60ad4f42c417da093 100644
--- a/Filters/Verdict/vtkMeshQuality.h
+++ b/Filters/Verdict/vtkMeshQuality.h
@@ -102,7 +102,7 @@ class vtkDataArray;
class VTKFILTERSVERDICT_EXPORT vtkMeshQuality : public vtkDataSetAlgorithm
{
public:
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
vtkTypeMacro(vtkMeshQuality,vtkDataSetAlgorithm);
static vtkMeshQuality* New();
@@ -927,9 +927,9 @@ public:
protected:
vtkMeshQuality();
- ~vtkMeshQuality() VTK_OVERRIDE;
+ ~vtkMeshQuality() override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
/**
* A function called by some VERDICT triangle quality functions to test for inverted triangles.
diff --git a/GUISupport/Qt/Q4VTKWidgetPlugin.h b/GUISupport/Qt/Q4VTKWidgetPlugin.h
index 427963a76b0bfd94fd7689027b4760b3d9310435..815bd1cd670cb6441f0a86683877373475f71402 100644
--- a/GUISupport/Qt/Q4VTKWidgetPlugin.h
+++ b/GUISupport/Qt/Q4VTKWidgetPlugin.h
@@ -37,25 +37,22 @@
#include <QtPlugin>
#include <QWidget>
-#include "vtkConfigure.h" //for VTK_OVERRIDE
-
-
// implement Designer Custom Widget interface
class QVTKWidgetPlugin : public QDesignerCustomWidgetInterface
{
public:
QVTKWidgetPlugin();
- ~QVTKWidgetPlugin() VTK_OVERRIDE;
+ ~QVTKWidgetPlugin() override;
- QString name() const VTK_OVERRIDE;
- QString domXml() const VTK_OVERRIDE;
- QWidget* createWidget(QWidget* parent = 0) VTK_OVERRIDE;
- QString group() const VTK_OVERRIDE;
- QIcon icon() const VTK_OVERRIDE;
- QString includeFile() const VTK_OVERRIDE;
- QString toolTip() const VTK_OVERRIDE;
- QString whatsThis() const VTK_OVERRIDE;
- bool isContainer() const VTK_OVERRIDE;
+ QString name() const override;
+ QString domXml() const override;
+ QWidget* createWidget(QWidget* parent = 0) override;
+ QString group() const override;
+ QIcon icon() const override;
+ QString includeFile() const override;
+ QString toolTip() const override;
+ QString whatsThis() const override;
+ bool isContainer() const override;
};
// implement designer widget collection interface
@@ -68,9 +65,9 @@ class QVTKPlugin : public QObject, public QDesignerCustomWidgetCollectionInterfa
Q_INTERFACES(QDesignerCustomWidgetCollectionInterface)
public:
QVTKPlugin();
- ~QVTKPlugin() VTK_OVERRIDE;
+ ~QVTKPlugin() override;
- QList<QDesignerCustomWidgetInterface*> customWidgets() const VTK_OVERRIDE;
+ QList<QDesignerCustomWidgetInterface*> customWidgets() const override;
private:
QVTKWidgetPlugin* mQVTKWidgetPlugin;
};
diff --git a/GUISupport/Qt/QFilterTreeProxyModel.h b/GUISupport/Qt/QFilterTreeProxyModel.h
index 19c597341a54740fa18705c7e1f3b705ab75af18..594550d9ccd0024c40526caf6fb0353ccacdfc0c 100644
--- a/GUISupport/Qt/QFilterTreeProxyModel.h
+++ b/GUISupport/Qt/QFilterTreeProxyModel.h
@@ -45,7 +45,7 @@ class VTKGUISUPPORTQT_EXPORT QFilterTreeProxyModel : public QSortFilterProxyMode
public:
QFilterTreeProxyModel(QObject* p = 0);
- ~QFilterTreeProxyModel() VTK_OVERRIDE;
+ ~QFilterTreeProxyModel() override;
// Description:
// The 0-based level in the tree hierarchy to filter on. The root is level 0.
@@ -53,8 +53,8 @@ public:
protected:
- bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const VTK_OVERRIDE;
- bool lessThan(const QModelIndex &left, const QModelIndex &right) const VTK_OVERRIDE;
+ bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override;
+ bool lessThan(const QModelIndex &left, const QModelIndex &right) const override;
private:
diff --git a/GUISupport/Qt/QVTKApplication.h b/GUISupport/Qt/QVTKApplication.h
index d1d86687b2aaa1cd3f1f41d62f6c59bcf6685885..b790907937762adf096d657e940513980cc060e2 100644
--- a/GUISupport/Qt/QVTKApplication.h
+++ b/GUISupport/Qt/QVTKApplication.h
@@ -54,7 +54,7 @@ public:
// Description:
// Destructor.
- ~QVTKApplication() VTK_OVERRIDE;
+ ~QVTKApplication() override;
#if defined(VTK_USE_TDX) && defined(Q_WS_X11)
// Description:
diff --git a/GUISupport/Qt/QVTKInteractor.h b/GUISupport/Qt/QVTKInteractor.h
index a324ee1d5b8251f6d383a5ffaacdbe3e8e218f1a..dbdcb954ab88877ab2fcb4babc2b1d4b631289b3 100644
--- a/GUISupport/Qt/QVTKInteractor.h
+++ b/GUISupport/Qt/QVTKInteractor.h
@@ -83,13 +83,13 @@ public:
// Description:
// Overloaded terminiate app, which does nothing in Qt.
// Use qApp->exit() instead.
- void TerminateApp() VTK_OVERRIDE;
+ void TerminateApp() override;
// Description:
// Overloaded start method does nothing.
// Use qApp->exec() instead.
- void Start() VTK_OVERRIDE;
- void Initialize() VTK_OVERRIDE;
+ void Start() override;
+ void Initialize() override;
// Description:
// Start listening events on 3DConnexion device.
@@ -111,12 +111,12 @@ protected:
// constructor
QVTKInteractor();
// destructor
- ~QVTKInteractor() VTK_OVERRIDE;
+ ~QVTKInteractor() override;
// create a Qt Timer
- int InternalCreateTimer(int timerId, int timerType, unsigned long duration) VTK_OVERRIDE;
+ int InternalCreateTimer(int timerId, int timerType, unsigned long duration) override;
// destroy a Qt Timer
- int InternalDestroyTimer(int platformTimerId) VTK_OVERRIDE;
+ int InternalDestroyTimer(int platformTimerId) override;
#if defined(VTK_USE_TDX) && defined(Q_OS_WIN)
vtkTDxWinDevice *Device;
#endif
diff --git a/GUISupport/Qt/QVTKInteractorAdapter.h b/GUISupport/Qt/QVTKInteractorAdapter.h
index 59b940897992479c265d1df082a8af29999d530b..0d9a3d8e8e0ed12bdca6cd7b8c2e5dbdf624096d 100644
--- a/GUISupport/Qt/QVTKInteractorAdapter.h
+++ b/GUISupport/Qt/QVTKInteractorAdapter.h
@@ -57,7 +57,7 @@ public:
// Description:
// Destructor
- ~QVTKInteractorAdapter() VTK_OVERRIDE;
+ ~QVTKInteractorAdapter() override;
// Description:
// Set the device pixel ration, this defaults to 1, but in Qt 5 can be 2.
diff --git a/GUISupport/Qt/QVTKInteractorInternal.h b/GUISupport/Qt/QVTKInteractorInternal.h
index 9d346cc2e79fa590e6da7d4636008444bc5a8fbe..d80915dcf7792a6d587e24d4619ed3476aaf60af 100644
--- a/GUISupport/Qt/QVTKInteractorInternal.h
+++ b/GUISupport/Qt/QVTKInteractorInternal.h
@@ -32,8 +32,6 @@
#ifndef Q_VTK_INTERACTOR_INTERNAL_H
#define Q_VTK_INTERACTOR_INTERNAL_H
-#include "vtkConfigure.h" //for VTK_OVERRIDE
-
#include <QtCore/QObject>
#include <map>
@@ -47,7 +45,7 @@ class QVTKInteractorInternal : public QObject
Q_OBJECT
public:
QVTKInteractorInternal(QVTKInteractor* p);
- ~QVTKInteractorInternal() VTK_OVERRIDE;
+ ~QVTKInteractorInternal() override;
public Q_SLOTS:
void TimerEvent(int id);
public:
diff --git a/GUISupport/Qt/QVTKOpenGLWidget.cxx b/GUISupport/Qt/QVTKOpenGLWidget.cxx
index c48ee86f8d245aa540f61ad0fb2115098db13b5a..2dcfb43f02f5002bb51a629f354a92bf04f3acf6 100644
--- a/GUISupport/Qt/QVTKOpenGLWidget.cxx
+++ b/GUISupport/Qt/QVTKOpenGLWidget.cxx
@@ -56,7 +56,7 @@ public:
void SetTarget(QVTKOpenGLWidget* target) { this->Target = target; }
- void Execute(vtkObject*, unsigned long eventId, void* callData) VTK_OVERRIDE
+ void Execute(vtkObject*, unsigned long eventId, void* callData) override
{
if (this->Target)
{
@@ -104,7 +104,7 @@ public:
protected:
QVTKOpenGLWidgetObserver() {}
- ~QVTKOpenGLWidgetObserver() VTK_OVERRIDE {}
+ ~QVTKOpenGLWidgetObserver() override {}
QPointer<QVTKOpenGLWidget> Target;
};
diff --git a/GUISupport/Qt/QVTKOpenGLWidget.h b/GUISupport/Qt/QVTKOpenGLWidget.h
index abbaecfd31ad563fdf58543a0244acf1c11130df..d676e153ce1c8af779e0b1be306452f141c25679 100644
--- a/GUISupport/Qt/QVTKOpenGLWidget.h
+++ b/GUISupport/Qt/QVTKOpenGLWidget.h
@@ -126,7 +126,7 @@ class VTKGUISUPPORTQT_EXPORT QVTKOpenGLWidget : public QOpenGLWidget
typedef QOpenGLWidget Superclass;
public:
QVTKOpenGLWidget(QWidget* parent = Q_NULLPTR, Qt::WindowFlags f = Qt::WindowFlags());
- ~QVTKOpenGLWidget() VTK_OVERRIDE;
+ ~QVTKOpenGLWidget() override;
//@{
/**
diff --git a/GUISupport/Qt/QVTKPaintEngine.h b/GUISupport/Qt/QVTKPaintEngine.h
index 0010a79513420993601c654988e84c49f36003b3..fa1af15dbc6fc4cdc83b1ce6b2bca2b8336c8b57 100644
--- a/GUISupport/Qt/QVTKPaintEngine.h
+++ b/GUISupport/Qt/QVTKPaintEngine.h
@@ -39,36 +39,36 @@ class QVTKPaintEngine : public QPaintEngine
{
public:
QVTKPaintEngine();
- ~QVTKPaintEngine() VTK_OVERRIDE;
+ ~QVTKPaintEngine() override;
// Description:
// begin painting on device (QVTKWidget)
- bool begin(QPaintDevice* dev) VTK_OVERRIDE;
+ bool begin(QPaintDevice* dev) override;
// Description:
// end painting on device
- bool end() VTK_OVERRIDE;
+ bool end() override;
// Description:
// returns type User
- QPaintEngine::Type type() const VTK_OVERRIDE;
+ QPaintEngine::Type type() const override;
// Description:
// updateState
- void updateState(const QPaintEngineState&) VTK_OVERRIDE;
+ void updateState(const QPaintEngineState&) override;
// Description:
// draw a pixmap
- void drawPixmap(const QRectF& r, const QPixmap& pm, const QRectF& sr) VTK_OVERRIDE;
+ void drawPixmap(const QRectF& r, const QPixmap& pm, const QRectF& sr) override;
// Description:
// draw a path
- void drawPath(const QPainterPath& path) VTK_OVERRIDE;
+ void drawPath(const QPainterPath& path) override;
// Description:
// draw a polygon
- void drawPolygon(const QPointF* points, int pointCount, PolygonDrawMode mode) VTK_OVERRIDE;
- void drawPolygon(const QPoint* points, int pointCount, PolygonDrawMode mode) VTK_OVERRIDE;
+ void drawPolygon(const QPointF* points, int pointCount, PolygonDrawMode mode) override;
+ void drawPolygon(const QPoint* points, int pointCount, PolygonDrawMode mode) override;
protected:
diff --git a/GUISupport/Qt/QVTKWidget.h b/GUISupport/Qt/QVTKWidget.h
index 468794f2d4b01ed0d3b9d93f56d7f2a1d57f887a..51957095e58913b5b412b1ea12e66f0210d83055 100644
--- a/GUISupport/Qt/QVTKWidget.h
+++ b/GUISupport/Qt/QVTKWidget.h
@@ -83,7 +83,7 @@ public:
//! constructor
QVTKWidget(QWidget* parent = nullptr, Qt::WindowFlags f = 0);
//! destructor
- ~QVTKWidget() VTK_OVERRIDE;
+ ~QVTKWidget() override;
// Description:
// Set the vtk render window, if you wish to use your own vtkRenderWindow
@@ -133,9 +133,9 @@ public:
// Description:
// Handle showing of the Widget
- void showEvent(QShowEvent*) VTK_OVERRIDE;
+ void showEvent(QShowEvent*) override;
- QPaintEngine* paintEngine() const VTK_OVERRIDE;
+ QPaintEngine* paintEngine() const override;
// Description:
// Use a 3DConnexion device. Initial value is false.
@@ -209,47 +209,47 @@ protected Q_SLOTS:
protected:
// overloaded resize handler
- void resizeEvent(QResizeEvent* event) VTK_OVERRIDE;
+ void resizeEvent(QResizeEvent* event) override;
// overloaded move handler
- void moveEvent(QMoveEvent* event) VTK_OVERRIDE;
+ void moveEvent(QMoveEvent* event) override;
// overloaded paint handler
- void paintEvent(QPaintEvent* event) VTK_OVERRIDE;
+ void paintEvent(QPaintEvent* event) override;
// overloaded mouse press handler
- void mousePressEvent(QMouseEvent* event) VTK_OVERRIDE;
+ void mousePressEvent(QMouseEvent* event) override;
// overloaded mouse move handler
- void mouseMoveEvent(QMouseEvent* event) VTK_OVERRIDE;
+ void mouseMoveEvent(QMouseEvent* event) override;
// overloaded mouse release handler
- void mouseReleaseEvent(QMouseEvent* event) VTK_OVERRIDE;
+ void mouseReleaseEvent(QMouseEvent* event) override;
// overloaded key press handler
- void keyPressEvent(QKeyEvent* event) VTK_OVERRIDE;
+ void keyPressEvent(QKeyEvent* event) override;
// overloaded key release handler
- void keyReleaseEvent(QKeyEvent* event) VTK_OVERRIDE;
+ void keyReleaseEvent(QKeyEvent* event) override;
// overloaded enter event
- void enterEvent(QEvent*) VTK_OVERRIDE;
+ void enterEvent(QEvent*) override;
// overloaded leave event
- void leaveEvent(QEvent*) VTK_OVERRIDE;
+ void leaveEvent(QEvent*) override;
#ifndef QT_NO_WHEELEVENT
// overload wheel mouse event
- void wheelEvent(QWheelEvent*) VTK_OVERRIDE;
+ void wheelEvent(QWheelEvent*) override;
#endif
// overload focus event
- void focusInEvent(QFocusEvent*) VTK_OVERRIDE;
+ void focusInEvent(QFocusEvent*) override;
// overload focus event
- void focusOutEvent(QFocusEvent*) VTK_OVERRIDE;
+ void focusOutEvent(QFocusEvent*) override;
// overload Qt's event() to capture more keys
- bool event( QEvent* e ) VTK_OVERRIDE;
+ bool event( QEvent* e ) override;
// overload context menu event
- void contextMenuEvent(QContextMenuEvent*) VTK_OVERRIDE;
+ void contextMenuEvent(QContextMenuEvent*) override;
// overload drag enter event
- void dragEnterEvent(QDragEnterEvent*) VTK_OVERRIDE;
+ void dragEnterEvent(QDragEnterEvent*) override;
// overload drag move event
- void dragMoveEvent(QDragMoveEvent*) VTK_OVERRIDE;
+ void dragMoveEvent(QDragMoveEvent*) override;
// overload drag leave event
- void dragLeaveEvent(QDragLeaveEvent*) VTK_OVERRIDE;
+ void dragLeaveEvent(QDragLeaveEvent*) override;
// overload drop event
- void dropEvent(QDropEvent*) VTK_OVERRIDE;
+ void dropEvent(QDropEvent*) override;
// method called in paintEvent() to render the image cache on to the device.
// return false, if cache couldn;t be used for painting. In that case, the
diff --git a/GUISupport/Qt/vtkEventQtSlotConnect.h b/GUISupport/Qt/vtkEventQtSlotConnect.h
index e16e84f2d36b703d582a45c1d92d5ba2996889d3..68b0a99002441c97626df8fa19059a7cf09ee19f 100644
--- a/GUISupport/Qt/vtkEventQtSlotConnect.h
+++ b/GUISupport/Qt/vtkEventQtSlotConnect.h
@@ -62,7 +62,7 @@ class VTKGUISUPPORTQT_EXPORT vtkEventQtSlotConnect : public vtkObject
/**
* Print the current connections between VTK and Qt
*/
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Connect a vtk object's event with a Qt object's slot. Multiple
@@ -97,7 +97,7 @@ class VTKGUISUPPORTQT_EXPORT vtkEventQtSlotConnect : public vtkObject
void RemoveConnection(vtkQtConnection*);
vtkEventQtSlotConnect();
- ~vtkEventQtSlotConnect() VTK_OVERRIDE;
+ ~vtkEventQtSlotConnect() override;
private:
vtkEventQtSlotConnect(const vtkEventQtSlotConnect&) VTK_DELETE_FUNCTION;
diff --git a/GUISupport/Qt/vtkQtAnnotationLayersModelAdapter.h b/GUISupport/Qt/vtkQtAnnotationLayersModelAdapter.h
index 71689545be4e79b6c802cd4225fb9cac810a75aa..1d53a6e2bce4afc461d7343bb003189457adc815 100644
--- a/GUISupport/Qt/vtkQtAnnotationLayersModelAdapter.h
+++ b/GUISupport/Qt/vtkQtAnnotationLayersModelAdapter.h
@@ -46,14 +46,14 @@ class VTKGUISUPPORTQT_EXPORT vtkQtAnnotationLayersModelAdapter : public vtkQtAbs
public:
vtkQtAnnotationLayersModelAdapter(QObject *parent = 0);
vtkQtAnnotationLayersModelAdapter(vtkAnnotationLayers* ann, QObject *parent = 0);
- ~vtkQtAnnotationLayersModelAdapter() VTK_OVERRIDE;
+ ~vtkQtAnnotationLayersModelAdapter() override;
//@{
/**
* Set/Get the VTK data object as input to this adapter
*/
- void SetVTKDataObject(vtkDataObject *data) VTK_OVERRIDE;
- vtkDataObject* GetVTKDataObject() const VTK_OVERRIDE;
+ void SetVTKDataObject(vtkDataObject *data) override;
+ vtkDataObject* GetVTKDataObject() const override;
//@}
//@{
@@ -65,13 +65,13 @@ public:
virtual QItemSelection VTKAnnotationLayersToQItemSelection(
vtkAnnotationLayers *vtkann) const;
vtkSelection* QModelIndexListToVTKIndexSelection(
- const QModelIndexList qmil) const VTK_OVERRIDE;
+ const QModelIndexList qmil) const override;
QItemSelection VTKIndexSelectionToQItemSelection(
- vtkSelection *vtksel) const VTK_OVERRIDE;
+ vtkSelection *vtksel) const override;
//@}
- void SetKeyColumnName(const char* name) VTK_OVERRIDE;
- void SetColorColumnName(const char* name) VTK_OVERRIDE;
+ void SetKeyColumnName(const char* name) override;
+ void SetColorColumnName(const char* name) override;
//@{
/**
@@ -79,16 +79,16 @@ public:
*/
void setAnnotationLayers(vtkAnnotationLayers* annotations);
vtkAnnotationLayers* annotationLayers() const { return this->Annotations; }
- QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const VTK_OVERRIDE;
- bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) VTK_OVERRIDE;
- Qt::ItemFlags flags(const QModelIndex &index) const VTK_OVERRIDE;
+ QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
+ bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;
+ Qt::ItemFlags flags(const QModelIndex &index) const override;
QVariant headerData(int section, Qt::Orientation orientation,
- int role = Qt::DisplayRole) const VTK_OVERRIDE;
+ int role = Qt::DisplayRole) const override;
QModelIndex index(int row, int column,
- const QModelIndex &parent = QModelIndex()) const VTK_OVERRIDE;
- QModelIndex parent(const QModelIndex &index) const VTK_OVERRIDE;
- int rowCount(const QModelIndex &parent = QModelIndex()) const VTK_OVERRIDE;
- int columnCount(const QModelIndex &parent = QModelIndex()) const VTK_OVERRIDE;
+ const QModelIndex &parent = QModelIndex()) const override;
+ QModelIndex parent(const QModelIndex &index) const override;
+ int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+ int columnCount(const QModelIndex &parent = QModelIndex()) const override;
/*
Qt::DropActions supportedDropActions() const;
Qt::DropActions supportedDragActions() const;
diff --git a/GUISupport/Qt/vtkQtConnection.h b/GUISupport/Qt/vtkQtConnection.h
index 3bb75e7db0dc11bee9c30162adfebcaac27bd698..671bed2a1c26f70f2d1646e6ee6af8db7af302f7 100644
--- a/GUISupport/Qt/vtkQtConnection.h
+++ b/GUISupport/Qt/vtkQtConnection.h
@@ -51,7 +51,7 @@ class vtkQtConnection : public QObject
vtkQtConnection(vtkEventQtSlotConnect* owner);
// destructor, disconnect if necessary
- ~vtkQtConnection() VTK_OVERRIDE;
+ ~vtkQtConnection() override;
// print function
void PrintSelf(ostream& os, vtkIndent indent);
diff --git a/GUISupport/Qt/vtkQtDebugLeaksModel.cxx b/GUISupport/Qt/vtkQtDebugLeaksModel.cxx
index 5cc10be5c36fa5a09bc357d9f1866949c4f809cd..24dd37f20c9517e4ef3cedf51e2c9c814bf25776 100644
--- a/GUISupport/Qt/vtkQtDebugLeaksModel.cxx
+++ b/GUISupport/Qt/vtkQtDebugLeaksModel.cxx
@@ -31,17 +31,17 @@ public:
vtkDebugLeaks::SetDebugLeaksObserver(this);
}
- ~qObserver() VTK_OVERRIDE
+ ~qObserver() override
{
vtkDebugLeaks::SetDebugLeaksObserver(0);
}
- void ConstructingObject(vtkObjectBase* object) VTK_OVERRIDE
+ void ConstructingObject(vtkObjectBase* object) override
{
this->Model.addObject(object);
}
- void DestructingObject(vtkObjectBase* object) VTK_OVERRIDE
+ void DestructingObject(vtkObjectBase* object) override
{
this->Model.removeObject(object);
}
diff --git a/GUISupport/Qt/vtkQtDebugLeaksModel.h b/GUISupport/Qt/vtkQtDebugLeaksModel.h
index 62d03d1c69172764e59d385acf7205f1d6dc9ea6..0e3ecc6ffd94bfe3eec22942fdca3b407d7f82ff 100644
--- a/GUISupport/Qt/vtkQtDebugLeaksModel.h
+++ b/GUISupport/Qt/vtkQtDebugLeaksModel.h
@@ -28,8 +28,6 @@
#include "vtkGUISupportQtModule.h" // For export macro
#include <QStandardItemModel>
-#include "vtkConfigure.h" //for VTK_OVERRIDE
-
class vtkObjectBase;
class VTKGUISUPPORTQT_EXPORT vtkQtDebugLeaksModel : public QStandardItemModel
@@ -39,7 +37,7 @@ class VTKGUISUPPORTQT_EXPORT vtkQtDebugLeaksModel : public QStandardItemModel
public:
vtkQtDebugLeaksModel(QObject* p=0);
- ~vtkQtDebugLeaksModel() VTK_OVERRIDE;
+ ~vtkQtDebugLeaksModel() override;
/**
* Get the list of objects in the model that have the given class name
@@ -62,7 +60,7 @@ protected slots:
void onAboutToQuit();
// Inherited method from QAbstractItemModel
- Qt::ItemFlags flags(const QModelIndex &index) const VTK_OVERRIDE;
+ Qt::ItemFlags flags(const QModelIndex &index) const override;
private:
@@ -84,13 +82,13 @@ class ReferenceCountModel : public QStandardItemModel
public:
ReferenceCountModel(QObject* p=0);
- ~ReferenceCountModel() VTK_OVERRIDE;
+ ~ReferenceCountModel() override;
void addObject(vtkObjectBase* obj);
void removeObject(vtkObjectBase* obj);
QString pointerAsString(void* ptr);
// Inherited method from QAbstractItemModel
- Qt::ItemFlags flags(const QModelIndex &index) const VTK_OVERRIDE;
+ Qt::ItemFlags flags(const QModelIndex &index) const override;
protected slots:
void updateReferenceCounts();
diff --git a/GUISupport/Qt/vtkQtDebugLeaksView.h b/GUISupport/Qt/vtkQtDebugLeaksView.h
index e8760e6ab0fdd377290a3449dfff673b61650a70..85f983ed20608728650765a2ca6906f8a7c54092 100644
--- a/GUISupport/Qt/vtkQtDebugLeaksView.h
+++ b/GUISupport/Qt/vtkQtDebugLeaksView.h
@@ -29,8 +29,6 @@
#include "vtkGUISupportQtModule.h" // For export macro
#include <QWidget>
-#include "vtkConfigure.h" //for VTK_OVERRIDE
-
class QModelIndex;
class vtkObjectBase;
class vtkQtDebugLeaksModel;
@@ -42,7 +40,7 @@ class VTKGUISUPPORTQT_EXPORT vtkQtDebugLeaksView : public QWidget
public:
vtkQtDebugLeaksView(QWidget *p=0);
- ~vtkQtDebugLeaksView() VTK_OVERRIDE;
+ ~vtkQtDebugLeaksView() override;
vtkQtDebugLeaksModel* model();
diff --git a/GUISupport/Qt/vtkQtTableModelAdapter.h b/GUISupport/Qt/vtkQtTableModelAdapter.h
index 10118d4ce1e3e2e2fb9acb41b94aa2525f7ca9b6..be887ca765984792ca75eb87716cf359c34c89bd 100644
--- a/GUISupport/Qt/vtkQtTableModelAdapter.h
+++ b/GUISupport/Qt/vtkQtTableModelAdapter.h
@@ -50,14 +50,14 @@ class VTKGUISUPPORTQT_EXPORT vtkQtTableModelAdapter : public vtkQtAbstractModelA
public:
vtkQtTableModelAdapter(QObject *parent = 0);
vtkQtTableModelAdapter(vtkTable* table, QObject *parent = 0);
- ~vtkQtTableModelAdapter() VTK_OVERRIDE;
+ ~vtkQtTableModelAdapter() override;
//@{
/**
* Set/Get the VTK data object as input to this adapter
*/
- void SetVTKDataObject(vtkDataObject *data) VTK_OVERRIDE;
- vtkDataObject* GetVTKDataObject() const VTK_OVERRIDE;
+ void SetVTKDataObject(vtkDataObject *data) override;
+ vtkDataObject* GetVTKDataObject() const override;
//@}
//@{
@@ -65,13 +65,13 @@ public:
* Selection conversion from VTK land to Qt land
*/
vtkSelection* QModelIndexListToVTKIndexSelection(
- const QModelIndexList qmil) const VTK_OVERRIDE;
+ const QModelIndexList qmil) const override;
QItemSelection VTKIndexSelectionToQItemSelection(
- vtkSelection *vtksel) const VTK_OVERRIDE;
+ vtkSelection *vtksel) const override;
//@}
- void SetKeyColumnName(const char* name) VTK_OVERRIDE;
- void SetColorColumnName(const char* name) VTK_OVERRIDE;
+ void SetKeyColumnName(const char* name) override;
+ void SetColorColumnName(const char* name) override;
void SetIconIndexColumnName(const char* name);
enum
@@ -108,22 +108,22 @@ public:
*/
void setTable(vtkTable* table);
vtkTable* table() const { return this->Table; }
- QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const VTK_OVERRIDE;
- bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) VTK_OVERRIDE;
- Qt::ItemFlags flags(const QModelIndex &index) const VTK_OVERRIDE;
+ QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
+ bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;
+ Qt::ItemFlags flags(const QModelIndex &index) const override;
QVariant headerData(int section, Qt::Orientation orientation,
- int role = Qt::DisplayRole) const VTK_OVERRIDE;
+ int role = Qt::DisplayRole) const override;
QModelIndex index(int row, int column,
- const QModelIndex &parent = QModelIndex()) const VTK_OVERRIDE;
- QModelIndex parent(const QModelIndex &index) const VTK_OVERRIDE;
- int rowCount(const QModelIndex &parent = QModelIndex()) const VTK_OVERRIDE;
- int columnCount(const QModelIndex &parent = QModelIndex()) const VTK_OVERRIDE;
+ const QModelIndex &parent = QModelIndex()) const override;
+ QModelIndex parent(const QModelIndex &index) const override;
+ int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+ int columnCount(const QModelIndex &parent = QModelIndex()) const override;
//@}
- bool dropMimeData(const QMimeData * data, Qt::DropAction action, int row, int column, const QModelIndex & parent) VTK_OVERRIDE ;
- QMimeData * mimeData ( const QModelIndexList & indexes ) const VTK_OVERRIDE;
- QStringList mimeTypes () const VTK_OVERRIDE;
- Qt::DropActions supportedDropActions() const VTK_OVERRIDE;
+ bool dropMimeData(const QMimeData * data, Qt::DropAction action, int row, int column, const QModelIndex & parent) override ;
+ QMimeData * mimeData ( const QModelIndexList & indexes ) const override;
+ QStringList mimeTypes () const override;
+ Qt::DropActions supportedDropActions() const override;
void SetIconSheet(QImage sheet);
void SetIconSize(int w, int h);
diff --git a/GUISupport/Qt/vtkQtTreeModelAdapter.h b/GUISupport/Qt/vtkQtTreeModelAdapter.h
index 587fa7eb263977cf65d25abe9c8005ec104868a1..c337e4084337d5c641c69e1f6dbd0389272d7c3c 100644
--- a/GUISupport/Qt/vtkQtTreeModelAdapter.h
+++ b/GUISupport/Qt/vtkQtTreeModelAdapter.h
@@ -51,14 +51,14 @@ class VTKGUISUPPORTQT_EXPORT vtkQtTreeModelAdapter : public vtkQtAbstractModelAd
public:
vtkQtTreeModelAdapter(QObject *parent = 0, vtkTree* tree = 0);
- ~vtkQtTreeModelAdapter() VTK_OVERRIDE;
+ ~vtkQtTreeModelAdapter() override;
//@{
/**
* Set/Get the VTK data object as input to this adapter
*/
- void SetVTKDataObject(vtkDataObject *data) VTK_OVERRIDE;
- vtkDataObject* GetVTKDataObject() const VTK_OVERRIDE;
+ void SetVTKDataObject(vtkDataObject *data) override;
+ vtkDataObject* GetVTKDataObject() const override;
//@}
/**
@@ -76,14 +76,14 @@ public:
* Selection conversion from VTK land to Qt land
*/
vtkSelection* QModelIndexListToVTKIndexSelection(
- const QModelIndexList qmil) const VTK_OVERRIDE;
+ const QModelIndexList qmil) const override;
QItemSelection VTKIndexSelectionToQItemSelection(
- vtkSelection *vtksel) const VTK_OVERRIDE;
+ vtkSelection *vtksel) const override;
//@}
- void SetKeyColumnName(const char* name) VTK_OVERRIDE;
+ void SetKeyColumnName(const char* name) override;
- void SetColorColumnName(const char* name) VTK_OVERRIDE;
+ void SetColorColumnName(const char* name) override;
/**
* Set up the model based on the current tree.
@@ -91,16 +91,16 @@ public:
void setTree(vtkTree* t);
vtkTree* tree() const { return this->Tree; }
- QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const VTK_OVERRIDE;
- bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) VTK_OVERRIDE;
- Qt::ItemFlags flags(const QModelIndex &index) const VTK_OVERRIDE;
+ QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
+ bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;
+ Qt::ItemFlags flags(const QModelIndex &index) const override;
QVariant headerData(int section, Qt::Orientation orientation,
- int role = Qt::DisplayRole) const VTK_OVERRIDE;
+ int role = Qt::DisplayRole) const override;
QModelIndex index(int row, int column,
- const QModelIndex &parent = QModelIndex()) const VTK_OVERRIDE;
- QModelIndex parent(const QModelIndex &index) const VTK_OVERRIDE;
- int rowCount(const QModelIndex &parent = QModelIndex()) const VTK_OVERRIDE;
- int columnCount(const QModelIndex &parent = QModelIndex()) const VTK_OVERRIDE;
+ const QModelIndex &parent = QModelIndex()) const override;
+ QModelIndex parent(const QModelIndex &index) const override;
+ int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+ int columnCount(const QModelIndex &parent = QModelIndex()) const override;
//@{
/**
@@ -109,12 +109,12 @@ public:
* Currently only leaves of the tree can be dragged.
*/
#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
- Qt::DropActions supportedDragActions() const VTK_OVERRIDE;
+ Qt::DropActions supportedDragActions() const override;
#else
Qt::DropActions supportedDragActions() const;
#endif
- QMimeData * mimeData ( const QModelIndexList & indexes ) const VTK_OVERRIDE;
- QStringList mimeTypes () const VTK_OVERRIDE;
+ QMimeData * mimeData ( const QModelIndexList & indexes ) const override;
+ QStringList mimeTypes () const override;
//@}
protected:
diff --git a/GUISupport/QtSQL/vtkQtSQLDatabase.h b/GUISupport/QtSQL/vtkQtSQLDatabase.h
index e02bcbbfa87a9ac15afce5f8630f1e1ce7339b44..ad7f1ee24c138eca3166c5ea6de4df2b1596950a 100644
--- a/GUISupport/QtSQL/vtkQtSQLDatabase.h
+++ b/GUISupport/QtSQL/vtkQtSQLDatabase.h
@@ -45,39 +45,39 @@ class VTKGUISUPPORTQTSQL_EXPORT vtkQtSQLDatabase : public vtkSQLDatabase
public:
static vtkQtSQLDatabase* New();
vtkTypeMacro(vtkQtSQLDatabase, vtkSQLDatabase);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Open a new connection to the database.
* You need to set up any database parameters before calling this function.
* Returns true is the database was opened successfully, and false otherwise.
*/
- bool Open(const char* password) VTK_OVERRIDE;
+ bool Open(const char* password) override;
/**
* Close the connection to the database.
*/
- void Close() VTK_OVERRIDE;
+ void Close() override;
/**
* Return whether the database has an open connection
*/
- bool IsOpen() VTK_OVERRIDE;
+ bool IsOpen() override;
/**
* Return an empty query on this database.
*/
- vtkSQLQuery* GetQueryInstance() VTK_OVERRIDE;
+ vtkSQLQuery* GetQueryInstance() override;
/**
* Get the list of tables from the database
*/
- vtkStringArray* GetTables() VTK_OVERRIDE;
+ vtkStringArray* GetTables() override;
/**
* Get the list of fields for a particular table
*/
- vtkStringArray* GetRecord(const char *table) VTK_OVERRIDE;
+ vtkStringArray* GetRecord(const char *table) override;
/**
* Returns a list of columns for a particular table.
@@ -96,23 +96,23 @@ public:
/**
* Return whether a feature is supported by the database.
*/
- bool IsSupported(int feature) VTK_OVERRIDE;
+ bool IsSupported(int feature) override;
/**
* Did the last operation generate an error
*/
- bool HasError() VTK_OVERRIDE;
+ bool HasError() override;
/**
* Get the last error text from the database
*/
- const char* GetLastErrorText() VTK_OVERRIDE;
+ const char* GetLastErrorText() override;
//@{
/**
* String representing Qt database type (e.g. "mysql").
*/
- const char* GetDatabaseType() VTK_OVERRIDE
+ const char* GetDatabaseType() override
{
return this->DatabaseType;
}
@@ -169,7 +169,7 @@ public:
/**
* Get the URL of the database.
*/
- vtkStdString GetURL() VTK_OVERRIDE;
+ vtkStdString GetURL() override;
protected:
vtkQtSQLDatabase();
@@ -191,7 +191,7 @@ protected:
* This is called by CreateFromURL() to initialize the instance.
* Look at CreateFromURL() for details about the URL format.
*/
- bool ParseURL(const char* url) VTK_OVERRIDE;
+ bool ParseURL(const char* url) override;
private:
// Storing the tables in the database, this array
diff --git a/GUISupport/QtSQL/vtkQtSQLQuery.h b/GUISupport/QtSQL/vtkQtSQLQuery.h
index 78fc298bda782e12be3273c186c09910e8537306..0aaa6aa69d2b9195b71e427bb3ddc436718dac90 100644
--- a/GUISupport/QtSQL/vtkQtSQLQuery.h
+++ b/GUISupport/QtSQL/vtkQtSQLQuery.h
@@ -43,49 +43,49 @@ class VTKGUISUPPORTQTSQL_EXPORT vtkQtSQLQuery : public vtkSQLQuery
public:
static vtkQtSQLQuery* New();
vtkTypeMacro(vtkQtSQLQuery, vtkSQLQuery);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Execute the query. This must be performed
* before any field name or data access functions
* are used.
*/
- bool Execute() VTK_OVERRIDE;
+ bool Execute() override;
/**
* The number of fields in the query result.
*/
- int GetNumberOfFields() VTK_OVERRIDE;
+ int GetNumberOfFields() override;
/**
* Return the name of the specified query field.
*/
- const char* GetFieldName(int col) VTK_OVERRIDE;
+ const char* GetFieldName(int col) override;
/**
* Return the type of the specified query field, as defined in vtkType.h.
*/
- int GetFieldType(int col) VTK_OVERRIDE;
+ int GetFieldType(int col) override;
/**
* Advance row, return false if past end.
*/
- bool NextRow() VTK_OVERRIDE;
+ bool NextRow() override;
/**
* Return data in current row, field c
*/
- vtkVariant DataValue(vtkIdType c) VTK_OVERRIDE;
+ vtkVariant DataValue(vtkIdType c) override;
/**
* Returns true if an error is set, otherwise false.
*/
- bool HasError() VTK_OVERRIDE;
+ bool HasError() override;
/**
* Get the last error text from the query
*/
- const char* GetLastErrorText() VTK_OVERRIDE;
+ const char* GetLastErrorText() override;
protected:
vtkQtSQLQuery();
diff --git a/GUISupport/QtSQL/vtkQtTimePointUtility.h b/GUISupport/QtSQL/vtkQtTimePointUtility.h
index f952159f822ccaa47963fb9054c688e42a33c306..69da2966b751fd15c30982a09c7e5fce78b21c3f 100644
--- a/GUISupport/QtSQL/vtkQtTimePointUtility.h
+++ b/GUISupport/QtSQL/vtkQtTimePointUtility.h
@@ -44,7 +44,7 @@ public:
protected:
vtkQtTimePointUtility() {}
- ~vtkQtTimePointUtility() VTK_OVERRIDE {}
+ ~vtkQtTimePointUtility() override {}
private:
vtkQtTimePointUtility(const vtkQtTimePointUtility&) VTK_DELETE_FUNCTION;
diff --git a/Geovis/Core/vtkCompassRepresentation.h b/Geovis/Core/vtkCompassRepresentation.h
index d73b1f77e38497b7b343bcbb70e6d3f6cf168e74..e2b3e8eeede0f68182cf7705fb4ab7f9f60d2672 100644
--- a/Geovis/Core/vtkCompassRepresentation.h
+++ b/Geovis/Core/vtkCompassRepresentation.h
@@ -66,7 +66,7 @@ public:
*/
vtkTypeMacro(vtkCompassRepresentation,
vtkContinuousValueWidgetRepresentation);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
@@ -118,24 +118,24 @@ public:
* assumes that the parameter bounds[6] specifies the location in display
* space where the widget should be placed.
*/
- void PlaceWidget(double bounds[6]) VTK_OVERRIDE;
- void BuildRepresentation() VTK_OVERRIDE;
- void StartWidgetInteraction(double eventPos[2]) VTK_OVERRIDE;
- void WidgetInteraction(double eventPos[2]) VTK_OVERRIDE;
+ void PlaceWidget(double bounds[6]) override;
+ void BuildRepresentation() override;
+ void StartWidgetInteraction(double eventPos[2]) override;
+ void WidgetInteraction(double eventPos[2]) override;
virtual void TiltWidgetInteraction(double eventPos[2]);
virtual void DistanceWidgetInteraction(double eventPos[2]);
- int ComputeInteractionState(int X, int Y, int modify=0) VTK_OVERRIDE;
- void Highlight(int) VTK_OVERRIDE;
+ int ComputeInteractionState(int X, int Y, int modify=0) override;
+ void Highlight(int) override;
//@}
//@{
/**
* Methods supporting the rendering process.
*/
- void GetActors(vtkPropCollection*) VTK_OVERRIDE;
- void ReleaseGraphicsResources(vtkWindow*) VTK_OVERRIDE;
- int RenderOverlay(vtkViewport*) VTK_OVERRIDE;
- int RenderOpaqueGeometry(vtkViewport*) VTK_OVERRIDE;
+ void GetActors(vtkPropCollection*) override;
+ void ReleaseGraphicsResources(vtkWindow*) override;
+ int RenderOverlay(vtkViewport*) override;
+ int RenderOpaqueGeometry(vtkViewport*) override;
//@}
virtual void SetHeading(double value);
@@ -148,7 +148,7 @@ public:
virtual double GetDistance();
virtual void UpdateDistance(double time);
virtual void EndDistance();
- void SetRenderer(vtkRenderer *ren) VTK_OVERRIDE;
+ void SetRenderer(vtkRenderer *ren) override;
// Enums are used to describe what is selected
enum _InteractionState
@@ -166,7 +166,7 @@ public:
protected:
vtkCompassRepresentation();
- ~vtkCompassRepresentation() VTK_OVERRIDE;
+ ~vtkCompassRepresentation() override;
// Positioning the widget
vtkCoordinate *Point1Coordinate;
diff --git a/Geovis/Core/vtkCompassWidget.h b/Geovis/Core/vtkCompassWidget.h
index b630885c3b8b5a6c93cbc635e6bc16efd10c0e44..c939e6e61c869fa6a5a0af1ee0ae871dd62b6e2c 100644
--- a/Geovis/Core/vtkCompassWidget.h
+++ b/Geovis/Core/vtkCompassWidget.h
@@ -84,7 +84,7 @@ public:
* Standard macros.
*/
vtkTypeMacro(vtkCompassWidget,vtkAbstractWidget);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
@@ -99,7 +99,7 @@ public:
/**
* Create the default widget representation if one is not set.
*/
- void CreateDefaultRepresentation() VTK_OVERRIDE;
+ void CreateDefaultRepresentation() override;
//@{
/**
@@ -115,7 +115,7 @@ public:
protected:
vtkCompassWidget();
- ~vtkCompassWidget() VTK_OVERRIDE {}
+ ~vtkCompassWidget() override {}
// These are the events that are handled
static void SelectAction(vtkAbstractWidget*);
diff --git a/Geovis/Core/vtkGeoAdaptiveArcs.h b/Geovis/Core/vtkGeoAdaptiveArcs.h
index 316e158716a65c9912d2691123f4cea7b641ea5a..29f6f9735b4bb6f1a70f271a67628c17373f30cb 100644
--- a/Geovis/Core/vtkGeoAdaptiveArcs.h
+++ b/Geovis/Core/vtkGeoAdaptiveArcs.h
@@ -41,7 +41,7 @@ public:
static vtkGeoAdaptiveArcs *New();
vtkTypeMacro(vtkGeoAdaptiveArcs,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -86,16 +86,16 @@ public:
/**
* Return the modified time of this object.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
protected:
vtkGeoAdaptiveArcs();
- ~vtkGeoAdaptiveArcs() VTK_OVERRIDE;
+ ~vtkGeoAdaptiveArcs() override;
/**
* Convert the vtkGraph into vtkPolyData.
*/
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
vtkRenderer *Renderer;
double GlobeRadius;
diff --git a/Geovis/Core/vtkGeoAlignedImageRepresentation.h b/Geovis/Core/vtkGeoAlignedImageRepresentation.h
index b78af25d3d8f0522d1141838d0fe7452cac148ce..7b25141f8b1661430e95004eb4ee088a7f3ef3eb 100644
--- a/Geovis/Core/vtkGeoAlignedImageRepresentation.h
+++ b/Geovis/Core/vtkGeoAlignedImageRepresentation.h
@@ -43,7 +43,7 @@ class VTKGEOVISCORE_EXPORT vtkGeoAlignedImageRepresentation : public vtkDataRepr
public:
static vtkGeoAlignedImageRepresentation *New();
vtkTypeMacro(vtkGeoAlignedImageRepresentation,vtkDataRepresentation);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Retrieve the most refined image patch that covers the specified
@@ -70,7 +70,7 @@ public:
protected:
vtkGeoAlignedImageRepresentation();
- ~vtkGeoAlignedImageRepresentation() VTK_OVERRIDE;
+ ~vtkGeoAlignedImageRepresentation() override;
//@{
/**
diff --git a/Geovis/Core/vtkGeoAlignedImageSource.cxx b/Geovis/Core/vtkGeoAlignedImageSource.cxx
index debdead0645f2dda4a210f1eb0134b264ce5e726..9ab488b2df350244c21af40c01a3f0de8f6c9547 100644
--- a/Geovis/Core/vtkGeoAlignedImageSource.cxx
+++ b/Geovis/Core/vtkGeoAlignedImageSource.cxx
@@ -43,7 +43,7 @@ public:
{ return new vtkProgressObserver(); }
void Execute(vtkObject *, unsigned long eventId,
- void *callData) VTK_OVERRIDE
+ void *callData) override
{
if (eventId == vtkCommand::ProgressEvent)
{
diff --git a/Geovis/Core/vtkGeoAlignedImageSource.h b/Geovis/Core/vtkGeoAlignedImageSource.h
index f5608499d50e0c2306acd90986cfe094d8bd6b65..eb20e9285967a21cabb9531600d7f9cac935efce 100644
--- a/Geovis/Core/vtkGeoAlignedImageSource.h
+++ b/Geovis/Core/vtkGeoAlignedImageSource.h
@@ -45,17 +45,17 @@ class VTKGEOVISCORE_EXPORT vtkGeoAlignedImageSource : public vtkGeoSource
public:
static vtkGeoAlignedImageSource *New();
vtkTypeMacro(vtkGeoAlignedImageSource, vtkGeoSource);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Fetch the root image.
*/
- bool FetchRoot(vtkGeoTreeNode* node) VTK_OVERRIDE;
+ bool FetchRoot(vtkGeoTreeNode* node) override;
/**
* Fetch a child image.
*/
- bool FetchChild(vtkGeoTreeNode* parent, int index, vtkGeoTreeNode* child) VTK_OVERRIDE;
+ bool FetchChild(vtkGeoTreeNode* parent, int index, vtkGeoTreeNode* child) override;
//@{
/**
@@ -94,7 +94,7 @@ public:
protected:
vtkGeoAlignedImageSource();
- ~vtkGeoAlignedImageSource() VTK_OVERRIDE;
+ ~vtkGeoAlignedImageSource() override;
void CropImageForNode(vtkGeoImageNode* node, vtkImageData* image);
int PowerOfTwo(int val);
diff --git a/Geovis/Core/vtkGeoArcs.h b/Geovis/Core/vtkGeoArcs.h
index 0cca8d580ee7a912b5244cdacbc9c0c5bb831dfd..dfe5f4f1aa4f46294982df0aba4db19049a5cd04 100644
--- a/Geovis/Core/vtkGeoArcs.h
+++ b/Geovis/Core/vtkGeoArcs.h
@@ -39,7 +39,7 @@ public:
static vtkGeoArcs *New();
vtkTypeMacro(vtkGeoArcs,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -73,9 +73,9 @@ public:
protected:
vtkGeoArcs();
- ~vtkGeoArcs() VTK_OVERRIDE {}
+ ~vtkGeoArcs() override {}
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
double GlobeRadius;
double ExplodeFactor;
diff --git a/Geovis/Core/vtkGeoAssignCoordinates.h b/Geovis/Core/vtkGeoAssignCoordinates.h
index ea7c99f1f45f660b093655380926090e68dbe412..5372adf6ac8b046f996848266b42dcc9ce744070 100644
--- a/Geovis/Core/vtkGeoAssignCoordinates.h
+++ b/Geovis/Core/vtkGeoAssignCoordinates.h
@@ -46,7 +46,7 @@ public:
static vtkGeoAssignCoordinates *New();
vtkTypeMacro(vtkGeoAssignCoordinates, vtkPassInputTypeAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -97,10 +97,10 @@ public:
protected:
vtkGeoAssignCoordinates();
- ~vtkGeoAssignCoordinates() VTK_OVERRIDE;
+ ~vtkGeoAssignCoordinates() override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
private:
diff --git a/Geovis/Core/vtkGeoCamera.h b/Geovis/Core/vtkGeoCamera.h
index 4d4e4cd078cce6a6347b8ee6f6964568ea97605d..1403582ed822b5c415fb699ead77163397308897 100644
--- a/Geovis/Core/vtkGeoCamera.h
+++ b/Geovis/Core/vtkGeoCamera.h
@@ -85,7 +85,7 @@ class VTKGEOVISCORE_EXPORT vtkGeoCamera : public vtkObject
public:
static vtkGeoCamera *New();
vtkTypeMacro(vtkGeoCamera, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -204,7 +204,7 @@ public:
protected:
vtkGeoCamera();
- ~vtkGeoCamera() VTK_OVERRIDE;
+ ~vtkGeoCamera() override;
void UpdateVTKCamera();
void UpdateAngleRanges();
diff --git a/Geovis/Core/vtkGeoFileImageSource.h b/Geovis/Core/vtkGeoFileImageSource.h
index 714aa0fc7e2d0a8626513ed56b58166c7a5dce46..56356b619fd30e7cb459b283042a01ac8abaa883 100644
--- a/Geovis/Core/vtkGeoFileImageSource.h
+++ b/Geovis/Core/vtkGeoFileImageSource.h
@@ -43,20 +43,20 @@ class VTKGEOVISCORE_EXPORT vtkGeoFileImageSource : public vtkGeoSource
public:
static vtkGeoFileImageSource *New();
vtkTypeMacro(vtkGeoFileImageSource,vtkGeoSource);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
vtkGeoFileImageSource();
- ~vtkGeoFileImageSource() VTK_OVERRIDE;
+ ~vtkGeoFileImageSource() override;
/**
* Fetches the root image representing the whole globe.
*/
- bool FetchRoot(vtkGeoTreeNode* root) VTK_OVERRIDE;
+ bool FetchRoot(vtkGeoTreeNode* root) override;
/**
* Fetches the child image of a parent from disk.
*/
- bool FetchChild(vtkGeoTreeNode* node, int index, vtkGeoTreeNode* child) VTK_OVERRIDE;
+ bool FetchChild(vtkGeoTreeNode* node, int index, vtkGeoTreeNode* child) override;
//@{
/**
diff --git a/Geovis/Core/vtkGeoFileTerrainSource.h b/Geovis/Core/vtkGeoFileTerrainSource.h
index 2450688affbe9f462f21bf96196e1f723e3d2e61..39032b4400381eef6c9c9cb4bd09a4c4e7f30d88 100644
--- a/Geovis/Core/vtkGeoFileTerrainSource.h
+++ b/Geovis/Core/vtkGeoFileTerrainSource.h
@@ -43,20 +43,20 @@ class VTKGEOVISCORE_EXPORT vtkGeoFileTerrainSource : public vtkGeoSource
public:
static vtkGeoFileTerrainSource *New();
vtkTypeMacro(vtkGeoFileTerrainSource,vtkGeoSource);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
vtkGeoFileTerrainSource();
- ~vtkGeoFileTerrainSource() VTK_OVERRIDE;
+ ~vtkGeoFileTerrainSource() override;
/**
* Retrieve the root geometry representing the entire globe.
*/
- bool FetchRoot(vtkGeoTreeNode* root) VTK_OVERRIDE;
+ bool FetchRoot(vtkGeoTreeNode* root) override;
/**
* Retrieve the child's geometry from disk.
*/
- bool FetchChild(vtkGeoTreeNode* node, int index, vtkGeoTreeNode* child) VTK_OVERRIDE;
+ bool FetchChild(vtkGeoTreeNode* node, int index, vtkGeoTreeNode* child) override;
//@{
/**
diff --git a/Geovis/Core/vtkGeoGlobeSource.h b/Geovis/Core/vtkGeoGlobeSource.h
index 4bac6cd99c22f83d8ae54c23e6c243abbe95ccfc..698daaf1c21388a5982ce4a7f98860886c3a7520 100644
--- a/Geovis/Core/vtkGeoGlobeSource.h
+++ b/Geovis/Core/vtkGeoGlobeSource.h
@@ -39,21 +39,21 @@ class VTKGEOVISCORE_EXPORT vtkGeoGlobeSource : public vtkGeoSource
public:
static vtkGeoGlobeSource *New();
vtkTypeMacro(vtkGeoGlobeSource,vtkGeoSource);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Fetches a low-resolution sphere for the entire globe.
*/
- bool FetchRoot(vtkGeoTreeNode* root) VTK_OVERRIDE;
+ bool FetchRoot(vtkGeoTreeNode* root) override;
/**
* Fetches a refined geometry patch, a section of a sphere.
*/
- bool FetchChild(vtkGeoTreeNode* node, int index, vtkGeoTreeNode* child) VTK_OVERRIDE;
+ bool FetchChild(vtkGeoTreeNode* node, int index, vtkGeoTreeNode* child) override;
protected:
vtkGeoGlobeSource();
- ~vtkGeoGlobeSource() VTK_OVERRIDE;
+ ~vtkGeoGlobeSource() override;
private:
vtkGeoGlobeSource(const vtkGeoGlobeSource&) VTK_DELETE_FUNCTION;
diff --git a/Geovis/Core/vtkGeoGraticule.h b/Geovis/Core/vtkGeoGraticule.h
index 38b586bae0402e0d8990646f4ac92dfba30fff1e..9ad40c949a943c9a2e880ec521109d4222c8b267 100644
--- a/Geovis/Core/vtkGeoGraticule.h
+++ b/Geovis/Core/vtkGeoGraticule.h
@@ -43,7 +43,7 @@ class VTKGEOVISCORE_EXPORT vtkGeoGraticule : public vtkPolyDataAlgorithm
{
public:
static vtkGeoGraticule* New();
- void PrintSelf( ostream& os, vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf( ostream& os, vtkIndent indent ) override;
vtkTypeMacro(vtkGeoGraticule,vtkPolyDataAlgorithm);
//@{
@@ -114,7 +114,7 @@ public:
protected:
vtkGeoGraticule();
- ~vtkGeoGraticule() VTK_OVERRIDE;
+ ~vtkGeoGraticule() override;
int GeometryType;
double LatitudeBounds[2];
@@ -130,7 +130,7 @@ protected:
static double LongitudeLevelTics[NUMBER_OF_LEVELS];
//@}
- int RequestData( vtkInformation*, vtkInformationVector**, vtkInformationVector* ) VTK_OVERRIDE;
+ int RequestData( vtkInformation*, vtkInformationVector**, vtkInformationVector* ) override;
void GenerateGraticule( vtkPolyData* output, double latbds[2], double lngbds[2] );
int ComputeLineLevel( int ticId, int baseLevel, const double* levelIncrements );
diff --git a/Geovis/Core/vtkGeoImageNode.h b/Geovis/Core/vtkGeoImageNode.h
index b0f1bdc52c29819cb71a6734e419503c6f30329e..8f20704485d8d0124cdc511914cdca8a8f685775 100644
--- a/Geovis/Core/vtkGeoImageNode.h
+++ b/Geovis/Core/vtkGeoImageNode.h
@@ -45,7 +45,7 @@ class VTKGEOVISCORE_EXPORT vtkGeoImageNode : public vtkGeoTreeNode
public:
static vtkGeoImageNode *New();
vtkTypeMacro(vtkGeoImageNode, vtkGeoTreeNode);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -90,24 +90,24 @@ public:
/**
* Shallow and Deep copy.
*/
- void ShallowCopy(vtkGeoTreeNode *src) VTK_OVERRIDE;
- void DeepCopy(vtkGeoTreeNode *src) VTK_OVERRIDE;
+ void ShallowCopy(vtkGeoTreeNode *src) override;
+ void DeepCopy(vtkGeoTreeNode *src) override;
//@}
// Returns whether this node has valid data associated
// with it, or if it is an "empty" node.
- bool HasData() VTK_OVERRIDE;
+ bool HasData() override;
/**
* Deletes the data associated with the node to make this
* an "empty" node. This is performed when the node has
* been unused for a certain amount of time.
*/
- void DeleteData() VTK_OVERRIDE;
+ void DeleteData() override;
protected:
vtkGeoImageNode();
- ~vtkGeoImageNode() VTK_OVERRIDE;
+ ~vtkGeoImageNode() override;
int PowerOfTwo(int val);
diff --git a/Geovis/Core/vtkGeoInteractorStyle.cxx b/Geovis/Core/vtkGeoInteractorStyle.cxx
index f2b575e7a78a58489520d8179b82369c7671748c..9259af7cc59ce450750b4b7ece1585127bbc60a0 100644
--- a/Geovis/Core/vtkGeoInteractorStyle.cxx
+++ b/Geovis/Core/vtkGeoInteractorStyle.cxx
@@ -54,7 +54,7 @@ namespace
public:
vtkEventCommand(vtkGeoInteractorStyle* selfptr) {this->Self = selfptr;}
void Execute(vtkObject *caller, unsigned long eventId,
- void * /*callData*/) VTK_OVERRIDE
+ void * /*callData*/) override
{
if (eventId == vtkCommand::InteractionEvent)
{
diff --git a/Geovis/Core/vtkGeoInteractorStyle.h b/Geovis/Core/vtkGeoInteractorStyle.h
index e16cbfaa8aac9c381bfe444177e6668b96f20c10..7ad4f835e0c6661c7d05abfcf220c09fc332fc17 100644
--- a/Geovis/Core/vtkGeoInteractorStyle.h
+++ b/Geovis/Core/vtkGeoInteractorStyle.h
@@ -50,33 +50,33 @@ public:
static vtkGeoInteractorStyle *New();
vtkTypeMacro(vtkGeoInteractorStyle,
vtkInteractorStyleTrackballCamera);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
* Event bindings
*/
- void OnEnter() VTK_OVERRIDE;
- void OnLeave() VTK_OVERRIDE;
- void OnMouseMove() VTK_OVERRIDE;
- void OnLeftButtonUp() VTK_OVERRIDE;
- void OnMiddleButtonUp() VTK_OVERRIDE;
- void OnRightButtonUp() VTK_OVERRIDE;
- void OnLeftButtonDown() VTK_OVERRIDE;
- void OnMiddleButtonDown() VTK_OVERRIDE;
- void OnRightButtonDown() VTK_OVERRIDE;
- void OnChar() VTK_OVERRIDE;
+ void OnEnter() override;
+ void OnLeave() override;
+ void OnMouseMove() override;
+ void OnLeftButtonUp() override;
+ void OnMiddleButtonUp() override;
+ void OnRightButtonUp() override;
+ void OnLeftButtonDown() override;
+ void OnMiddleButtonDown() override;
+ void OnRightButtonDown() override;
+ void OnChar() override;
//@}
virtual void RubberBandZoom();
- void Pan() VTK_OVERRIDE;
- void Dolly() VTK_OVERRIDE;
+ void Pan() override;
+ void Dolly() override;
// Public for render callback.
void RedrawRectangle();
// See cxx for description of why we need this method.
- void StartState(int newstate) VTK_OVERRIDE;
+ void StartState(int newstate) override;
// Used for updating the terrain.
vtkGeoCamera* GetGeoCamera();
@@ -93,7 +93,7 @@ public:
* Set/Get the Interactor wrapper being controlled by this object.
* (Satisfy superclass API.)
*/
- void SetInteractor(vtkRenderWindowInteractor *interactor) VTK_OVERRIDE;
+ void SetInteractor(vtkRenderWindowInteractor *interactor) override;
int ViewportToWorld(double x, double y,
double &wx, double &wy, double &wz);
@@ -108,7 +108,7 @@ public:
/**
* Override to make the renderer use this camera subclass
*/
- void SetCurrentRenderer(vtkRenderer*) VTK_OVERRIDE;
+ void SetCurrentRenderer(vtkRenderer*) override;
//@{
/**
@@ -126,13 +126,13 @@ public:
protected:
vtkGeoInteractorStyle();
- ~vtkGeoInteractorStyle() VTK_OVERRIDE;
+ ~vtkGeoInteractorStyle() override;
// To avoid a warning.
// We should really inherit directy from vtkInteractorStyle
- void Dolly(double) VTK_OVERRIDE;
+ void Dolly(double) override;
- void OnTimer() VTK_OVERRIDE;
+ void OnTimer() override;
// Used to get a constant speed regardless of frame rate.
double LastTime;
diff --git a/Geovis/Core/vtkGeoProjection.h b/Geovis/Core/vtkGeoProjection.h
index 9df0631bea8fca7f83285c9170f6cb4683e17224..1802253584f34b9228181fda0f9f36d06800ff03 100644
--- a/Geovis/Core/vtkGeoProjection.h
+++ b/Geovis/Core/vtkGeoProjection.h
@@ -40,7 +40,7 @@ class VTKGEOVISCORE_EXPORT vtkGeoProjection : public vtkObject
{
public:
static vtkGeoProjection* New();
- void PrintSelf( ostream& os, vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf( ostream& os, vtkIndent indent ) override;
vtkTypeMacro(vtkGeoProjection,vtkObject);
/**
@@ -136,7 +136,7 @@ public:
protected:
vtkGeoProjection();
- ~vtkGeoProjection() VTK_OVERRIDE;
+ ~vtkGeoProjection() override;
/**
* Determine whether the current projection structure has any
diff --git a/Geovis/Core/vtkGeoProjectionSource.h b/Geovis/Core/vtkGeoProjectionSource.h
index f2de0f3293fbea2bedab545c49736da729c83753..9bf45e5bed8dada85356dd491639c503dc9ff3d9 100644
--- a/Geovis/Core/vtkGeoProjectionSource.h
+++ b/Geovis/Core/vtkGeoProjectionSource.h
@@ -43,17 +43,17 @@ class VTKGEOVISCORE_EXPORT vtkGeoProjectionSource : public vtkGeoSource
public:
static vtkGeoProjectionSource *New();
vtkTypeMacro(vtkGeoProjectionSource,vtkGeoSource);
- void PrintSelf( ostream& os, vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf( ostream& os, vtkIndent indent ) override;
vtkGeoProjectionSource();
- ~vtkGeoProjectionSource() VTK_OVERRIDE;
+ ~vtkGeoProjectionSource() override;
//@{
/**
* Blocking methods for sources with low latency.
*/
- bool FetchRoot(vtkGeoTreeNode* root) VTK_OVERRIDE;
- bool FetchChild(vtkGeoTreeNode* node, int index, vtkGeoTreeNode* child) VTK_OVERRIDE;
+ bool FetchRoot(vtkGeoTreeNode* root) override;
+ bool FetchChild(vtkGeoTreeNode* node, int index, vtkGeoTreeNode* child) override;
//@}
//@{
@@ -75,7 +75,7 @@ public:
/**
* Return the projection transformation used by this 2D terrain.
*/
- vtkAbstractTransform* GetTransform() VTK_OVERRIDE;
+ vtkAbstractTransform* GetTransform() override;
protected:
void RefineAndComputeError(vtkGeoTerrainNode* node);
diff --git a/Geovis/Core/vtkGeoRandomGraphSource.h b/Geovis/Core/vtkGeoRandomGraphSource.h
index 4bf080b8d30b0fc08cc3bcd04375565314e4b47d..ba959a6d823992da5922118c7ef71a119719909a 100644
--- a/Geovis/Core/vtkGeoRandomGraphSource.h
+++ b/Geovis/Core/vtkGeoRandomGraphSource.h
@@ -48,16 +48,16 @@ class VTKGEOVISCORE_EXPORT vtkGeoRandomGraphSource : public vtkRandomGraphSource
public:
static vtkGeoRandomGraphSource* New();
vtkTypeMacro(vtkGeoRandomGraphSource,vtkRandomGraphSource);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkGeoRandomGraphSource();
- ~vtkGeoRandomGraphSource() VTK_OVERRIDE;
+ ~vtkGeoRandomGraphSource() override;
int RequestData(
vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
private:
vtkGeoRandomGraphSource(const vtkGeoRandomGraphSource&) VTK_DELETE_FUNCTION;
diff --git a/Geovis/Core/vtkGeoSampleArcs.h b/Geovis/Core/vtkGeoSampleArcs.h
index c8f4bd3974af5eb4dfee3e0bc165308c05a32722..7da0185ad8a6a9d52a4ad3a5042d75bf6b4ec2e2 100644
--- a/Geovis/Core/vtkGeoSampleArcs.h
+++ b/Geovis/Core/vtkGeoSampleArcs.h
@@ -41,7 +41,7 @@ public:
static vtkGeoSampleArcs *New();
vtkTypeMacro(vtkGeoSampleArcs,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -97,12 +97,12 @@ public:
protected:
vtkGeoSampleArcs();
- ~vtkGeoSampleArcs() VTK_OVERRIDE;
+ ~vtkGeoSampleArcs() override;
/**
* Convert the vtkGraph into vtkPolyData.
*/
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
double GlobeRadius;
double MaximumDistanceMeters;
diff --git a/Geovis/Core/vtkGeoSource.h b/Geovis/Core/vtkGeoSource.h
index bd263c16af4e79a9abedc89753d1189979ea279a..22f6621b3daa1101c34e5e823b2ef02a9636846b 100644
--- a/Geovis/Core/vtkGeoSource.h
+++ b/Geovis/Core/vtkGeoSource.h
@@ -57,7 +57,7 @@ public:
vtkTypeMacro(vtkGeoSource,vtkObject);
vtkGeoSource();
- ~vtkGeoSource() VTK_OVERRIDE;
+ ~vtkGeoSource() override;
//@{
/**
diff --git a/Geovis/Core/vtkGeoSphereTransform.h b/Geovis/Core/vtkGeoSphereTransform.h
index 528690e2ad2b1f2db3a304e6028f7436184797e8..90fa5bd6ef375aa6c64a5727c2288a21e0e6eff1 100644
--- a/Geovis/Core/vtkGeoSphereTransform.h
+++ b/Geovis/Core/vtkGeoSphereTransform.h
@@ -41,21 +41,21 @@ class VTKGEOVISCORE_EXPORT vtkGeoSphereTransform : public vtkAbstractTransform
{
public:
static vtkGeoSphereTransform* New();
- void PrintSelf( ostream& os, vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf( ostream& os, vtkIndent indent ) override;
vtkTypeMacro(vtkGeoSphereTransform,vtkAbstractTransform);
/**
* Invert the transformation.
*/
- void Inverse() VTK_OVERRIDE;
+ void Inverse() override;
//@{
/**
* This will calculate the transformation without calling Update.
* Meant for use only within other VTK classes.
*/
- void InternalTransformPoint( const float in[3], float out[3] ) VTK_OVERRIDE;
- void InternalTransformPoint( const double in[3], double out[3] ) VTK_OVERRIDE;
+ void InternalTransformPoint( const float in[3], float out[3] ) override;
+ void InternalTransformPoint( const double in[3], double out[3] ) override;
//@}
//@{
@@ -65,14 +65,14 @@ public:
* transformation at that point. This method does not call Update.
* Meant for use only within other VTK classes.
*/
- void InternalTransformDerivative( const float in[3], float out[3], float derivative[3][3] ) VTK_OVERRIDE;
- void InternalTransformDerivative( const double in[3], double out[3], double derivative[3][3] ) VTK_OVERRIDE;
+ void InternalTransformDerivative( const float in[3], float out[3], float derivative[3][3] ) override;
+ void InternalTransformDerivative( const double in[3], double out[3], double derivative[3][3] ) override;
//@}
/**
* Make another transform of the same type.
*/
- vtkAbstractTransform* MakeTransform() VTK_OVERRIDE;
+ vtkAbstractTransform* MakeTransform() override;
//@{
/**
@@ -97,7 +97,7 @@ public:
protected:
vtkGeoSphereTransform();
- ~vtkGeoSphereTransform() VTK_OVERRIDE;
+ ~vtkGeoSphereTransform() override;
bool ToRectangular;
double BaseAltitude;
diff --git a/Geovis/Core/vtkGeoTerrain.h b/Geovis/Core/vtkGeoTerrain.h
index ed9b86dae4ae2a2914af9bb34f4fb9db5ffbfd07..fe3dc3ebe7f964aa9455cee35c8a020f93711dd4 100644
--- a/Geovis/Core/vtkGeoTerrain.h
+++ b/Geovis/Core/vtkGeoTerrain.h
@@ -50,7 +50,7 @@ class VTKGEOVISCORE_EXPORT vtkGeoTerrain : public vtkObject
public:
static vtkGeoTerrain *New();
vtkTypeMacro(vtkGeoTerrain,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* The source used to obtain geometry patches.
@@ -94,7 +94,7 @@ public:
protected:
vtkGeoTerrain();
- ~vtkGeoTerrain() VTK_OVERRIDE;
+ ~vtkGeoTerrain() override;
virtual void SetGeoSource(vtkGeoSource* source);
vtkGeoSource* GeoSource;
diff --git a/Geovis/Core/vtkGeoTerrain2D.h b/Geovis/Core/vtkGeoTerrain2D.h
index c4f8140397cb2c2090976ae3e9de4cc941d547ac..b6623a6ebf531e8b8c702a233035a55dcc7cfafa 100644
--- a/Geovis/Core/vtkGeoTerrain2D.h
+++ b/Geovis/Core/vtkGeoTerrain2D.h
@@ -49,7 +49,7 @@ class VTKGEOVISCORE_EXPORT vtkGeoTerrain2D : public vtkGeoTerrain
public:
static vtkGeoTerrain2D *New();
vtkTypeMacro(vtkGeoTerrain2D,vtkGeoTerrain);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -76,7 +76,7 @@ public:
protected:
vtkGeoTerrain2D();
- ~vtkGeoTerrain2D() VTK_OVERRIDE;
+ ~vtkGeoTerrain2D() override;
double LocationTolerance;
double TextureTolerance;
@@ -84,19 +84,19 @@ protected:
/**
* AddActors() calls this to setup parameters for evaluating nodes.
*/
- void InitializeNodeAnalysis(vtkRenderer* ren) VTK_OVERRIDE;
+ void InitializeNodeAnalysis(vtkRenderer* ren) override;
/**
* AddActors() calls this to determine if a node is in the current
* viewport.
*/
- bool NodeInViewport(vtkGeoTerrainNode* node) VTK_OVERRIDE;
+ bool NodeInViewport(vtkGeoTerrainNode* node) override;
/**
* AddActors() calls to to evaluate whether a node should be
* refined (1), coarsened (-1), or remain at the same level (0).
*/
- int EvaluateNode(vtkGeoTerrainNode* node) VTK_OVERRIDE;
+ int EvaluateNode(vtkGeoTerrainNode* node) override;
double CameraBounds[4];
double PixelSize;
diff --git a/Geovis/Core/vtkGeoTerrainNode.h b/Geovis/Core/vtkGeoTerrainNode.h
index dfdffe58fe12285410e95b981917a92c52a119b4..089299a46b6ad009a164061c00d2a36b4618052f 100644
--- a/Geovis/Core/vtkGeoTerrainNode.h
+++ b/Geovis/Core/vtkGeoTerrainNode.h
@@ -39,7 +39,7 @@ class VTKGEOVISCORE_EXPORT vtkGeoTerrainNode : public vtkGeoTreeNode
public:
static vtkGeoTerrainNode *New();
vtkTypeMacro(vtkGeoTerrainNode, vtkGeoTreeNode);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -118,26 +118,26 @@ public:
/**
* Shallow and Deep copy.
*/
- void ShallowCopy(vtkGeoTreeNode *src) VTK_OVERRIDE;
- void DeepCopy(vtkGeoTreeNode *src) VTK_OVERRIDE;
+ void ShallowCopy(vtkGeoTreeNode *src) override;
+ void DeepCopy(vtkGeoTreeNode *src) override;
//@}
/**
* Returns whether this node has valid data associated
* with it, or if it is an "empty" node.
*/
- bool HasData() VTK_OVERRIDE;
+ bool HasData() override;
/**
* Deletes the data associated with the node to make this
* an "empty" node. This is performed when the node has
* been unused for a certain amount of time.
*/
- void DeleteData() VTK_OVERRIDE;
+ void DeleteData() override;
protected:
vtkGeoTerrainNode();
- ~vtkGeoTerrainNode() VTK_OVERRIDE;
+ ~vtkGeoTerrainNode() override;
vtkSmartPointer<vtkPolyData> Model;
diff --git a/Geovis/Core/vtkGeoTransform.h b/Geovis/Core/vtkGeoTransform.h
index 9174a873da73581671c92cab3a2f79ab5e0aba65..0270bf5ece6c90d3ff51bdc7b5fd3c2d07a52397 100644
--- a/Geovis/Core/vtkGeoTransform.h
+++ b/Geovis/Core/vtkGeoTransform.h
@@ -37,7 +37,7 @@ class VTKGEOVISCORE_EXPORT vtkGeoTransform : public vtkAbstractTransform
{
public:
static vtkGeoTransform* New();
- void PrintSelf( ostream& os, vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf( ostream& os, vtkIndent indent ) override;
vtkTypeMacro(vtkGeoTransform,vtkAbstractTransform);
//@{
@@ -59,20 +59,20 @@ public:
/**
* Transform many points at once.
*/
- void TransformPoints( vtkPoints* src, vtkPoints* dst ) VTK_OVERRIDE;
+ void TransformPoints( vtkPoints* src, vtkPoints* dst ) override;
/**
* Invert the transformation.
*/
- void Inverse() VTK_OVERRIDE;
+ void Inverse() override;
//@{
/**
* This will calculate the transformation without calling Update.
* Meant for use only within other VTK classes.
*/
- void InternalTransformPoint( const float in[3], float out[3] ) VTK_OVERRIDE;
- void InternalTransformPoint( const double in[3], double out[3] ) VTK_OVERRIDE;
+ void InternalTransformPoint( const float in[3], float out[3] ) override;
+ void InternalTransformPoint( const double in[3], double out[3] ) override;
//@}
//@{
@@ -82,18 +82,18 @@ public:
* transformation at that point. This method does not call Update.
* Meant for use only within other VTK classes.
*/
- void InternalTransformDerivative( const float in[3], float out[3], float derivative[3][3] ) VTK_OVERRIDE;
- void InternalTransformDerivative( const double in[3], double out[3], double derivative[3][3] ) VTK_OVERRIDE;
+ void InternalTransformDerivative( const float in[3], float out[3], float derivative[3][3] ) override;
+ void InternalTransformDerivative( const double in[3], double out[3], double derivative[3][3] ) override;
//@}
/**
* Make another transform of the same type.
*/
- vtkAbstractTransform* MakeTransform() VTK_OVERRIDE;
+ vtkAbstractTransform* MakeTransform() override;
protected:
vtkGeoTransform();
- ~vtkGeoTransform() VTK_OVERRIDE;
+ ~vtkGeoTransform() override;
void InternalTransformPoints( double* ptsInOut, vtkIdType numPts, int stride );
diff --git a/Geovis/Core/vtkGeoTreeNode.h b/Geovis/Core/vtkGeoTreeNode.h
index 7983f42d75ce18ca65ba09bd1e156f82b10d0991..009a49d3881731c936961b8aae6f206ae2dbddab 100644
--- a/Geovis/Core/vtkGeoTreeNode.h
+++ b/Geovis/Core/vtkGeoTreeNode.h
@@ -48,7 +48,7 @@ class VTKGEOVISCORE_EXPORT vtkGeoTreeNode : public vtkObject
public:
static vtkGeoTreeNode *New();
vtkTypeMacro(vtkGeoTreeNode, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -175,7 +175,7 @@ public:
protected:
vtkGeoTreeNode();
- ~vtkGeoTreeNode() VTK_OVERRIDE;
+ ~vtkGeoTreeNode() override;
int Level;
unsigned long Id;
diff --git a/Geovis/Core/vtkGeoTreeNodeCache.h b/Geovis/Core/vtkGeoTreeNodeCache.h
index cdb2e59edf1fbf131f5f369f7bd81871fc7e0d8f..337e476d5f82b436e460825fc291f54bc3af080b 100644
--- a/Geovis/Core/vtkGeoTreeNodeCache.h
+++ b/Geovis/Core/vtkGeoTreeNodeCache.h
@@ -42,7 +42,7 @@ class VTKGEOVISCORE_EXPORT vtkGeoTreeNodeCache : public vtkObject
public:
static vtkGeoTreeNodeCache *New();
vtkTypeMacro(vtkGeoTreeNodeCache,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -83,7 +83,7 @@ public:
protected:
vtkGeoTreeNodeCache();
- ~vtkGeoTreeNodeCache() VTK_OVERRIDE;
+ ~vtkGeoTreeNodeCache() override;
/**
* Removes data from the oldest nodes and removes them from
diff --git a/Geovis/Core/vtkGlobeSource.h b/Geovis/Core/vtkGlobeSource.h
index 76178d9cc422931f1b5a25befc4332c485b3fe6e..315f8a184c3dc7cbe4d05d1758a453170880f50b 100644
--- a/Geovis/Core/vtkGlobeSource.h
+++ b/Geovis/Core/vtkGlobeSource.h
@@ -48,7 +48,7 @@ class VTKGEOVISCORE_EXPORT vtkGlobeSource : public vtkPolyDataAlgorithm
{
public:
vtkTypeMacro(vtkGlobeSource,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
@@ -146,12 +146,12 @@ public:
protected:
vtkGlobeSource();
- ~vtkGlobeSource() VTK_OVERRIDE {}
+ ~vtkGlobeSource() override {}
int RequestData(
vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
void AddPoint(
double theta, double phi, double radius,
diff --git a/IO/ADIOS/vtkADIOSReader.h b/IO/ADIOS/vtkADIOSReader.h
index 6a4824d620856c6625378d439e786da0b34795e9..ca2589e4b7494da0145a8629fb8c684e7fd29586 100644
--- a/IO/ADIOS/vtkADIOSReader.h
+++ b/IO/ADIOS/vtkADIOSReader.h
@@ -61,7 +61,7 @@ class VTKIOADIOS_EXPORT vtkADIOSReader : public vtkDataObjectAlgorithm
public:
static vtkADIOSReader* New(void);
vtkTypeMacro(vtkADIOSReader,vtkDataObjectAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Test wether or not a given file should even be attempted for use with this
diff --git a/IO/ADIOS/vtkADIOSWriter.h b/IO/ADIOS/vtkADIOSWriter.h
index b8bbbe3f256874fb5d0d1725dc462061408046a7..5b8a9523e9150005e14ea36009bc768b0dde06df 100644
--- a/IO/ADIOS/vtkADIOSWriter.h
+++ b/IO/ADIOS/vtkADIOSWriter.h
@@ -54,7 +54,7 @@ class VTKIOADIOS_EXPORT vtkADIOSWriter : public vtkDataObjectAlgorithm
public:
static vtkADIOSWriter* New();
vtkTypeMacro(vtkADIOSWriter,vtkDataObjectAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
const char* GetDefaultFileExtension();
diff --git a/IO/AMR/vtkAMRBaseParticlesReader.h b/IO/AMR/vtkAMRBaseParticlesReader.h
index 0133803703c9fe4c94626c4e39f1094675f327a7..50a6c800ae18c586cfe80bbdc400696a3ebbb215 100644
--- a/IO/AMR/vtkAMRBaseParticlesReader.h
+++ b/IO/AMR/vtkAMRBaseParticlesReader.h
@@ -39,7 +39,7 @@ class VTKIOAMR_EXPORT vtkAMRBaseParticlesReader :
{
public:
vtkTypeMacro( vtkAMRBaseParticlesReader, vtkMultiBlockDataSetAlgorithm );
- void PrintSelf(ostream &os, vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent ) override;
//@{
/**
@@ -131,7 +131,7 @@ public:
protected:
vtkAMRBaseParticlesReader();
- ~vtkAMRBaseParticlesReader() VTK_OVERRIDE;
+ ~vtkAMRBaseParticlesReader() override;
/**
* Reads the metadata, e.g., the number of blocks in the file.
@@ -215,8 +215,8 @@ protected:
*/
int RequestData( vtkInformation *request,
vtkInformationVector **inputVector,
- vtkInformationVector *outputVector ) VTK_OVERRIDE;
- int FillOutputPortInformation( int port, vtkInformation *info ) VTK_OVERRIDE;
+ vtkInformationVector *outputVector ) override;
+ int FillOutputPortInformation( int port, vtkInformation *info ) override;
//@}
int NumberOfBlocks;
diff --git a/IO/AMR/vtkAMRBaseReader.h b/IO/AMR/vtkAMRBaseReader.h
index a4b89d373c3257c464cc47b2510568b51a3d88d9..115ef322620b9062b3e5245d76768a20e4c85849 100644
--- a/IO/AMR/vtkAMRBaseReader.h
+++ b/IO/AMR/vtkAMRBaseReader.h
@@ -43,7 +43,7 @@ class VTKIOAMR_EXPORT vtkAMRBaseReader :
{
public:
vtkTypeMacro( vtkAMRBaseReader, vtkOverlappingAMRAlgorithm );
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
/**
* Initializes the AMR reader.
@@ -138,7 +138,7 @@ public:
protected:
vtkAMRBaseReader();
- ~vtkAMRBaseReader() VTK_OVERRIDE;
+ ~vtkAMRBaseReader() override;
// Desscription:
// Checks if this reader instance is attached to a communicator
@@ -261,12 +261,12 @@ protected:
int RequestData(
vtkInformation* vtkNotUsed(request),
vtkInformationVector** vtkNotUsed(inputVector),
- vtkInformationVector* outputVector ) VTK_OVERRIDE;
+ vtkInformationVector* outputVector ) override;
int RequestInformation(
vtkInformation* rqst,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector ) VTK_OVERRIDE;
- int FillOutputPortInformation(int port,vtkInformation *info) VTK_OVERRIDE;
+ vtkInformationVector* outputVector ) override;
+ int FillOutputPortInformation(int port,vtkInformation *info) override;
//@}
// Array selection member variables and methods
diff --git a/IO/AMR/vtkAMRDataSetCache.h b/IO/AMR/vtkAMRDataSetCache.h
index 3922ad1355471bfaee01dd260e3716cedc40ff4c..380a9ddeb5222ff1000dd7fca255006d875ffc6b 100644
--- a/IO/AMR/vtkAMRDataSetCache.h
+++ b/IO/AMR/vtkAMRDataSetCache.h
@@ -37,7 +37,7 @@ class VTKIOAMR_EXPORT vtkAMRDataSetCache : public vtkObject
public:
static vtkAMRDataSetCache* New();
vtkTypeMacro( vtkAMRDataSetCache, vtkObject );
- void PrintSelf(ostream &os, vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent ) override;
/**
* Inserts an AMR block to the cache
@@ -99,7 +99,7 @@ public:
protected:
vtkAMRDataSetCache();
- ~vtkAMRDataSetCache() VTK_OVERRIDE;
+ ~vtkAMRDataSetCache() override;
typedef std::map< int, vtkUniformGrid* > AMRCacheType;
AMRCacheType Cache;
diff --git a/IO/AMR/vtkAMREnzoParticlesReader.h b/IO/AMR/vtkAMREnzoParticlesReader.h
index ff2a87e27440c6274c92d1bbfc12a3682d225f87..ac52b110b70b9b53b0f6bacc5cb89c6508d1c283 100644
--- a/IO/AMR/vtkAMREnzoParticlesReader.h
+++ b/IO/AMR/vtkAMREnzoParticlesReader.h
@@ -41,7 +41,7 @@ class VTKIOAMR_EXPORT vtkAMREnzoParticlesReader :
public:
static vtkAMREnzoParticlesReader* New();
vtkTypeMacro( vtkAMREnzoParticlesReader, vtkAMRBaseParticlesReader );
- void PrintSelf(ostream &os, vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent ) override;
//@{
/**
@@ -54,11 +54,11 @@ public:
/**
* See vtkAMRBaseParticlesReader::GetTotalNumberOfParticles.
*/
- int GetTotalNumberOfParticles() VTK_OVERRIDE;
+ int GetTotalNumberOfParticles() override;
protected:
vtkAMREnzoParticlesReader();
- ~vtkAMREnzoParticlesReader() VTK_OVERRIDE;
+ ~vtkAMREnzoParticlesReader() override;
/**
* Read the particles from the given particles file for the block
@@ -69,12 +69,12 @@ protected:
/**
* See vtkAMRBaseParticlesReader::ReadMetaData()
*/
- void ReadMetaData() VTK_OVERRIDE;
+ void ReadMetaData() override;
/**
* See vtkAMRBaseParticlesReader::SetupParticleDataSelections
*/
- void SetupParticleDataSelections() VTK_OVERRIDE;
+ void SetupParticleDataSelections() override;
/**
* Filter's by particle type, iff particle_type is included in
@@ -90,7 +90,7 @@ protected:
/**
* Reads the particles.
*/
- vtkPolyData* ReadParticles( const int blkidx ) VTK_OVERRIDE;
+ vtkPolyData* ReadParticles( const int blkidx ) override;
int ParticleType;
diff --git a/IO/AMR/vtkAMREnzoReader.h b/IO/AMR/vtkAMREnzoReader.h
index 225c98c66186095e6a7383a7275c2377c50e2062..7579759ee4e530c125ad4363cc7515893e17a82d 100644
--- a/IO/AMR/vtkAMREnzoReader.h
+++ b/IO/AMR/vtkAMREnzoReader.h
@@ -37,7 +37,7 @@ class VTKIOAMR_EXPORT vtkAMREnzoReader : public vtkAMRBaseReader
public:
static vtkAMREnzoReader* New();
vtkTypeMacro(vtkAMREnzoReader,vtkAMRBaseReader);
- void PrintSelf(ostream &os, vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent ) override;
//@{
/**
@@ -51,21 +51,21 @@ public:
/**
* See vtkAMRBaseReader::GetNumberOfBlocks
*/
- int GetNumberOfBlocks() VTK_OVERRIDE;
+ int GetNumberOfBlocks() override;
/**
* See vtkAMRBaseReader::GetNumberOfLevels
*/
- int GetNumberOfLevels() VTK_OVERRIDE;
+ int GetNumberOfLevels() override;
/**
* See vtkAMRBaseReader::SetFileName
*/
- void SetFileName( const char* fileName ) VTK_OVERRIDE;
+ void SetFileName( const char* fileName ) override;
protected:
vtkAMREnzoReader();
- ~vtkAMREnzoReader() VTK_OVERRIDE;
+ ~vtkAMREnzoReader() override;
/**
* Parses the parameters file and extracts the
@@ -102,41 +102,41 @@ protected:
/**
* See vtkAMRBaseReader::ReadMetaData
*/
- void ReadMetaData() VTK_OVERRIDE;
+ void ReadMetaData() override;
/**
* See vtkAMRBaseReader::GetBlockLevel
*/
- int GetBlockLevel( const int blockIdx ) VTK_OVERRIDE;
+ int GetBlockLevel( const int blockIdx ) override;
void ComputeStats(vtkEnzoReaderInternal* internal, std::vector<int>& blocksPerLevel, double min[3]);
/**
* See vtkAMRBaseReader::FillMetaData
*/
- int FillMetaData( ) VTK_OVERRIDE;
+ int FillMetaData( ) override;
/**
* See vtkAMRBaseReader::GetAMRGrid
*/
- vtkUniformGrid* GetAMRGrid( const int blockIdx ) VTK_OVERRIDE;
+ vtkUniformGrid* GetAMRGrid( const int blockIdx ) override;
/**
* See vtkAMRBaseReader::GetAMRGridData
*/
void GetAMRGridData(
- const int blockIdx, vtkUniformGrid *block, const char *field) VTK_OVERRIDE;
+ const int blockIdx, vtkUniformGrid *block, const char *field) override;
/**
* See vtkAMRBaseReader::GetAMRGridData
*/
void GetAMRGridPointData(
- const int vtkNotUsed(blockIdx), vtkUniformGrid *vtkNotUsed(block), const char *vtkNotUsed(field)) VTK_OVERRIDE {;};
+ const int vtkNotUsed(blockIdx), vtkUniformGrid *vtkNotUsed(block), const char *vtkNotUsed(field)) override {;};
/**
* See vtkAMRBaseReader::SetUpDataArraySelections
*/
- void SetUpDataArraySelections() VTK_OVERRIDE;
+ void SetUpDataArraySelections() override;
int ConvertToCGS;
bool IsReady;
diff --git a/IO/AMR/vtkAMRFlashParticlesReader.h b/IO/AMR/vtkAMRFlashParticlesReader.h
index eb3dd3752564ff8f937bac527d983655ff0cdff2..88241338a162ea6f32a54f7b681ea6e64d684324 100644
--- a/IO/AMR/vtkAMRFlashParticlesReader.h
+++ b/IO/AMR/vtkAMRFlashParticlesReader.h
@@ -38,31 +38,31 @@ class VTKIOAMR_EXPORT vtkAMRFlashParticlesReader :
public:
static vtkAMRFlashParticlesReader* New();
vtkTypeMacro( vtkAMRFlashParticlesReader, vtkAMRBaseParticlesReader );
- void PrintSelf(ostream &os, vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent ) override;
/**
* See vtkAMRBaseParticlesReader::GetTotalNumberOfParticles.
*/
- int GetTotalNumberOfParticles() VTK_OVERRIDE;
+ int GetTotalNumberOfParticles() override;
protected:
vtkAMRFlashParticlesReader();
- ~vtkAMRFlashParticlesReader() VTK_OVERRIDE;
+ ~vtkAMRFlashParticlesReader() override;
/**
* See vtkAMRBaseParticlesReader::ReadMetaData
*/
- void ReadMetaData() VTK_OVERRIDE;
+ void ReadMetaData() override;
/**
* See vtkAMRBaseParticlesReader::SetupParticlesDataSelections
*/
- void SetupParticleDataSelections() VTK_OVERRIDE;
+ void SetupParticleDataSelections() override;
/**
* See vtkAMRBaseParticlesReader::ReadParticles
*/
- vtkPolyData* ReadParticles( const int blkidx ) VTK_OVERRIDE;
+ vtkPolyData* ReadParticles( const int blkidx ) override;
/**
* Reads the particlles of the given block from the given file.
diff --git a/IO/AMR/vtkAMRFlashReader.h b/IO/AMR/vtkAMRFlashReader.h
index 34718216db64abe85e5a59c625ac05d3d17195e6..ae0dacfe8fad97fed2645eb5bc2bbf3afb72cddf 100644
--- a/IO/AMR/vtkAMRFlashReader.h
+++ b/IO/AMR/vtkAMRFlashReader.h
@@ -34,63 +34,63 @@ class VTKIOAMR_EXPORT vtkAMRFlashReader : public vtkAMRBaseReader
public:
static vtkAMRFlashReader* New();
vtkTypeMacro( vtkAMRFlashReader, vtkAMRBaseReader );
- void PrintSelf(ostream &os, vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent ) override;
/**
* See vtkAMRBaseReader::GetNumberOfBlocks
*/
- int GetNumberOfBlocks() VTK_OVERRIDE;
+ int GetNumberOfBlocks() override;
/**
* See vtkAMRBaseReader::GetNumberOfLevels
*/
- int GetNumberOfLevels() VTK_OVERRIDE;
+ int GetNumberOfLevels() override;
/**
* See vtkAMRBaseReader::SetFileName
*/
- void SetFileName( const char* fileName ) VTK_OVERRIDE;
+ void SetFileName( const char* fileName ) override;
protected:
vtkAMRFlashReader();
- ~vtkAMRFlashReader() VTK_OVERRIDE;
+ ~vtkAMRFlashReader() override;
/**
* See vtkAMRBaseReader::ReadMetaData
*/
- void ReadMetaData() VTK_OVERRIDE;
+ void ReadMetaData() override;
/**
* See vtkAMRBaseReader::GetBlockLevel
*/
- int GetBlockLevel( const int blockIdx ) VTK_OVERRIDE;
+ int GetBlockLevel( const int blockIdx ) override;
/**
* See vtkAMRBaseReader::FillMetaData
*/
- int FillMetaData( ) VTK_OVERRIDE;
+ int FillMetaData( ) override;
/**
* See vtkAMRBaseReader::GetAMRGrid
*/
- vtkUniformGrid* GetAMRGrid( const int blockIdx ) VTK_OVERRIDE;
+ vtkUniformGrid* GetAMRGrid( const int blockIdx ) override;
/**
* See vtkAMRBaseReader::GetAMRGridData
*/
void GetAMRGridData(
- const int blockIdx, vtkUniformGrid *block, const char *field) VTK_OVERRIDE;
+ const int blockIdx, vtkUniformGrid *block, const char *field) override;
/**
* See vtkAMRBaseReader::GetAMRGridData
*/
void GetAMRGridPointData(
- const int vtkNotUsed(blockIdx), vtkUniformGrid *vtkNotUsed(block), const char *vtkNotUsed(field)) VTK_OVERRIDE {;}
+ const int vtkNotUsed(blockIdx), vtkUniformGrid *vtkNotUsed(block), const char *vtkNotUsed(field)) override {;}
/**
* See vtkAMRBaseReader::SetUpDataArraySelections
*/
- void SetUpDataArraySelections() VTK_OVERRIDE;
+ void SetUpDataArraySelections() override;
bool IsReady;
diff --git a/IO/Core/vtkASCIITextCodec.h b/IO/Core/vtkASCIITextCodec.h
index f20fdc2cad8b0cdcc15312d3258e0a727a9b0445..b458aa04ec5c803418676626ff17749848514691 100644
--- a/IO/Core/vtkASCIITextCodec.h
+++ b/IO/Core/vtkASCIITextCodec.h
@@ -46,20 +46,20 @@ class VTKIOCORE_EXPORT vtkASCIITextCodec : public vtkTextCodec
public:
vtkTypeMacro(vtkASCIITextCodec, vtkTextCodec);
static vtkASCIITextCodec* New() ;
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
* The name this codec goes by - should match the string the factory will take to create it
*/
- const char* Name() VTK_OVERRIDE;
- bool CanHandle(const char* NameString) VTK_OVERRIDE;
+ const char* Name() override;
+ bool CanHandle(const char* NameString) override;
//@}
/**
* is the given sample valid for this codec?
*/
- bool IsValid(istream& InputStream) VTK_OVERRIDE;
+ bool IsValid(istream& InputStream) override;
/**
@@ -68,17 +68,17 @@ public:
* would need to reset it.
*/
void ToUnicode(istream& InputStream,
- vtkTextCodec::OutputIterator& output) VTK_OVERRIDE ;
+ vtkTextCodec::OutputIterator& output) override ;
/**
* Return the next code point from the sequence represented by the stream
* advancing the stream through however many places needed to assemble that code point
*/
- vtkUnicodeString::value_type NextUnicode(istream& inputStream) VTK_OVERRIDE ;
+ vtkUnicodeString::value_type NextUnicode(istream& inputStream) override ;
protected:
vtkASCIITextCodec() ;
- ~vtkASCIITextCodec() VTK_OVERRIDE;
+ ~vtkASCIITextCodec() override;
private:
vtkASCIITextCodec(const vtkASCIITextCodec &) VTK_DELETE_FUNCTION;
diff --git a/IO/Core/vtkAbstractParticleWriter.h b/IO/Core/vtkAbstractParticleWriter.h
index bfad54b5474b055b0dad5fb0eecc20526a8e7bd7..1c4a1b9d890e57db20c3f2937b03c60913c91d20 100644
--- a/IO/Core/vtkAbstractParticleWriter.h
+++ b/IO/Core/vtkAbstractParticleWriter.h
@@ -38,7 +38,7 @@ class VTKIOCORE_EXPORT vtkAbstractParticleWriter : public vtkWriter
{
public:
vtkTypeMacro(vtkAbstractParticleWriter,vtkWriter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -86,9 +86,9 @@ public:
protected:
vtkAbstractParticleWriter();
- ~vtkAbstractParticleWriter() VTK_OVERRIDE;
+ ~vtkAbstractParticleWriter() override;
- void WriteData() VTK_OVERRIDE = 0; //internal method subclasses must respond to
+ void WriteData() override = 0; //internal method subclasses must respond to
int CollectiveIO;
int TimeStep;
double TimeValue;
diff --git a/IO/Core/vtkAbstractPolyDataReader.h b/IO/Core/vtkAbstractPolyDataReader.h
index 9198fe5f0568e4e065654e7c7917b680847b5504..daf6dc83ac3a314f207a18a4ed54ef165fcadad9 100644
--- a/IO/Core/vtkAbstractPolyDataReader.h
+++ b/IO/Core/vtkAbstractPolyDataReader.h
@@ -37,7 +37,7 @@ class VTKIOCORE_EXPORT vtkAbstractPolyDataReader : public vtkPolyDataAlgorithm
{
public:
vtkTypeMacro(vtkAbstractPolyDataReader, vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -49,7 +49,7 @@ public:
protected:
vtkAbstractPolyDataReader();
- ~vtkAbstractPolyDataReader() VTK_OVERRIDE;
+ ~vtkAbstractPolyDataReader() override;
char *FileName;
private:
diff --git a/IO/Core/vtkArrayDataReader.h b/IO/Core/vtkArrayDataReader.h
index a1dbd56e4f673b669ae1a01f878735c3518ba674..41697c80eb80f8f379bc3c2118df47ab9ecea103 100644
--- a/IO/Core/vtkArrayDataReader.h
+++ b/IO/Core/vtkArrayDataReader.h
@@ -45,7 +45,7 @@ class VTKIOCORE_EXPORT vtkArrayDataReader :
public:
static vtkArrayDataReader* New();
vtkTypeMacro(vtkArrayDataReader, vtkArrayDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -87,12 +87,12 @@ public:
protected:
vtkArrayDataReader();
- ~vtkArrayDataReader() VTK_OVERRIDE;
+ ~vtkArrayDataReader() override;
int RequestData(
vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
char* FileName;
vtkStdString InputString;
diff --git a/IO/Core/vtkArrayDataWriter.h b/IO/Core/vtkArrayDataWriter.h
index afd97a7439d409400cbef73138639c113a124dea..b179a3602b82adc4077f1300b8b16cdd0ed8cea3 100644
--- a/IO/Core/vtkArrayDataWriter.h
+++ b/IO/Core/vtkArrayDataWriter.h
@@ -63,7 +63,7 @@ class VTKIOCORE_EXPORT vtkArrayDataWriter :
public:
static vtkArrayDataWriter *New();
vtkTypeMacro(vtkArrayDataWriter, vtkWriter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -97,7 +97,7 @@ public:
vtkBooleanMacro(WriteToOutputString, bool);
//@}
- int Write() VTK_OVERRIDE; // This is necessary to get Write() wrapped for scripting languages.
+ int Write() override; // This is necessary to get Write() wrapped for scripting languages.
/**
* Writes input port 0 data to a file, using an arbitrary filename and binary flag.
@@ -134,10 +134,10 @@ public:
protected:
vtkArrayDataWriter();
- ~vtkArrayDataWriter() VTK_OVERRIDE;
+ ~vtkArrayDataWriter() override;
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
- void WriteData() VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
+ void WriteData() override;
char* FileName;
int Binary;
diff --git a/IO/Core/vtkArrayReader.h b/IO/Core/vtkArrayReader.h
index 4e6ca1e51d8d046187b96b362944ae72ac5ff129..02a6ad3a07a8e222b53fd37f6b7a9f57fb97c85d 100644
--- a/IO/Core/vtkArrayReader.h
+++ b/IO/Core/vtkArrayReader.h
@@ -48,7 +48,7 @@ class VTKIOCORE_EXPORT vtkArrayReader :
public:
static vtkArrayReader* New();
vtkTypeMacro(vtkArrayReader, vtkArrayDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -90,12 +90,12 @@ public:
protected:
vtkArrayReader();
- ~vtkArrayReader() VTK_OVERRIDE;
+ ~vtkArrayReader() override;
int RequestData(
vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
char* FileName;
vtkStdString InputString;
diff --git a/IO/Core/vtkArrayWriter.h b/IO/Core/vtkArrayWriter.h
index faae950b0fb82240583863d3f08a6e685293e2a5..669d50ad4f741568fd20cb47b53fa2d81f4525a6 100644
--- a/IO/Core/vtkArrayWriter.h
+++ b/IO/Core/vtkArrayWriter.h
@@ -64,7 +64,7 @@ class VTKIOCORE_EXPORT vtkArrayWriter :
public:
static vtkArrayWriter *New();
vtkTypeMacro(vtkArrayWriter, vtkWriter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -98,7 +98,7 @@ public:
vtkBooleanMacro(WriteToOutputString, bool);
//@}
- int Write() VTK_OVERRIDE; // This is necessary to get Write() wrapped for scripting languages.
+ int Write() override; // This is necessary to get Write() wrapped for scripting languages.
/**
* Writes input port 0 data to a file, using an arbitrary filename and binary flag.
@@ -135,10 +135,10 @@ public:
protected:
vtkArrayWriter();
- ~vtkArrayWriter() VTK_OVERRIDE;
+ ~vtkArrayWriter() override;
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
- void WriteData() VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
+ void WriteData() override;
char* FileName;
int Binary;
diff --git a/IO/Core/vtkBase64InputStream.h b/IO/Core/vtkBase64InputStream.h
index ae54e2d685b30995555f759a4bdbd38d0fe1107d..5dc4ebe7bcf6a4288d777859dc8994ebf024118a 100644
--- a/IO/Core/vtkBase64InputStream.h
+++ b/IO/Core/vtkBase64InputStream.h
@@ -31,26 +31,26 @@ class VTKIOCORE_EXPORT vtkBase64InputStream : public vtkInputStream
public:
vtkTypeMacro(vtkBase64InputStream,vtkInputStream);
static vtkBase64InputStream *New();
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Called after the stream position has been set by the caller, but
* before any Seek or Read calls. The stream position should not be
* adjusted by the caller until after an EndReading call.
*/
- void StartReading() VTK_OVERRIDE;
+ void StartReading() override;
/**
* Seek to the given offset in the input data. Returns 1 for
* success, 0 for failure.
*/
- int Seek(vtkTypeInt64 offset) VTK_OVERRIDE;
+ int Seek(vtkTypeInt64 offset) override;
/**
* Read input data of the given length. Returns amount actually
* read.
*/
- size_t Read(void* data, size_t length) VTK_OVERRIDE;
+ size_t Read(void* data, size_t length) override;
/**
* Called after all desired calls to Seek and Read have been made.
@@ -58,11 +58,11 @@ public:
* stream. Additional reads should not be done until after another
* call to StartReading.
*/
- void EndReading() VTK_OVERRIDE;
+ void EndReading() override;
protected:
vtkBase64InputStream();
- ~vtkBase64InputStream() VTK_OVERRIDE;
+ ~vtkBase64InputStream() override;
// Number of decoded bytes left in Buffer from last call to Read.
int BufferLength;
diff --git a/IO/Core/vtkBase64OutputStream.h b/IO/Core/vtkBase64OutputStream.h
index 09bb8813878ce2ec1792cd92e5378cd5c5d3f6e9..c002fce837be5e9acff4fbeebae8a3f1016d1595 100644
--- a/IO/Core/vtkBase64OutputStream.h
+++ b/IO/Core/vtkBase64OutputStream.h
@@ -31,19 +31,19 @@ class VTKIOCORE_EXPORT vtkBase64OutputStream : public vtkOutputStream
public:
vtkTypeMacro(vtkBase64OutputStream,vtkOutputStream);
static vtkBase64OutputStream *New();
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Called after the stream position has been set by the caller, but
* before any Write calls. The stream position should not be
* adjusted by the caller until after an EndWriting call.
*/
- int StartWriting() VTK_OVERRIDE;
+ int StartWriting() override;
/**
* Write output data of the given length.
*/
- int Write(void const* data, size_t length) VTK_OVERRIDE;
+ int Write(void const* data, size_t length) override;
/**
* Called after all desired calls to Write have been made. After
@@ -51,11 +51,11 @@ public:
* stream. Additional writes should not be done until after another
* call to StartWriting.
*/
- int EndWriting() VTK_OVERRIDE;
+ int EndWriting() override;
protected:
vtkBase64OutputStream();
- ~vtkBase64OutputStream() VTK_OVERRIDE;
+ ~vtkBase64OutputStream() override;
// Number of un-encoded bytes left in Buffer from last call to Write.
unsigned int BufferLength;
diff --git a/IO/Core/vtkBase64Utilities.h b/IO/Core/vtkBase64Utilities.h
index 55520d9c047574badaeecffef68cb6b423981555..4394fde24794986ea5f7de3d488996d005860e9e 100644
--- a/IO/Core/vtkBase64Utilities.h
+++ b/IO/Core/vtkBase64Utilities.h
@@ -107,7 +107,7 @@ public:
protected:
vtkBase64Utilities() {}
- ~vtkBase64Utilities() VTK_OVERRIDE {}
+ ~vtkBase64Utilities() override {}
private:
vtkBase64Utilities(const vtkBase64Utilities&) VTK_DELETE_FUNCTION;
diff --git a/IO/Core/vtkDataCompressor.h b/IO/Core/vtkDataCompressor.h
index 6136cd74bc4b799c7705edc753f03f45dd6272d1..8e9474a86fbdf51b2226d5aff4c9c9e5d546532d 100644
--- a/IO/Core/vtkDataCompressor.h
+++ b/IO/Core/vtkDataCompressor.h
@@ -34,7 +34,7 @@ class VTKIOCORE_EXPORT vtkDataCompressor : public vtkObject
{
public:
vtkTypeMacro(vtkDataCompressor,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Get the maximum space that may be needed to store data of the
@@ -86,7 +86,7 @@ public:
protected:
vtkDataCompressor();
- ~vtkDataCompressor() VTK_OVERRIDE;
+ ~vtkDataCompressor() override;
// Actual compression method. This must be provided by a subclass.
// Must return the size of the compressed data, or zero on error.
diff --git a/IO/Core/vtkDelimitedTextWriter.h b/IO/Core/vtkDelimitedTextWriter.h
index 05a5a071b05a65b8907da097112c1a4e62090779..30bf533e347bdc3db952a423d6a096314bcc89b2 100644
--- a/IO/Core/vtkDelimitedTextWriter.h
+++ b/IO/Core/vtkDelimitedTextWriter.h
@@ -38,7 +38,7 @@ class VTKIOCORE_EXPORT vtkDelimitedTextWriter : public vtkWriter
public:
static vtkDelimitedTextWriter* New();
vtkTypeMacro(vtkDelimitedTextWriter, vtkWriter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -97,19 +97,19 @@ public:
protected:
vtkDelimitedTextWriter();
- ~vtkDelimitedTextWriter() VTK_OVERRIDE;
+ ~vtkDelimitedTextWriter() override;
bool WriteToOutputString;
char* OutputString;
bool OpenStream();
- void WriteData() VTK_OVERRIDE;
+ void WriteData() override;
virtual void WriteTable(vtkTable* rectilinearGrid);
// see algorithm for more info.
// This writer takes in vtkTable.
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
char* FileName;
char* FieldDelimiter;
diff --git a/IO/Core/vtkGlobFileNames.h b/IO/Core/vtkGlobFileNames.h
index 442f9ce7bbd0a2829b34e18639bd048b4acbdd8a..d092b7b22e51ded53b5742bcbf9bd325df6fc1e8 100644
--- a/IO/Core/vtkGlobFileNames.h
+++ b/IO/Core/vtkGlobFileNames.h
@@ -59,7 +59,7 @@ public:
/**
* Print directory to stream.
*/
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Reset the glob by clearing the list of output filenames.
@@ -122,7 +122,7 @@ protected:
//@}
vtkGlobFileNames();
- ~vtkGlobFileNames() VTK_OVERRIDE;
+ ~vtkGlobFileNames() override;
private:
char* Directory; // Directory for search.
diff --git a/IO/Core/vtkInputStream.h b/IO/Core/vtkInputStream.h
index cd624cc6f2974209311f703dc15e5d97ed996fba..62ff43e70b042fe48527445583b784ef294f199f 100644
--- a/IO/Core/vtkInputStream.h
+++ b/IO/Core/vtkInputStream.h
@@ -35,7 +35,7 @@ class VTKIOCORE_EXPORT vtkInputStream : public vtkObject
public:
vtkTypeMacro(vtkInputStream,vtkObject);
static vtkInputStream *New();
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -74,7 +74,7 @@ public:
protected:
vtkInputStream();
- ~vtkInputStream() VTK_OVERRIDE;
+ ~vtkInputStream() override;
// The real input stream.
istream* Stream;
diff --git a/IO/Core/vtkJavaScriptDataWriter.h b/IO/Core/vtkJavaScriptDataWriter.h
index df07798832f8707b16b51d6e31cb89d5a4926938..4a7bbfef39582ac4cf0f3784bb22904c701de25e 100644
--- a/IO/Core/vtkJavaScriptDataWriter.h
+++ b/IO/Core/vtkJavaScriptDataWriter.h
@@ -38,7 +38,7 @@ class VTKIOCORE_EXPORT vtkJavaScriptDataWriter : public vtkWriter
public:
static vtkJavaScriptDataWriter* New();
vtkTypeMacro(vtkJavaScriptDataWriter, vtkWriter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -85,16 +85,16 @@ public:
protected:
vtkJavaScriptDataWriter();
- ~vtkJavaScriptDataWriter() VTK_OVERRIDE;
+ ~vtkJavaScriptDataWriter() override;
ofstream* OpenFile();
- void WriteData() VTK_OVERRIDE;
+ void WriteData() override;
virtual void WriteTable(vtkTable* table, ostream *stream_ptr);
// see algorithm for more info.
// This writer takes in vtkTable.
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
char* VariableName;
char* FileName;
diff --git a/IO/Core/vtkLZ4DataCompressor.h b/IO/Core/vtkLZ4DataCompressor.h
index 55b8e4bfd7a3906ecaa59b84539e08ac2a5b28aa..af2d962cbccb4f18989e5e5ef2cfea4b15e95069 100644
--- a/IO/Core/vtkLZ4DataCompressor.h
+++ b/IO/Core/vtkLZ4DataCompressor.h
@@ -27,7 +27,7 @@ class VTKIOCORE_EXPORT vtkLZ4DataCompressor : public vtkDataCompressor
{
public:
vtkTypeMacro(vtkLZ4DataCompressor,vtkDataCompressor);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkLZ4DataCompressor* New();
// Description:
@@ -35,7 +35,7 @@ public:
// given uncompressed size after compression. This is the minimum
// size of the output buffer that can be passed to the four-argument
// Compress method.
- size_t GetMaximumCompressionSpace(size_t size) VTK_OVERRIDE;
+ size_t GetMaximumCompressionSpace(size_t size) override;
// Description:
// Get/Set the compression level.
@@ -44,7 +44,7 @@ public:
protected:
vtkLZ4DataCompressor();
- ~vtkLZ4DataCompressor() VTK_OVERRIDE;
+ ~vtkLZ4DataCompressor() override;
int AccelerationLevel;
@@ -52,12 +52,12 @@ protected:
size_t CompressBuffer(unsigned char const* uncompressedData,
size_t uncompressedSize,
unsigned char* compressedData,
- size_t compressionSpace) VTK_OVERRIDE;
+ size_t compressionSpace) override;
// Decompression method required by vtkDataCompressor.
size_t UncompressBuffer(unsigned char const* compressedData,
size_t compressedSize,
unsigned char* uncompressedData,
- size_t uncompressedSize) VTK_OVERRIDE;
+ size_t uncompressedSize) override;
private:
vtkLZ4DataCompressor(const vtkLZ4DataCompressor&) VTK_DELETE_FUNCTION;
void operator=(const vtkLZ4DataCompressor&) VTK_DELETE_FUNCTION;
diff --git a/IO/Core/vtkOutputStream.h b/IO/Core/vtkOutputStream.h
index f6289b6e449391dc65f4221f63b6ce9d7d693d89..b8d7f242745d3c95f1f650d3f9a10a08dc9a4ff2 100644
--- a/IO/Core/vtkOutputStream.h
+++ b/IO/Core/vtkOutputStream.h
@@ -35,7 +35,7 @@ class VTKIOCORE_EXPORT vtkOutputStream : public vtkObject
public:
vtkTypeMacro(vtkOutputStream,vtkObject);
static vtkOutputStream *New();
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -67,7 +67,7 @@ public:
protected:
vtkOutputStream();
- ~vtkOutputStream() VTK_OVERRIDE;
+ ~vtkOutputStream() override;
// The real output stream.
ostream* Stream;
diff --git a/IO/Core/vtkSortFileNames.h b/IO/Core/vtkSortFileNames.h
index 60ce6f231068882841df507380bd7d4c70332856..79f72d84509b185f027fdffa6a5e508ac6458048 100644
--- a/IO/Core/vtkSortFileNames.h
+++ b/IO/Core/vtkSortFileNames.h
@@ -44,7 +44,7 @@ class VTKIOCORE_EXPORT vtkSortFileNames : public vtkObject
public:
vtkTypeMacro(vtkSortFileNames,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkSortFileNames *New();
//@{
@@ -133,7 +133,7 @@ public:
protected:
vtkSortFileNames();
- ~vtkSortFileNames() VTK_OVERRIDE;
+ ~vtkSortFileNames() override;
int NumericSort;
int IgnoreCase;
diff --git a/IO/Core/vtkTextCodec.cxx b/IO/Core/vtkTextCodec.cxx
index c892b4dea8d7c489f90ea39397c46763a6d3a627..3e277886bb75c16a6476fbb442ed4f9a9c6bc287 100644
--- a/IO/Core/vtkTextCodec.cxx
+++ b/IO/Core/vtkTextCodec.cxx
@@ -53,12 +53,12 @@ namespace
class vtkUnicodeStringOutputIterator : public vtkTextCodec::OutputIterator
{
public:
- vtkUnicodeStringOutputIterator& operator++(int) VTK_OVERRIDE;
- vtkUnicodeStringOutputIterator& operator*() VTK_OVERRIDE;
- vtkUnicodeStringOutputIterator& operator=(const vtkUnicodeString::value_type value) VTK_OVERRIDE;
+ vtkUnicodeStringOutputIterator& operator++(int) override;
+ vtkUnicodeStringOutputIterator& operator*() override;
+ vtkUnicodeStringOutputIterator& operator=(const vtkUnicodeString::value_type value) override;
vtkUnicodeStringOutputIterator(vtkUnicodeString& outputString);
- ~vtkUnicodeStringOutputIterator() VTK_OVERRIDE;
+ ~vtkUnicodeStringOutputIterator() override;
private:
vtkUnicodeStringOutputIterator(const vtkUnicodeStringOutputIterator&) VTK_DELETE_FUNCTION;
diff --git a/IO/Core/vtkTextCodec.h b/IO/Core/vtkTextCodec.h
index d5f421f713c997a24f05aaf52f10cf45f12add07..e615537b95d5a3be083c5b01648cd1a0973f6832 100644
--- a/IO/Core/vtkTextCodec.h
+++ b/IO/Core/vtkTextCodec.h
@@ -52,7 +52,7 @@ public:
* to create it
*/
virtual const char* Name();
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
virtual bool CanHandle(const char* NameString);
@@ -107,7 +107,7 @@ public:
protected:
vtkTextCodec();
- ~vtkTextCodec() VTK_OVERRIDE;
+ ~vtkTextCodec() override;
private:
vtkTextCodec(const vtkTextCodec &) VTK_DELETE_FUNCTION;
diff --git a/IO/Core/vtkTextCodecFactory.h b/IO/Core/vtkTextCodecFactory.h
index 528485d6cea9fd93ad88eca17021df3d5fecbe06..47bd0130138c067fc8581bc27fbec7e2ffc91f38 100644
--- a/IO/Core/vtkTextCodecFactory.h
+++ b/IO/Core/vtkTextCodecFactory.h
@@ -49,7 +49,7 @@ class VTKIOCORE_EXPORT vtkTextCodecFactory : public vtkObject
public:
vtkTypeMacro(vtkTextCodecFactory, vtkObject);
static vtkTextCodecFactory* New() ;
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Type for Creation callback.
@@ -89,7 +89,7 @@ public:
protected:
vtkTextCodecFactory();
- ~vtkTextCodecFactory() VTK_OVERRIDE;
+ ~vtkTextCodecFactory() override;
private:
vtkTextCodecFactory(const vtkTextCodecFactory &) VTK_DELETE_FUNCTION;
diff --git a/IO/Core/vtkUTF16TextCodec.cxx b/IO/Core/vtkUTF16TextCodec.cxx
index 041200dca36522c6a65701efce4d4b263a549874..339f6e232d763eaa231ebcc7d07f2ca1a4f24c68 100644
--- a/IO/Core/vtkUTF16TextCodec.cxx
+++ b/IO/Core/vtkUTF16TextCodec.cxx
@@ -99,13 +99,13 @@ namespace
class testIterator : public vtkTextCodec::OutputIterator
{
public:
- testIterator& operator++(int) VTK_OVERRIDE {return *this;}
- testIterator& operator*() VTK_OVERRIDE {return *this;}
- testIterator& operator=(const vtkUnicodeString::value_type) VTK_OVERRIDE
+ testIterator& operator++(int) override {return *this;}
+ testIterator& operator*() override {return *this;}
+ testIterator& operator=(const vtkUnicodeString::value_type) override
{return *this;}
testIterator() {}
- ~testIterator() VTK_OVERRIDE {}
+ ~testIterator() override {}
private:
testIterator(const testIterator&) VTK_DELETE_FUNCTION;
diff --git a/IO/Core/vtkUTF16TextCodec.h b/IO/Core/vtkUTF16TextCodec.h
index 21e5139978d5197415a8b36621b8554c91459016..d6c147e1c8c0f045b6ecd8871ff59526a5aafa5a 100644
--- a/IO/Core/vtkUTF16TextCodec.h
+++ b/IO/Core/vtkUTF16TextCodec.h
@@ -46,14 +46,14 @@ class VTKIOCORE_EXPORT vtkUTF16TextCodec : public vtkTextCodec
public:
vtkTypeMacro(vtkUTF16TextCodec, vtkTextCodec);
static vtkUTF16TextCodec* New() ;
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
* The name this codec goes by - should match the string the factory will take to create it
*/
- const char* Name() VTK_OVERRIDE;
- bool CanHandle(const char* NameString) VTK_OVERRIDE ;
+ const char* Name() override;
+ bool CanHandle(const char* NameString) override ;
//@}
/**
@@ -69,24 +69,24 @@ public:
/**
* is the given sample valid for this codec? - will take endianness into account
*/
- bool IsValid(istream& InputStream) VTK_OVERRIDE ;
+ bool IsValid(istream& InputStream) override ;
/**
* Iterate through the sequence represented by the begin and end iterators assigning the result
* to the output iterator. This is the current pattern in vtkDelimitedTextReader
*/
void ToUnicode(istream& InputStream,
- vtkTextCodec::OutputIterator& output) VTK_OVERRIDE ;
+ vtkTextCodec::OutputIterator& output) override ;
/**
* Return the next code point from the sequence represented by the begin, end iterators
* advancing begin through however many places needed to assemble that code point
*/
- vtkUnicodeString::value_type NextUnicode(istream& inputStream) VTK_OVERRIDE ;
+ vtkUnicodeString::value_type NextUnicode(istream& inputStream) override ;
protected:
vtkUTF16TextCodec() ;
- ~vtkUTF16TextCodec() VTK_OVERRIDE;
+ ~vtkUTF16TextCodec() override;
bool _endianExplicitlySet ;
bool _bigEndian ;
diff --git a/IO/Core/vtkUTF8TextCodec.cxx b/IO/Core/vtkUTF8TextCodec.cxx
index f066cf3d030a18ae77c583f1d6ea13d69a4bcd18..ecacd353edc304c7ec68658246c40e57b5e09b58 100644
--- a/IO/Core/vtkUTF8TextCodec.cxx
+++ b/IO/Core/vtkUTF8TextCodec.cxx
@@ -46,13 +46,13 @@ namespace
class testIterator : public vtkTextCodec::OutputIterator
{
public:
- testIterator& operator++(int) VTK_OVERRIDE {return *this;}
- testIterator& operator*() VTK_OVERRIDE {return *this;}
- testIterator& operator=(const vtkUnicodeString::value_type) VTK_OVERRIDE
+ testIterator& operator++(int) override {return *this;}
+ testIterator& operator*() override {return *this;}
+ testIterator& operator=(const vtkUnicodeString::value_type) override
{return *this;}
testIterator() {}
- ~testIterator() VTK_OVERRIDE {}
+ ~testIterator() override {}
private:
testIterator(const testIterator&) VTK_DELETE_FUNCTION;
diff --git a/IO/Core/vtkUTF8TextCodec.h b/IO/Core/vtkUTF8TextCodec.h
index d820be13e2302d0e3ee0dbe4d98a47b072bff610..7471999b5900a1022d712bc57a74a59b9e807fae 100644
--- a/IO/Core/vtkUTF8TextCodec.h
+++ b/IO/Core/vtkUTF8TextCodec.h
@@ -46,18 +46,18 @@ class VTKIOCORE_EXPORT vtkUTF8TextCodec : public vtkTextCodec
public:
vtkTypeMacro(vtkUTF8TextCodec, vtkTextCodec);
static vtkUTF8TextCodec* New() ;
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* The name this codec goes by - should match the string the factory will take to create it
*/
- const char* Name() VTK_OVERRIDE {return "UTF-8" ;}
- bool CanHandle(const char* testStr) VTK_OVERRIDE;
+ const char* Name() override {return "UTF-8" ;}
+ bool CanHandle(const char* testStr) override;
/**
* is the given sample valid for this codec?
*/
- bool IsValid(istream& InputStream) VTK_OVERRIDE ;
+ bool IsValid(istream& InputStream) override ;
/**
* Iterate through the sequence represented by the stream assigning the result
@@ -65,17 +65,17 @@ public:
* would need to reset it.
*/
void ToUnicode(istream& InputStream,
- vtkTextCodec::OutputIterator& output) VTK_OVERRIDE ;
+ vtkTextCodec::OutputIterator& output) override ;
/**
* Return the next code point from the sequence represented by the stream
* advancing the stream through however many places needed to assemble that code point
*/
- vtkUnicodeString::value_type NextUnicode(istream& inputStream) VTK_OVERRIDE ;
+ vtkUnicodeString::value_type NextUnicode(istream& inputStream) override ;
protected:
vtkUTF8TextCodec() ;
- ~vtkUTF8TextCodec() VTK_OVERRIDE;
+ ~vtkUTF8TextCodec() override;
private:
vtkUTF8TextCodec(const vtkUTF8TextCodec &) VTK_DELETE_FUNCTION;
diff --git a/IO/Core/vtkWriter.h b/IO/Core/vtkWriter.h
index 866de52ea3873acfa152ea77d9003d9c35922256..502ccaf35d86de9915de281ca22c3b993b145d16 100644
--- a/IO/Core/vtkWriter.h
+++ b/IO/Core/vtkWriter.h
@@ -43,7 +43,7 @@ class VTKIOCORE_EXPORT vtkWriter : public vtkAlgorithm
{
public:
vtkTypeMacro(vtkWriter,vtkAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Write data to output. Method executes subclasses WriteData() method, as
@@ -82,11 +82,11 @@ public:
protected:
vtkWriter();
- ~vtkWriter() VTK_OVERRIDE;
+ ~vtkWriter() override;
int ProcessRequest(vtkInformation *request,
vtkInformationVector **inputVector,
- vtkInformationVector *outputVector) VTK_OVERRIDE;
+ vtkInformationVector *outputVector) override;
virtual int RequestData(vtkInformation *request,
vtkInformationVector **inputVector,
vtkInformationVector *outputVector);
diff --git a/IO/Core/vtkZLibDataCompressor.h b/IO/Core/vtkZLibDataCompressor.h
index b82d397d0253039a7d577915298fa58afb10bf80..aa7f4948ab52807397f358aca5e3a8e994ca450f 100644
--- a/IO/Core/vtkZLibDataCompressor.h
+++ b/IO/Core/vtkZLibDataCompressor.h
@@ -30,7 +30,7 @@ class VTKIOCORE_EXPORT vtkZLibDataCompressor : public vtkDataCompressor
{
public:
vtkTypeMacro(vtkZLibDataCompressor,vtkDataCompressor);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkZLibDataCompressor* New();
/**
@@ -39,7 +39,7 @@ public:
* size of the output buffer that can be passed to the four-argument
* Compress method.
*/
- size_t GetMaximumCompressionSpace(size_t size) VTK_OVERRIDE;
+ size_t GetMaximumCompressionSpace(size_t size) override;
//@{
/**
@@ -51,7 +51,7 @@ public:
protected:
vtkZLibDataCompressor();
- ~vtkZLibDataCompressor() VTK_OVERRIDE;
+ ~vtkZLibDataCompressor() override;
int CompressionLevel;
@@ -59,12 +59,12 @@ protected:
size_t CompressBuffer(unsigned char const* uncompressedData,
size_t uncompressedSize,
unsigned char* compressedData,
- size_t compressionSpace) VTK_OVERRIDE;
+ size_t compressionSpace) override;
// Decompression method required by vtkDataCompressor.
size_t UncompressBuffer(unsigned char const* compressedData,
size_t compressedSize,
unsigned char* uncompressedData,
- size_t uncompressedSize) VTK_OVERRIDE;
+ size_t uncompressedSize) override;
private:
vtkZLibDataCompressor(const vtkZLibDataCompressor&) VTK_DELETE_FUNCTION;
void operator=(const vtkZLibDataCompressor&) VTK_DELETE_FUNCTION;
diff --git a/IO/EnSight/vtkEnSight6BinaryReader.h b/IO/EnSight/vtkEnSight6BinaryReader.h
index 6f9a40fb5175ca608038713d105b73da2b28ab32..e3ed4d6c9aa6d707f40b53fb8267aff9c695edd5 100644
--- a/IO/EnSight/vtkEnSight6BinaryReader.h
+++ b/IO/EnSight/vtkEnSight6BinaryReader.h
@@ -50,11 +50,11 @@ class VTKIOENSIGHT_EXPORT vtkEnSight6BinaryReader : public vtkEnSightReader
public:
static vtkEnSight6BinaryReader *New();
vtkTypeMacro(vtkEnSight6BinaryReader, vtkEnSightReader);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkEnSight6BinaryReader();
- ~vtkEnSight6BinaryReader() VTK_OVERRIDE;
+ ~vtkEnSight6BinaryReader() override;
// Returns 1 if successful. Sets file size as a side action.
int OpenFile(const char* filename);
@@ -63,14 +63,14 @@ protected:
* Read the geometry file. If an error occurred, 0 is returned; otherwise 1.
*/
int ReadGeometryFile(const char* fileName, int timeStep,
- vtkMultiBlockDataSet *output) VTK_OVERRIDE;
+ vtkMultiBlockDataSet *output) override;
/**
* Read the measured geometry file. If an error occurred, 0 is returned;
* otherwise 1.
*/
int ReadMeasuredGeometryFile(const char* fileName, int timeStep,
- vtkMultiBlockDataSet *output) VTK_OVERRIDE;
+ vtkMultiBlockDataSet *output) override;
/**
* Read scalars per node for this dataset. If an error occurred, 0 is
@@ -80,7 +80,7 @@ protected:
int ReadScalarsPerNode(const char* fileName, const char* description,
int timeStep, vtkMultiBlockDataSet *output,
int measured = 0, int numberOfComponents = 1,
- int component = 0) VTK_OVERRIDE;
+ int component = 0) override;
/**
* Read vectors per node for this dataset. If an error occurred, 0 is
@@ -88,14 +88,14 @@ protected:
*/
int ReadVectorsPerNode(const char* fileName, const char* description,
int timeStep, vtkMultiBlockDataSet *output,
- int measured = 0) VTK_OVERRIDE;
+ int measured = 0) override;
/**
* Read tensors per node for this dataset. If an error occurred, 0 is
* returned; otherwise 1.
*/
int ReadTensorsPerNode(const char* fileName, const char* description,
- int timeStep, vtkMultiBlockDataSet *output) VTK_OVERRIDE;
+ int timeStep, vtkMultiBlockDataSet *output) override;
/**
* Read scalars per element for this dataset. If an error occurred, 0 is
@@ -106,21 +106,21 @@ protected:
const char* description, int timeStep,
vtkMultiBlockDataSet *output,
int numberOfComponents = 1,
- int component = 0) VTK_OVERRIDE;
+ int component = 0) override;
/**
* Read vectors per element for this dataset. If an error occurred, 0 is
* returned; otherwise 1.
*/
int ReadVectorsPerElement(const char* fileName, const char* description,
- int timeStep, vtkMultiBlockDataSet *output) VTK_OVERRIDE;
+ int timeStep, vtkMultiBlockDataSet *output) override;
/**
* Read tensors per element for this dataset. If an error occurred, 0 is
* returned; otherwise 1.
*/
int ReadTensorsPerElement(const char* fileName, const char* description,
- int timeStep, vtkMultiBlockDataSet *output) VTK_OVERRIDE;
+ int timeStep, vtkMultiBlockDataSet *output) override;
/**
* Read an unstructured part (partId) from the geometry file and create a
@@ -129,7 +129,7 @@ protected:
int CreateUnstructuredGridOutput(int partId,
char line[256],
const char* name,
- vtkMultiBlockDataSet *output) VTK_OVERRIDE;
+ vtkMultiBlockDataSet *output) override;
/**
* Read a structured part from the geometry file and create a
@@ -138,7 +138,7 @@ protected:
int CreateStructuredGridOutput(int partId,
char line[256],
const char* name,
- vtkMultiBlockDataSet *output) VTK_OVERRIDE;
+ vtkMultiBlockDataSet *output) override;
/**
* Internal function to read in a line up to 80 characters.
diff --git a/IO/EnSight/vtkEnSight6Reader.h b/IO/EnSight/vtkEnSight6Reader.h
index f0be03105abc5caf923d96ecc04943f101784013..300cbb7f5f9492513ad0fdc9fbd5839fd27a95a1 100644
--- a/IO/EnSight/vtkEnSight6Reader.h
+++ b/IO/EnSight/vtkEnSight6Reader.h
@@ -50,24 +50,24 @@ class VTKIOENSIGHT_EXPORT vtkEnSight6Reader : public vtkEnSightReader
public:
static vtkEnSight6Reader *New();
vtkTypeMacro(vtkEnSight6Reader, vtkEnSightReader);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkEnSight6Reader();
- ~vtkEnSight6Reader() VTK_OVERRIDE;
+ ~vtkEnSight6Reader() override;
/**
* Read the geometry file. If an error occurred, 0 is returned; otherwise 1.
*/
int ReadGeometryFile(const char* fileName, int timeStep,
- vtkMultiBlockDataSet *output) VTK_OVERRIDE;
+ vtkMultiBlockDataSet *output) override;
/**
* Read the measured geometry file. If an error occurred, 0 is returned;
* otherwise 1.
*/
int ReadMeasuredGeometryFile(const char* fileName, int timeStep,
- vtkMultiBlockDataSet *output) VTK_OVERRIDE;
+ vtkMultiBlockDataSet *output) override;
/**
* Read scalars per node for this dataset. If an error occurred, 0 is
@@ -78,7 +78,7 @@ protected:
int timeStep, vtkMultiBlockDataSet *output,
int measured = 0,
int numberOfComponents = 1,
- int component = 0) VTK_OVERRIDE;
+ int component = 0) override;
/**
* Read vectors per node for this dataset. If an error occurred, 0 is
@@ -86,14 +86,14 @@ protected:
*/
int ReadVectorsPerNode(const char* fileName, const char* description,
int timeStep, vtkMultiBlockDataSet *output,
- int measured = 0) VTK_OVERRIDE;
+ int measured = 0) override;
/**
* Read tensors per node for this dataset. If an error occurred, 0 is
* returned; otherwise 1.
*/
int ReadTensorsPerNode(const char* fileName, const char* description,
- int timeStep, vtkMultiBlockDataSet *output) VTK_OVERRIDE;
+ int timeStep, vtkMultiBlockDataSet *output) override;
/**
* Read scalars per element for this dataset. If an error occurred, 0 is
@@ -103,21 +103,21 @@ protected:
int ReadScalarsPerElement(const char* fileName, const char* description,
int timeStep, vtkMultiBlockDataSet *output,
int numberOfComponents = 1,
- int component = 0) VTK_OVERRIDE;
+ int component = 0) override;
/**
* Read vectors per element for this dataset. If an error occurred, 0 is
* returned; otherwise 1.
*/
int ReadVectorsPerElement(const char* fileName, const char* description,
- int timeStep, vtkMultiBlockDataSet *output) VTK_OVERRIDE;
+ int timeStep, vtkMultiBlockDataSet *output) override;
/**
* Read tensors per element for this dataset. If an error occurred, 0 is
* returned; otherwise 1.
*/
int ReadTensorsPerElement(const char* fileName, const char* description,
- int timeStep, vtkMultiBlockDataSet *output) VTK_OVERRIDE;
+ int timeStep, vtkMultiBlockDataSet *output) override;
/**
* Read an unstructured part (partId) from the geometry file and create a
@@ -126,7 +126,7 @@ protected:
int CreateUnstructuredGridOutput(int partId,
char line[256],
const char* name,
- vtkMultiBlockDataSet *output) VTK_OVERRIDE;
+ vtkMultiBlockDataSet *output) override;
/**
* Read a structured part from the geometry file and create a
@@ -135,7 +135,7 @@ protected:
int CreateStructuredGridOutput(int partId,
char line[256],
const char* name,
- vtkMultiBlockDataSet *output) VTK_OVERRIDE;
+ vtkMultiBlockDataSet *output) override;
// global list of points for the unstructured parts of the model
int NumberOfUnstructuredPoints;
diff --git a/IO/EnSight/vtkEnSightGoldBinaryReader.h b/IO/EnSight/vtkEnSightGoldBinaryReader.h
index d0acd8ec7218b2e1aff72bc3d164302d2b6aa8a6..dd1c5f243cfe1db6bfca37cc79375dcc8a620c05 100644
--- a/IO/EnSight/vtkEnSightGoldBinaryReader.h
+++ b/IO/EnSight/vtkEnSightGoldBinaryReader.h
@@ -51,11 +51,11 @@ class VTKIOENSIGHT_EXPORT vtkEnSightGoldBinaryReader : public vtkEnSightReader
public:
static vtkEnSightGoldBinaryReader *New();
vtkTypeMacro(vtkEnSightGoldBinaryReader, vtkEnSightReader);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkEnSightGoldBinaryReader();
- ~vtkEnSightGoldBinaryReader() VTK_OVERRIDE;
+ ~vtkEnSightGoldBinaryReader() override;
// Returns 1 if successful. Sets file size as a side action.
int OpenFile(const char* filename);
@@ -69,14 +69,14 @@ protected:
* Read the geometry file. If an error occurred, 0 is returned; otherwise 1.
*/
int ReadGeometryFile(const char* fileName, int timeStep,
- vtkMultiBlockDataSet *output) VTK_OVERRIDE;
+ vtkMultiBlockDataSet *output) override;
/**
* Read the measured geometry file. If an error occurred, 0 is returned;
* otherwise 1.
*/
int ReadMeasuredGeometryFile(const char* fileName, int timeStep,
- vtkMultiBlockDataSet *output) VTK_OVERRIDE;
+ vtkMultiBlockDataSet *output) override;
/**
* Read scalars per node for this dataset. If an error occurred, 0 is
@@ -87,7 +87,7 @@ protected:
int timeStep, vtkMultiBlockDataSet *output,
int measured = 0,
int numberOfComponents = 1,
- int component = 0) VTK_OVERRIDE;
+ int component = 0) override;
/**
* Read vectors per node for this dataset. If an error occurred, 0 is
@@ -95,14 +95,14 @@ protected:
*/
int ReadVectorsPerNode(const char* fileName, const char* description,
int timeStep, vtkMultiBlockDataSet *output,
- int measured = 0) VTK_OVERRIDE;
+ int measured = 0) override;
/**
* Read tensors per node for this dataset. If an error occurred, 0 is
* returned; otherwise 1.
*/
int ReadTensorsPerNode(const char* fileName, const char* description,
- int timeStep, vtkMultiBlockDataSet *output) VTK_OVERRIDE;
+ int timeStep, vtkMultiBlockDataSet *output) override;
/**
* Read scalars per element for this dataset. If an error occurred, 0 is
@@ -112,21 +112,21 @@ protected:
int ReadScalarsPerElement(const char* fileName, const char* description,
int timeStep, vtkMultiBlockDataSet *output,
int numberOfComponents = 1,
- int component = 0) VTK_OVERRIDE;
+ int component = 0) override;
/**
* Read vectors per element for this dataset. If an error occurred, 0 is
* returned; otherwise 1.
*/
int ReadVectorsPerElement(const char* fileName, const char* description,
- int timeStep, vtkMultiBlockDataSet *output) VTK_OVERRIDE;
+ int timeStep, vtkMultiBlockDataSet *output) override;
/**
* Read tensors per element for this dataset. If an error occurred, 0 is
* returned; otherwise 1.
*/
int ReadTensorsPerElement(const char* fileName, const char* description,
- int timeStep, vtkMultiBlockDataSet *output) VTK_OVERRIDE;
+ int timeStep, vtkMultiBlockDataSet *output) override;
/**
* Read an unstructured part (partId) from the geometry file and create a
@@ -136,7 +136,7 @@ protected:
int CreateUnstructuredGridOutput(int partId,
char line[80],
const char* name,
- vtkMultiBlockDataSet *output) VTK_OVERRIDE;
+ vtkMultiBlockDataSet *output) override;
/**
* Read a structured part from the geometry file and create a
@@ -145,7 +145,7 @@ protected:
int CreateStructuredGridOutput(int partId,
char line[256],
const char* name,
- vtkMultiBlockDataSet *output) VTK_OVERRIDE;
+ vtkMultiBlockDataSet *output) override;
/**
* Read a structured part from the geometry file and create a
diff --git a/IO/EnSight/vtkEnSightGoldReader.h b/IO/EnSight/vtkEnSightGoldReader.h
index 765c8796a9de9d12725baf06a80aebdf429eeb43..5d735e8bd89067bda6a7a69240d73ad1b7daa3d5 100644
--- a/IO/EnSight/vtkEnSightGoldReader.h
+++ b/IO/EnSight/vtkEnSightGoldReader.h
@@ -51,24 +51,24 @@ class VTKIOENSIGHT_EXPORT vtkEnSightGoldReader : public vtkEnSightReader
public:
static vtkEnSightGoldReader *New();
vtkTypeMacro(vtkEnSightGoldReader, vtkEnSightReader);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkEnSightGoldReader();
- ~vtkEnSightGoldReader() VTK_OVERRIDE;
+ ~vtkEnSightGoldReader() override;
/**
* Read the geometry file. If an error occurred, 0 is returned; otherwise 1.
*/
int ReadGeometryFile(const char* fileName, int timeStep,
- vtkMultiBlockDataSet *output) VTK_OVERRIDE;
+ vtkMultiBlockDataSet *output) override;
/**
* Read the measured geometry file. If an error occurred, 0 is returned;
* otherwise 1.
*/
int ReadMeasuredGeometryFile(const char* fileName, int timeStep,
- vtkMultiBlockDataSet *output) VTK_OVERRIDE;
+ vtkMultiBlockDataSet *output) override;
/**
* Read scalars per node for this dataset. If an error occurred, 0 is
@@ -79,7 +79,7 @@ protected:
int timeStep, vtkMultiBlockDataSet *output,
int measured = 0,
int numberOfComponents = 1,
- int component = 0) VTK_OVERRIDE;
+ int component = 0) override;
/**
* Read vectors per node for this dataset. If an error occurred, 0 is
@@ -87,14 +87,14 @@ protected:
*/
int ReadVectorsPerNode(const char* fileName, const char* description,
int timeStep, vtkMultiBlockDataSet *output,
- int measured = 0) VTK_OVERRIDE;
+ int measured = 0) override;
/**
* Read tensors per node for this dataset. If an error occurred, 0 is
* returned; otherwise 1.
*/
int ReadTensorsPerNode(const char* fileName, const char* description,
- int timeStep, vtkMultiBlockDataSet *output) VTK_OVERRIDE;
+ int timeStep, vtkMultiBlockDataSet *output) override;
/**
* Read scalars per element for this dataset. If an error occurred, 0 is
@@ -104,21 +104,21 @@ protected:
int ReadScalarsPerElement(const char* fileName, const char* description,
int timeStep, vtkMultiBlockDataSet *output,
int numberOfComponents = 1,
- int component = 0) VTK_OVERRIDE;
+ int component = 0) override;
/**
* Read vectors per element for this dataset. If an error occurred, 0 is
* returned; otherwise 1.
*/
int ReadVectorsPerElement(const char* fileName, const char* description,
- int timeStep, vtkMultiBlockDataSet *output) VTK_OVERRIDE;
+ int timeStep, vtkMultiBlockDataSet *output) override;
/**
* Read tensors per element for this dataset. If an error occurred, 0 is
* returned; otherwise 1.
*/
int ReadTensorsPerElement(const char* fileName, const char* description,
- int timeStep, vtkMultiBlockDataSet *output) VTK_OVERRIDE;
+ int timeStep, vtkMultiBlockDataSet *output) override;
/**
* Read an unstructured part (partId) from the geometry file and create a
@@ -128,7 +128,7 @@ protected:
int CreateUnstructuredGridOutput(int partId,
char line[256],
const char* name,
- vtkMultiBlockDataSet *output) VTK_OVERRIDE;
+ vtkMultiBlockDataSet *output) override;
/**
* Read a structured part from the geometry file and create a
@@ -137,7 +137,7 @@ protected:
int CreateStructuredGridOutput(int partId,
char line[256],
const char* name,
- vtkMultiBlockDataSet *output) VTK_OVERRIDE;
+ vtkMultiBlockDataSet *output) override;
/**
* Read a structured part from the geometry file and create a
diff --git a/IO/EnSight/vtkEnSightMasterServerReader.h b/IO/EnSight/vtkEnSightMasterServerReader.h
index 232fcab6698e91852837392797b9baf86452d24c..e78715982a6a9858e2b7ed9c8fcc94ec4830b8ae 100644
--- a/IO/EnSight/vtkEnSightMasterServerReader.h
+++ b/IO/EnSight/vtkEnSightMasterServerReader.h
@@ -29,7 +29,7 @@ class VTKIOENSIGHT_EXPORT vtkEnSightMasterServerReader : public vtkGenericEnSigh
{
public:
vtkTypeMacro(vtkEnSightMasterServerReader, vtkGenericEnSightReader);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkEnSightMasterServerReader* New();
@@ -57,12 +57,12 @@ public:
protected:
vtkEnSightMasterServerReader();
- ~vtkEnSightMasterServerReader() VTK_OVERRIDE;
+ ~vtkEnSightMasterServerReader() override;
int RequestData(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
int RequestInformation(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
vtkSetStringMacro(PieceCaseFileName);
char* PieceCaseFileName;
diff --git a/IO/EnSight/vtkEnSightReader.h b/IO/EnSight/vtkEnSightReader.h
index c55685540fca532fdb329bf0ddade91300628a9e..e5e91bb1219809c04fc47083f8997b4d511cdaa6 100644
--- a/IO/EnSight/vtkEnSightReader.h
+++ b/IO/EnSight/vtkEnSightReader.h
@@ -34,7 +34,7 @@ class VTKIOENSIGHT_EXPORT vtkEnSightReader : public vtkGenericEnSightReader
{
public:
vtkTypeMacro(vtkEnSightReader, vtkGenericEnSightReader);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
enum ElementTypesList
{
@@ -99,16 +99,16 @@ public:
protected:
vtkEnSightReader();
- ~vtkEnSightReader() VTK_OVERRIDE;
+ ~vtkEnSightReader() override;
int RequestInformation(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
int RequestData(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
- void ClearForNewCaseFileName() VTK_OVERRIDE;
+ void ClearForNewCaseFileName() override;
//@{
/**
diff --git a/IO/EnSight/vtkGenericEnSightReader.h b/IO/EnSight/vtkGenericEnSightReader.h
index bffa747c78ea503a2c694225c7f028a07dd038a1..eb5a5a6f0484a52ea5665c24dd89b629da393cf8 100644
--- a/IO/EnSight/vtkGenericEnSightReader.h
+++ b/IO/EnSight/vtkGenericEnSightReader.h
@@ -50,7 +50,7 @@ class VTKIOENSIGHT_EXPORT vtkGenericEnSightReader : public vtkMultiBlockDataSetA
public:
static vtkGenericEnSightReader *New();
vtkTypeMacro(vtkGenericEnSightReader, vtkMultiBlockDataSetAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -277,15 +277,15 @@ vtkGenericEnSightReader* GetReader() { return this->Reader; }
protected:
vtkGenericEnSightReader();
- ~vtkGenericEnSightReader() VTK_OVERRIDE;
+ ~vtkGenericEnSightReader() override;
- int FillOutputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillOutputPortInformation(int port, vtkInformation* info) override;
int RequestInformation(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
int RequestData(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
/**
* Clear data structures such that setting a new case file name works.
diff --git a/IO/Exodus/vtkCPExodusIIElementBlock.h b/IO/Exodus/vtkCPExodusIIElementBlock.h
index 1d5ff5b1a168d172d25af2d3058b47dcc4eda469..04454c202210c646a4cf2224e4400e86af847920 100644
--- a/IO/Exodus/vtkCPExodusIIElementBlock.h
+++ b/IO/Exodus/vtkCPExodusIIElementBlock.h
@@ -40,7 +40,7 @@ class VTKIOEXODUS_EXPORT vtkCPExodusIIElementBlockImpl : public vtkObject
{
public:
static vtkCPExodusIIElementBlockImpl *New();
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
vtkTypeMacro(vtkCPExodusIIElementBlockImpl, vtkObject)
/**
@@ -73,7 +73,7 @@ public:
protected:
vtkCPExodusIIElementBlockImpl();
- ~vtkCPExodusIIElementBlockImpl() VTK_OVERRIDE;
+ ~vtkCPExodusIIElementBlockImpl() override;
private:
vtkCPExodusIIElementBlockImpl(const vtkCPExodusIIElementBlockImpl &) VTK_DELETE_FUNCTION;
diff --git a/IO/Exodus/vtkCPExodusIIInSituReader.h b/IO/Exodus/vtkCPExodusIIInSituReader.h
index 4f560dad63b0664a84ab523a9888b54a3a8ef623..2dc0409aa942bcd3024601c44d35761f02ce2690 100644
--- a/IO/Exodus/vtkCPExodusIIInSituReader.h
+++ b/IO/Exodus/vtkCPExodusIIInSituReader.h
@@ -44,7 +44,7 @@ class VTKIOEXODUS_EXPORT vtkCPExodusIIInSituReader :
public:
static vtkCPExodusIIInSituReader *New();
vtkTypeMacro(vtkCPExodusIIInSituReader, vtkMultiBlockDataSetAlgorithm)
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
//@{
/**
@@ -80,15 +80,15 @@ public:
protected:
vtkCPExodusIIInSituReader();
- ~vtkCPExodusIIInSituReader() VTK_OVERRIDE;
+ ~vtkCPExodusIIInSituReader() override;
int ProcessRequest(vtkInformation *request,
vtkInformationVector **inputVector,
- vtkInformationVector *outputVector) VTK_OVERRIDE;
+ vtkInformationVector *outputVector) override;
int RequestData(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
int RequestInformation(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
private:
vtkCPExodusIIInSituReader(const vtkCPExodusIIInSituReader &) VTK_DELETE_FUNCTION;
diff --git a/IO/Exodus/vtkCPExodusIINodalCoordinatesTemplate.h b/IO/Exodus/vtkCPExodusIINodalCoordinatesTemplate.h
index 636f307de311dcbc335dbc4254886d8a8f9bd149..c7b2399221e1ed801276af630c2d179e4c16185b 100644
--- a/IO/Exodus/vtkCPExodusIINodalCoordinatesTemplate.h
+++ b/IO/Exodus/vtkCPExodusIINodalCoordinatesTemplate.h
@@ -41,7 +41,7 @@ public:
vtkMappedDataArrayNewInstanceMacro(
vtkCPExodusIINodalCoordinatesTemplate<Scalar>)
static vtkCPExodusIINodalCoordinatesTemplate *New();
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
typedef typename Superclass::ValueType ValueType;
@@ -53,66 +53,66 @@ public:
vtkIdType numPoints);
// Reimplemented virtuals -- see superclasses for descriptions:
- void Initialize() VTK_OVERRIDE;
- void GetTuples(vtkIdList *ptIds, vtkAbstractArray *output) VTK_OVERRIDE;
- void GetTuples(vtkIdType p1, vtkIdType p2, vtkAbstractArray *output) VTK_OVERRIDE;
- void Squeeze() VTK_OVERRIDE;
- VTK_NEWINSTANCE vtkArrayIterator *NewIterator() VTK_OVERRIDE;
- vtkIdType LookupValue(vtkVariant value) VTK_OVERRIDE;
- void LookupValue(vtkVariant value, vtkIdList *ids) VTK_OVERRIDE;
- vtkVariant GetVariantValue(vtkIdType idx) VTK_OVERRIDE;
- void ClearLookup() VTK_OVERRIDE;
- double* GetTuple(vtkIdType i) VTK_OVERRIDE;
- void GetTuple(vtkIdType i, double *tuple) VTK_OVERRIDE;
- vtkIdType LookupTypedValue(Scalar value) VTK_OVERRIDE;
- void LookupTypedValue(Scalar value, vtkIdList *ids) VTK_OVERRIDE;
- ValueType GetValue(vtkIdType idx) const VTK_OVERRIDE;
- ValueType& GetValueReference(vtkIdType idx) VTK_OVERRIDE;
- void GetTypedTuple(vtkIdType idx, Scalar *t) const VTK_OVERRIDE;
+ void Initialize() override;
+ void GetTuples(vtkIdList *ptIds, vtkAbstractArray *output) override;
+ void GetTuples(vtkIdType p1, vtkIdType p2, vtkAbstractArray *output) override;
+ void Squeeze() override;
+ VTK_NEWINSTANCE vtkArrayIterator *NewIterator() override;
+ vtkIdType LookupValue(vtkVariant value) override;
+ void LookupValue(vtkVariant value, vtkIdList *ids) override;
+ vtkVariant GetVariantValue(vtkIdType idx) override;
+ void ClearLookup() override;
+ double* GetTuple(vtkIdType i) override;
+ void GetTuple(vtkIdType i, double *tuple) override;
+ vtkIdType LookupTypedValue(Scalar value) override;
+ void LookupTypedValue(Scalar value, vtkIdList *ids) override;
+ ValueType GetValue(vtkIdType idx) const override;
+ ValueType& GetValueReference(vtkIdType idx) override;
+ void GetTypedTuple(vtkIdType idx, Scalar *t) const override;
//@{
/**
* This container is read only -- this method does nothing but print a
* warning.
*/
- int Allocate(vtkIdType sz, vtkIdType ext) VTK_OVERRIDE;
- int Resize(vtkIdType numTuples) VTK_OVERRIDE;
- void SetNumberOfTuples(vtkIdType number) VTK_OVERRIDE;
- void SetTuple(vtkIdType i, vtkIdType j, vtkAbstractArray *source) VTK_OVERRIDE;
- void SetTuple(vtkIdType i, const float *source) VTK_OVERRIDE;
- void SetTuple(vtkIdType i, const double *source) VTK_OVERRIDE;
- void InsertTuple(vtkIdType i, vtkIdType j, vtkAbstractArray *source) VTK_OVERRIDE;
- void InsertTuple(vtkIdType i, const float *source) VTK_OVERRIDE;
- void InsertTuple(vtkIdType i, const double *source) VTK_OVERRIDE;
+ int Allocate(vtkIdType sz, vtkIdType ext) override;
+ int Resize(vtkIdType numTuples) override;
+ void SetNumberOfTuples(vtkIdType number) override;
+ void SetTuple(vtkIdType i, vtkIdType j, vtkAbstractArray *source) override;
+ void SetTuple(vtkIdType i, const float *source) override;
+ void SetTuple(vtkIdType i, const double *source) override;
+ void InsertTuple(vtkIdType i, vtkIdType j, vtkAbstractArray *source) override;
+ void InsertTuple(vtkIdType i, const float *source) override;
+ void InsertTuple(vtkIdType i, const double *source) override;
void InsertTuples(vtkIdList *dstIds, vtkIdList *srcIds,
- vtkAbstractArray *source) VTK_OVERRIDE;
+ vtkAbstractArray *source) override;
void InsertTuples(vtkIdType dstStart, vtkIdType n, vtkIdType srcStart,
- vtkAbstractArray* source) VTK_OVERRIDE;
- vtkIdType InsertNextTuple(vtkIdType j, vtkAbstractArray *source) VTK_OVERRIDE;
- vtkIdType InsertNextTuple(const float *source) VTK_OVERRIDE;
- vtkIdType InsertNextTuple(const double *source) VTK_OVERRIDE;
- void DeepCopy(vtkAbstractArray *aa) VTK_OVERRIDE;
- void DeepCopy(vtkDataArray *da) VTK_OVERRIDE;
+ vtkAbstractArray* source) override;
+ vtkIdType InsertNextTuple(vtkIdType j, vtkAbstractArray *source) override;
+ vtkIdType InsertNextTuple(const float *source) override;
+ vtkIdType InsertNextTuple(const double *source) override;
+ void DeepCopy(vtkAbstractArray *aa) override;
+ void DeepCopy(vtkDataArray *da) override;
void InterpolateTuple(vtkIdType i, vtkIdList *ptIndices,
- vtkAbstractArray* source, double* weights) VTK_OVERRIDE;
+ vtkAbstractArray* source, double* weights) override;
void InterpolateTuple(vtkIdType i, vtkIdType id1, vtkAbstractArray *source1,
- vtkIdType id2, vtkAbstractArray *source2, double t) VTK_OVERRIDE;
- void SetVariantValue(vtkIdType idx, vtkVariant value) VTK_OVERRIDE;
- void InsertVariantValue(vtkIdType idx, vtkVariant value) VTK_OVERRIDE;
- void RemoveTuple(vtkIdType id) VTK_OVERRIDE;
- void RemoveFirstTuple() VTK_OVERRIDE;
- void RemoveLastTuple() VTK_OVERRIDE;
- void SetTypedTuple(vtkIdType i, const Scalar *t) VTK_OVERRIDE;
- void InsertTypedTuple(vtkIdType i, const Scalar *t) VTK_OVERRIDE;
- vtkIdType InsertNextTypedTuple(const Scalar *t) VTK_OVERRIDE;
- void SetValue(vtkIdType idx, Scalar value) VTK_OVERRIDE;
- vtkIdType InsertNextValue(Scalar v) VTK_OVERRIDE;
- void InsertValue(vtkIdType idx, Scalar v) VTK_OVERRIDE;
+ vtkIdType id2, vtkAbstractArray *source2, double t) override;
+ void SetVariantValue(vtkIdType idx, vtkVariant value) override;
+ void InsertVariantValue(vtkIdType idx, vtkVariant value) override;
+ void RemoveTuple(vtkIdType id) override;
+ void RemoveFirstTuple() override;
+ void RemoveLastTuple() override;
+ void SetTypedTuple(vtkIdType i, const Scalar *t) override;
+ void InsertTypedTuple(vtkIdType i, const Scalar *t) override;
+ vtkIdType InsertNextTypedTuple(const Scalar *t) override;
+ void SetValue(vtkIdType idx, Scalar value) override;
+ vtkIdType InsertNextValue(Scalar v) override;
+ void InsertValue(vtkIdType idx, Scalar v) override;
//@}
protected:
vtkCPExodusIINodalCoordinatesTemplate();
- ~vtkCPExodusIINodalCoordinatesTemplate() VTK_OVERRIDE;
+ ~vtkCPExodusIINodalCoordinatesTemplate() override;
Scalar *XArray;
Scalar *YArray;
diff --git a/IO/Exodus/vtkCPExodusIIResultsArrayTemplate.h b/IO/Exodus/vtkCPExodusIIResultsArrayTemplate.h
index 17bdd0e942dde1e624b45a2967e99467773c7aaa..fe679b61658bcdec998192d4621289439de469da 100644
--- a/IO/Exodus/vtkCPExodusIIResultsArrayTemplate.h
+++ b/IO/Exodus/vtkCPExodusIIResultsArrayTemplate.h
@@ -39,7 +39,7 @@ public:
vtkMappedDataArray<Scalar>)
vtkMappedDataArrayNewInstanceMacro(vtkCPExodusIIResultsArrayTemplate<Scalar>)
static vtkCPExodusIIResultsArrayTemplate *New();
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
typedef typename Superclass::ValueType ValueType;
@@ -55,66 +55,66 @@ public:
//@}
// Reimplemented virtuals -- see superclasses for descriptions:
- void Initialize() VTK_OVERRIDE;
- void GetTuples(vtkIdList *ptIds, vtkAbstractArray *output) VTK_OVERRIDE;
- void GetTuples(vtkIdType p1, vtkIdType p2, vtkAbstractArray *output) VTK_OVERRIDE;
- void Squeeze() VTK_OVERRIDE;
- VTK_NEWINSTANCE vtkArrayIterator *NewIterator() VTK_OVERRIDE;
- vtkIdType LookupValue(vtkVariant value) VTK_OVERRIDE;
- void LookupValue(vtkVariant value, vtkIdList *ids) VTK_OVERRIDE;
- vtkVariant GetVariantValue(vtkIdType idx) VTK_OVERRIDE;
- void ClearLookup() VTK_OVERRIDE;
- double* GetTuple(vtkIdType i) VTK_OVERRIDE;
- void GetTuple(vtkIdType i, double *tuple) VTK_OVERRIDE;
- vtkIdType LookupTypedValue(Scalar value) VTK_OVERRIDE;
- void LookupTypedValue(Scalar value, vtkIdList *ids) VTK_OVERRIDE;
- ValueType GetValue(vtkIdType idx) const VTK_OVERRIDE;
- ValueType& GetValueReference(vtkIdType idx) VTK_OVERRIDE;
- void GetTypedTuple(vtkIdType idx, Scalar *t) const VTK_OVERRIDE;
+ void Initialize() override;
+ void GetTuples(vtkIdList *ptIds, vtkAbstractArray *output) override;
+ void GetTuples(vtkIdType p1, vtkIdType p2, vtkAbstractArray *output) override;
+ void Squeeze() override;
+ VTK_NEWINSTANCE vtkArrayIterator *NewIterator() override;
+ vtkIdType LookupValue(vtkVariant value) override;
+ void LookupValue(vtkVariant value, vtkIdList *ids) override;
+ vtkVariant GetVariantValue(vtkIdType idx) override;
+ void ClearLookup() override;
+ double* GetTuple(vtkIdType i) override;
+ void GetTuple(vtkIdType i, double *tuple) override;
+ vtkIdType LookupTypedValue(Scalar value) override;
+ void LookupTypedValue(Scalar value, vtkIdList *ids) override;
+ ValueType GetValue(vtkIdType idx) const override;
+ ValueType& GetValueReference(vtkIdType idx) override;
+ void GetTypedTuple(vtkIdType idx, Scalar *t) const override;
//@{
/**
* This container is read only -- this method does nothing but print a
* warning.
*/
- int Allocate(vtkIdType sz, vtkIdType ext) VTK_OVERRIDE;
- int Resize(vtkIdType numTuples) VTK_OVERRIDE;
- void SetNumberOfTuples(vtkIdType number) VTK_OVERRIDE;
- void SetTuple(vtkIdType i, vtkIdType j, vtkAbstractArray *source) VTK_OVERRIDE;
- void SetTuple(vtkIdType i, const float *source) VTK_OVERRIDE;
- void SetTuple(vtkIdType i, const double *source) VTK_OVERRIDE;
- void InsertTuple(vtkIdType i, vtkIdType j, vtkAbstractArray *source) VTK_OVERRIDE;
- void InsertTuple(vtkIdType i, const float *source) VTK_OVERRIDE;
- void InsertTuple(vtkIdType i, const double *source) VTK_OVERRIDE;
+ int Allocate(vtkIdType sz, vtkIdType ext) override;
+ int Resize(vtkIdType numTuples) override;
+ void SetNumberOfTuples(vtkIdType number) override;
+ void SetTuple(vtkIdType i, vtkIdType j, vtkAbstractArray *source) override;
+ void SetTuple(vtkIdType i, const float *source) override;
+ void SetTuple(vtkIdType i, const double *source) override;
+ void InsertTuple(vtkIdType i, vtkIdType j, vtkAbstractArray *source) override;
+ void InsertTuple(vtkIdType i, const float *source) override;
+ void InsertTuple(vtkIdType i, const double *source) override;
void InsertTuples(vtkIdList *dstIds, vtkIdList *srcIds,
- vtkAbstractArray *source) VTK_OVERRIDE;
+ vtkAbstractArray *source) override;
void InsertTuples(vtkIdType dstStart, vtkIdType n, vtkIdType srcStart,
- vtkAbstractArray* source) VTK_OVERRIDE;
- vtkIdType InsertNextTuple(vtkIdType j, vtkAbstractArray *source) VTK_OVERRIDE;
- vtkIdType InsertNextTuple(const float *source) VTK_OVERRIDE;
- vtkIdType InsertNextTuple(const double *source) VTK_OVERRIDE;
- void DeepCopy(vtkAbstractArray *aa) VTK_OVERRIDE;
- void DeepCopy(vtkDataArray *da) VTK_OVERRIDE;
+ vtkAbstractArray* source) override;
+ vtkIdType InsertNextTuple(vtkIdType j, vtkAbstractArray *source) override;
+ vtkIdType InsertNextTuple(const float *source) override;
+ vtkIdType InsertNextTuple(const double *source) override;
+ void DeepCopy(vtkAbstractArray *aa) override;
+ void DeepCopy(vtkDataArray *da) override;
void InterpolateTuple(vtkIdType i, vtkIdList *ptIndices,
- vtkAbstractArray* source, double* weights) VTK_OVERRIDE;
+ vtkAbstractArray* source, double* weights) override;
void InterpolateTuple(vtkIdType i, vtkIdType id1, vtkAbstractArray *source1,
- vtkIdType id2, vtkAbstractArray *source2, double t) VTK_OVERRIDE;
- void SetVariantValue(vtkIdType idx, vtkVariant value) VTK_OVERRIDE;
- void InsertVariantValue(vtkIdType idx, vtkVariant value) VTK_OVERRIDE;
- void RemoveTuple(vtkIdType id) VTK_OVERRIDE;
- void RemoveFirstTuple() VTK_OVERRIDE;
- void RemoveLastTuple() VTK_OVERRIDE;
- void SetTypedTuple(vtkIdType i, const Scalar *t) VTK_OVERRIDE;
- void InsertTypedTuple(vtkIdType i, const Scalar *t) VTK_OVERRIDE;
- vtkIdType InsertNextTypedTuple(const Scalar *t) VTK_OVERRIDE;
- void SetValue(vtkIdType idx, Scalar value) VTK_OVERRIDE;
- vtkIdType InsertNextValue(Scalar v) VTK_OVERRIDE;
- void InsertValue(vtkIdType idx, Scalar v) VTK_OVERRIDE;
+ vtkIdType id2, vtkAbstractArray *source2, double t) override;
+ void SetVariantValue(vtkIdType idx, vtkVariant value) override;
+ void InsertVariantValue(vtkIdType idx, vtkVariant value) override;
+ void RemoveTuple(vtkIdType id) override;
+ void RemoveFirstTuple() override;
+ void RemoveLastTuple() override;
+ void SetTypedTuple(vtkIdType i, const Scalar *t) override;
+ void InsertTypedTuple(vtkIdType i, const Scalar *t) override;
+ vtkIdType InsertNextTypedTuple(const Scalar *t) override;
+ void SetValue(vtkIdType idx, Scalar value) override;
+ vtkIdType InsertNextValue(Scalar v) override;
+ void InsertValue(vtkIdType idx, Scalar v) override;
//@}
protected:
vtkCPExodusIIResultsArrayTemplate();
- ~vtkCPExodusIIResultsArrayTemplate() VTK_OVERRIDE;
+ ~vtkCPExodusIIResultsArrayTemplate() override;
std::vector<Scalar *> Arrays;
diff --git a/IO/Exodus/vtkExodusIICache.h b/IO/Exodus/vtkExodusIICache.h
index b4f7fc5ac1b4d9a22986f91fdf58544467ee329c..383031fdeea4ea1cf1c1a7e83bfcf6f955da735c 100644
--- a/IO/Exodus/vtkExodusIICache.h
+++ b/IO/Exodus/vtkExodusIICache.h
@@ -129,7 +129,7 @@ class VTKIOEXODUS_EXPORT vtkExodusIICache : public vtkObject
public:
static vtkExodusIICache* New();
vtkTypeMacro(vtkExodusIICache,vtkObject);
- void PrintSelf( ostream& os, vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf( ostream& os, vtkIndent indent ) override;
/// Empty the cache
void Clear();
@@ -179,7 +179,7 @@ protected:
vtkExodusIICache();
/// Destructor.
- ~vtkExodusIICache() VTK_OVERRIDE;
+ ~vtkExodusIICache() override;
/// Avoid (some) FP problems
diff --git a/IO/Exodus/vtkExodusIIReader.h b/IO/Exodus/vtkExodusIIReader.h
index 9d31ac65420e979a6dbe196ac9e2b0fec043b823..0bd867a97c8a44e6d424a35e1813388830a7be30 100644
--- a/IO/Exodus/vtkExodusIIReader.h
+++ b/IO/Exodus/vtkExodusIIReader.h
@@ -55,7 +55,7 @@ class VTKIOEXODUS_EXPORT vtkExodusIIReader : public vtkMultiBlockDataSetAlgorith
public:
static vtkExodusIIReader *New();
vtkTypeMacro(vtkExodusIIReader,vtkMultiBlockDataSetAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Determine if the file can be readed with this reader.
@@ -67,7 +67,7 @@ public:
/**
* Return the object's MTime. This is overridden to include the timestamp of its internal class.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
/**
* Return the MTime of the internal data structure.
@@ -779,7 +779,7 @@ public:
protected:
vtkExodusIIReader();
- ~vtkExodusIIReader() VTK_OVERRIDE;
+ ~vtkExodusIIReader() override;
// helper for finding IDs
static int GetIDHelper ( const char *arrayName, vtkDataSet *data, int localID, int searchType );
@@ -808,9 +808,9 @@ protected:
*/
void AdvertiseTimeSteps( vtkInformation* outputInfo );
- int ProcessRequest( vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int RequestInformation( vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int RequestData( vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int ProcessRequest( vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int RequestInformation( vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int RequestData( vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
//int RequestDataOverTime( vtkInformation *, vtkInformationVector **, vtkInformationVector *);
// Parameters for controlling what is read in.
diff --git a/IO/Exodus/vtkExodusIIReaderParser.h b/IO/Exodus/vtkExodusIIReaderParser.h
index 07c0881344367812f69df13ea2e72dca6728d4cf..e13efb79aedae94c88422b1474b12e027005dd33 100644
--- a/IO/Exodus/vtkExodusIIReaderParser.h
+++ b/IO/Exodus/vtkExodusIIReaderParser.h
@@ -42,7 +42,7 @@ class VTKIOEXODUS_EXPORT vtkExodusIIReaderParser : public vtkXMLParser
public:
static vtkExodusIIReaderParser* New();
vtkTypeMacro(vtkExodusIIReaderParser, vtkXMLParser);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -89,10 +89,10 @@ public:
protected:
vtkExodusIIReaderParser();
- ~vtkExodusIIReaderParser() VTK_OVERRIDE;
+ ~vtkExodusIIReaderParser() override;
- void StartElement( const char* tagName, const char** attrs) VTK_OVERRIDE;
- void EndElement(const char* tagName) VTK_OVERRIDE;
+ void StartElement( const char* tagName, const char** attrs) override;
+ void EndElement(const char* tagName) override;
void FinishedParsing();
const char* GetValue(const char* attr,const char** attrs)
diff --git a/IO/Exodus/vtkExodusIIReaderPrivate.h b/IO/Exodus/vtkExodusIIReaderPrivate.h
index 7af2bf7a92a4be20377277017fb7479d025c686a..1b2cdbea011387f3853f20ba8de26f82e0ac043c 100644
--- a/IO/Exodus/vtkExodusIIReaderPrivate.h
+++ b/IO/Exodus/vtkExodusIIReaderPrivate.h
@@ -492,7 +492,7 @@ public:
protected:
vtkExodusIIReaderPrivate();
- ~vtkExodusIIReaderPrivate() VTK_OVERRIDE;
+ ~vtkExodusIIReaderPrivate() override;
/// Build SIL. This must be called only after RequestInformation().
void BuildSIL();
diff --git a/IO/Exodus/vtkExodusIIReaderVariableCheck.h b/IO/Exodus/vtkExodusIIReaderVariableCheck.h
index 176e0c5e6ad7eb105fec1ca327059da1be08e434..c1f7b6eee13bdb0df4a3dda6b7d53dc85df156c7 100644
--- a/IO/Exodus/vtkExodusIIReaderVariableCheck.h
+++ b/IO/Exodus/vtkExodusIIReaderVariableCheck.h
@@ -52,8 +52,8 @@ class vtkExodusIIReaderScalarCheck : public vtkExodusIIReaderVariableCheck
{
public:
vtkExodusIIReaderScalarCheck();
- bool StartInternal( std::string name, const int*, int ) VTK_OVERRIDE;
- bool Add( std::string, const int* ) VTK_OVERRIDE;
+ bool StartInternal( std::string name, const int*, int ) override;
+ bool Add( std::string, const int* ) override;
};
/// This looks for n-D vectors whose names are identical except for a single final character.
@@ -61,9 +61,9 @@ class vtkExodusIIReaderVectorCheck : public vtkExodusIIReaderVariableCheck
{
public:
vtkExodusIIReaderVectorCheck( const char* seq, int n );
- bool StartInternal( std::string name, const int*, int ) VTK_OVERRIDE;
- bool Add( std::string name, const int* truth ) VTK_OVERRIDE;
- std::vector<std::string>::size_type Length() VTK_OVERRIDE;
+ bool StartInternal( std::string name, const int*, int ) override;
+ bool Add( std::string name, const int* truth ) override;
+ std::vector<std::string>::size_type Length() override;
protected:
std::string Endings;
bool StillAdding;
@@ -79,9 +79,9 @@ class vtkExodusIIReaderTensorCheck : public vtkExodusIIReaderVariableCheck
{
public:
vtkExodusIIReaderTensorCheck( const char* seq, int n, int rank, int dim );
- bool StartInternal( std::string name, const int*, int ) VTK_OVERRIDE;
- bool Add( std::string name, const int* truth ) VTK_OVERRIDE;
- std::vector<std::string>::size_type Length() VTK_OVERRIDE;
+ bool StartInternal( std::string name, const int*, int ) override;
+ bool Add( std::string name, const int* truth ) override;
+ std::vector<std::string>::size_type Length() override;
protected:
std::string Endings;
vtkTypeUInt64 NumEndings;
@@ -95,9 +95,9 @@ class vtkExodusIIReaderIntPointCheck : public vtkExodusIIReaderVariableCheck
{
public:
vtkExodusIIReaderIntPointCheck();
- bool StartInternal( std::string name, const int*, int ) VTK_OVERRIDE;
- bool Add( std::string name, const int* ) VTK_OVERRIDE;
- std::vector<std::string>::size_type Length() VTK_OVERRIDE;
+ bool StartInternal( std::string name, const int*, int ) override;
+ bool Add( std::string name, const int* ) override;
+ std::vector<std::string>::size_type Length() override;
/*
virtual int Accept(
std::vector<vtkExodusIIReaderPrivate::ArrayInfoType>& arr, int startIndex, vtkExodusIIReaderPrivate* priv, int objtyp )
diff --git a/IO/Exodus/vtkExodusIIWriter.h b/IO/Exodus/vtkExodusIIWriter.h
index e887f9559b9099f6244597ba570f716751c35daa..db1abb709c05e62632f83e4ca6856c52988609af 100644
--- a/IO/Exodus/vtkExodusIIWriter.h
+++ b/IO/Exodus/vtkExodusIIWriter.h
@@ -86,7 +86,7 @@ class VTKIOEXODUS_EXPORT vtkExodusIIWriter : public vtkWriter
public:
static vtkExodusIIWriter *New ();
vtkTypeMacro(vtkExodusIIWriter,vtkWriter);
- void PrintSelf (ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf (ostream& os, vtkIndent indent) override;
/**
* Specify the vtkModelMetadata object which contains the Exodus file
@@ -182,7 +182,7 @@ public:
protected:
vtkExodusIIWriter ();
- ~vtkExodusIIWriter () VTK_OVERRIDE;
+ ~vtkExodusIIWriter () override;
vtkModelMetadata* ModelMetadata;
@@ -285,7 +285,7 @@ protected:
int ProcessRequest (vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
int RequestInformation (vtkInformation* request,
vtkInformationVector** inputVector,
@@ -295,13 +295,13 @@ protected:
vtkInformationVector** inputVector,
vtkInformationVector* outputVector);
- int FillInputPortInformation (int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillInputPortInformation (int port, vtkInformation* info) override;
int RequestData (vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
- void WriteData () VTK_OVERRIDE;
+ void WriteData () override;
int FlattenHierarchy (vtkDataObject* input, const char *name, bool& changed);
diff --git a/IO/Exodus/vtkModelMetadata.h b/IO/Exodus/vtkModelMetadata.h
index 36859864e4957e2df33a8747ea8c9997043cbd5e..6765cafda18e65cdd781aea1df2aac26e96c9a92 100644
--- a/IO/Exodus/vtkModelMetadata.h
+++ b/IO/Exodus/vtkModelMetadata.h
@@ -90,7 +90,7 @@ class VTKIOEXODUS_EXPORT vtkModelMetadata : public vtkObject
{
public:
vtkTypeMacro(vtkModelMetadata, vtkObject);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
static vtkModelMetadata *New();
/**
@@ -664,7 +664,7 @@ public:
protected:
vtkModelMetadata();
- ~vtkModelMetadata() VTK_OVERRIDE;
+ ~vtkModelMetadata() override;
private:
void InitializeAllMetadata();
diff --git a/IO/Export/Testing/Cxx/TestPDFContextExport.cxx b/IO/Export/Testing/Cxx/TestPDFContextExport.cxx
index e7ac55f70e196ec4655765a84952d0a5a1391907..a02d10068575c61b1d62769162f711e1a2ffbb6a 100644
--- a/IO/Export/Testing/Cxx/TestPDFContextExport.cxx
+++ b/IO/Export/Testing/Cxx/TestPDFContextExport.cxx
@@ -50,7 +50,7 @@ public:
static ContextPDFTest *New();
vtkTypeMacro(ContextPDFTest, 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;
};
int TestPDFContextExport(int, char*[])
diff --git a/IO/Export/Testing/Cxx/TestPDFContextShading.cxx b/IO/Export/Testing/Cxx/TestPDFContextShading.cxx
index 2f7e967b58b516a2c2cf634327835a24509cb2de..17b0b326b90bc777469efea7e6b83b4649bb625c 100644
--- a/IO/Export/Testing/Cxx/TestPDFContextShading.cxx
+++ b/IO/Export/Testing/Cxx/TestPDFContextShading.cxx
@@ -49,7 +49,7 @@ public:
static ContextPDFTest *New();
vtkTypeMacro(ContextPDFTest, 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;
};
vtkStandardNewMacro(ContextPDFTest)
} // end anon namespace
diff --git a/IO/Export/Testing/Cxx/TestSVGContextExport.cxx b/IO/Export/Testing/Cxx/TestSVGContextExport.cxx
index 3fe92344870ca64e212b6da39c08e9b9c2bfc391..9fe6c7f1d7c3393b87047abf43ba67d9cf2aed6a 100644
--- a/IO/Export/Testing/Cxx/TestSVGContextExport.cxx
+++ b/IO/Export/Testing/Cxx/TestSVGContextExport.cxx
@@ -48,7 +48,7 @@ public:
static ContextSVGTest *New();
vtkTypeMacro(ContextSVGTest, 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;
};
int TestSVGContextExport(int, char*[])
diff --git a/IO/Export/Testing/Cxx/TestSVGContextShading.cxx b/IO/Export/Testing/Cxx/TestSVGContextShading.cxx
index 30feb64f44a3a5147951e4522e0165b6f61a864b..a704058a7a5216056a7507bc9374fa61d609415d 100644
--- a/IO/Export/Testing/Cxx/TestSVGContextShading.cxx
+++ b/IO/Export/Testing/Cxx/TestSVGContextShading.cxx
@@ -49,7 +49,7 @@ public:
static ContextSVGTest *New();
vtkTypeMacro(ContextSVGTest, 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;
};
vtkStandardNewMacro(ContextSVGTest)
} // end anon namespace
diff --git a/IO/Export/vtkExporter.h b/IO/Export/vtkExporter.h
index f54d48125317a9ea0c369695e241b7aea9625c9d..6b41282d67af38e8bc47ce60a5122c1936afd078 100644
--- a/IO/Export/vtkExporter.h
+++ b/IO/Export/vtkExporter.h
@@ -47,7 +47,7 @@ class VTKIOEXPORT_EXPORT vtkExporter : public vtkObject
{
public:
vtkTypeMacro(vtkExporter,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Write data to output. Method executes subclasses WriteData() method, as
@@ -102,11 +102,11 @@ public:
/**
* Returns the MTime also considering the RenderWindow.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
protected:
vtkExporter();
- ~vtkExporter() VTK_OVERRIDE;
+ ~vtkExporter() override;
vtkRenderWindow *RenderWindow;
virtual void WriteData() = 0;
diff --git a/IO/Export/vtkGL2PSExporter.h b/IO/Export/vtkGL2PSExporter.h
index 14dbd193f860eef5238404f852202c90dc810621..b2d3bd78dff079488de519d3e8999563bdaa3a24 100644
--- a/IO/Export/vtkGL2PSExporter.h
+++ b/IO/Export/vtkGL2PSExporter.h
@@ -89,7 +89,7 @@ class VTKIOEXPORT_EXPORT vtkGL2PSExporter : public vtkExporter
public:
static vtkGL2PSExporter *New();
vtkTypeMacro(vtkGL2PSExporter, vtkExporter)
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -348,7 +348,7 @@ public:
protected:
vtkGL2PSExporter();
- ~vtkGL2PSExporter() VTK_OVERRIDE;
+ ~vtkGL2PSExporter() override;
int GetGL2PSOptions();
int GetGL2PSSort();
diff --git a/IO/Export/vtkIVExporter.h b/IO/Export/vtkIVExporter.h
index 1c7f48b86836711ed7d0c4565f7f31c97790a85a..5a455d51c0d5a350e5d570821fffc94ebb6bc40b 100644
--- a/IO/Export/vtkIVExporter.h
+++ b/IO/Export/vtkIVExporter.h
@@ -40,7 +40,7 @@ class VTKIOEXPORT_EXPORT vtkIVExporter : public vtkExporter
public:
static vtkIVExporter *New();
vtkTypeMacro(vtkIVExporter,vtkExporter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -52,9 +52,9 @@ public:
protected:
vtkIVExporter();
- ~vtkIVExporter() VTK_OVERRIDE;
+ ~vtkIVExporter() override;
- void WriteData() VTK_OVERRIDE;
+ void WriteData() override;
void WriteALight(vtkLight *aLight, FILE *fp);
void WriteAnActor(vtkActor *anActor, FILE *fp);
void WritePointData(vtkPoints *points, vtkDataArray *normals,
diff --git a/IO/Export/vtkOBJExporter.h b/IO/Export/vtkOBJExporter.h
index 403538c6c4463c4b85786ea0f706c71ec445d5aa..dd53f5a198c732277dba72c4ef549ff88b3ab1a9 100644
--- a/IO/Export/vtkOBJExporter.h
+++ b/IO/Export/vtkOBJExporter.h
@@ -38,7 +38,7 @@ class VTKIOEXPORT_EXPORT vtkOBJExporter : public vtkExporter
public:
static vtkOBJExporter *New();
vtkTypeMacro(vtkOBJExporter,vtkExporter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -51,9 +51,9 @@ public:
protected:
vtkOBJExporter();
- ~vtkOBJExporter() VTK_OVERRIDE;
+ ~vtkOBJExporter() override;
- void WriteData() VTK_OVERRIDE;
+ void WriteData() override;
void WriteAnActor(vtkActor *anActor, FILE *fpObj, FILE *fpMat, int &id);
char *FilePrefix;
private:
diff --git a/IO/Export/vtkOOGLExporter.h b/IO/Export/vtkOOGLExporter.h
index aa0e75a9dbadc171702417b541e9b35cd4f6d701..b3fc9a752fc204597000863c80f4a6dfdb18362d 100644
--- a/IO/Export/vtkOOGLExporter.h
+++ b/IO/Export/vtkOOGLExporter.h
@@ -38,7 +38,7 @@ class VTKIOEXPORT_EXPORT vtkOOGLExporter : public vtkExporter
public:
static vtkOOGLExporter *New();
vtkTypeMacro(vtkOOGLExporter,vtkExporter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -50,9 +50,9 @@ public:
protected:
vtkOOGLExporter();
- ~vtkOOGLExporter() VTK_OVERRIDE;
+ ~vtkOOGLExporter() override;
- void WriteData() VTK_OVERRIDE;
+ void WriteData() override;
void WriteALight(vtkLight *aLight, FILE *fp);
void WriteAnActor(vtkActor *anActor, FILE *fp, int count);
char *FileName;
diff --git a/IO/Export/vtkPDFContextDevice2D.h b/IO/Export/vtkPDFContextDevice2D.h
index b5dd229da8213a81149d7a011403f35442b65fa7..4d2503386ddd7518e30f25c193ed3513177efda1 100644
--- a/IO/Export/vtkPDFContextDevice2D.h
+++ b/IO/Export/vtkPDFContextDevice2D.h
@@ -34,7 +34,7 @@ class VTKIOEXPORT_EXPORT vtkPDFContextDevice2D: public vtkContextDevice2D
public:
static vtkPDFContextDevice2D* New();
vtkTypeMacro(vtkPDFContextDevice2D, vtkContextDevice2D)
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
/**
* Set the HPDF_Doc and HPDF_Page to use while exporting the scene. The
@@ -46,57 +46,57 @@ public:
void SetRenderer(vtkRenderer*);
void DrawPoly(float *points, int n, unsigned char *colors = nullptr,
- int nc_comps = 0) VTK_OVERRIDE;
+ int nc_comps = 0) override;
void DrawLines(float *f, int n, unsigned char *colors = nullptr,
- int nc_comps = 0) VTK_OVERRIDE;
+ int nc_comps = 0) override;
void DrawPoints(float *points, int n, unsigned char* colors = nullptr,
- int nc_comps = 0) VTK_OVERRIDE;
+ int nc_comps = 0) override;
void DrawPointSprites(vtkImageData *sprite, float *points, int n,
unsigned char *colors = nullptr,
- int nc_comps = 0) VTK_OVERRIDE;
+ int nc_comps = 0) override;
void DrawMarkers(int shape, bool highlight, float *points, int n,
- unsigned char *colors = nullptr, int nc_comps = 0) VTK_OVERRIDE;
- void DrawQuad(float *, int) VTK_OVERRIDE;
- void DrawQuadStrip(float *, int) VTK_OVERRIDE;
- void DrawPolygon(float *, int) VTK_OVERRIDE;
+ unsigned char *colors = nullptr, int nc_comps = 0) override;
+ void DrawQuad(float *, int) override;
+ void DrawQuadStrip(float *, int) override;
+ void DrawPolygon(float *, int) override;
void DrawColoredPolygon(float *points, int numPoints,
unsigned char *colors = nullptr,
- int nc_comps = 0) VTK_OVERRIDE;
+ int nc_comps = 0) override;
void DrawEllipseWedge(float x, float y, float outRx, float outRy,
float inRx, float inRy, float startAngle,
- float stopAngle) VTK_OVERRIDE;
+ float stopAngle) override;
void DrawEllipticArc(float x, float y, float rX, float rY,
- float startAngle, float stopAngle) VTK_OVERRIDE;
- void DrawString(float *point, const vtkStdString &string) VTK_OVERRIDE;
+ float startAngle, float stopAngle) override;
+ void DrawString(float *point, const vtkStdString &string) override;
void ComputeStringBounds(const vtkStdString &string,
- float bounds[4]) VTK_OVERRIDE;
- void DrawString(float *point, const vtkUnicodeString &string) VTK_OVERRIDE;
+ float bounds[4]) override;
+ void DrawString(float *point, const vtkUnicodeString &string) override;
void ComputeStringBounds(const vtkUnicodeString &string,
- float bounds[4]) VTK_OVERRIDE;
+ float bounds[4]) override;
void ComputeJustifiedStringBounds(const char* string,
- float bounds[4]) VTK_OVERRIDE;
- void DrawMathTextString(float *point, const vtkStdString &str) VTK_OVERRIDE;
- void DrawImage(float p[2], float scale, vtkImageData *image) VTK_OVERRIDE;
- void DrawImage(const vtkRectf& pos, vtkImageData *image) VTK_OVERRIDE;
- void SetColor4(unsigned char color[4]) VTK_OVERRIDE;
- void SetTexture(vtkImageData* image, int properties) VTK_OVERRIDE;
- void SetPointSize(float size) VTK_OVERRIDE;
- void SetLineWidth(float width) VTK_OVERRIDE;
+ float bounds[4]) override;
+ void DrawMathTextString(float *point, const vtkStdString &str) override;
+ void DrawImage(float p[2], float scale, vtkImageData *image) override;
+ void DrawImage(const vtkRectf& pos, vtkImageData *image) override;
+ void SetColor4(unsigned char color[4]) override;
+ void SetTexture(vtkImageData* image, int properties) override;
+ void SetPointSize(float size) override;
+ void SetLineWidth(float width) override;
void DrawPolyData(float p[2], float scale, vtkPolyData* polyData,
- vtkUnsignedCharArray* colors, int scalarMode) VTK_OVERRIDE;
+ vtkUnsignedCharArray* colors, int scalarMode) override;
- void SetLineType(int type) VTK_OVERRIDE;
- void SetMatrix(vtkMatrix3x3 *m) VTK_OVERRIDE;
- void GetMatrix(vtkMatrix3x3 *m) VTK_OVERRIDE;
- void MultiplyMatrix(vtkMatrix3x3 *m) VTK_OVERRIDE;
- void PushMatrix() VTK_OVERRIDE;
- void PopMatrix() VTK_OVERRIDE;
- void SetClipping(int *x) VTK_OVERRIDE;
- void EnableClipping(bool enable) VTK_OVERRIDE;
+ void SetLineType(int type) override;
+ void SetMatrix(vtkMatrix3x3 *m) override;
+ void GetMatrix(vtkMatrix3x3 *m) override;
+ void MultiplyMatrix(vtkMatrix3x3 *m) override;
+ void PushMatrix() override;
+ void PopMatrix() override;
+ void SetClipping(int *x) override;
+ void EnableClipping(bool enable) override;
protected:
vtkPDFContextDevice2D();
- ~vtkPDFContextDevice2D() VTK_OVERRIDE;
+ ~vtkPDFContextDevice2D() override;
void PushGraphicsState();
void PopGraphicsState();
diff --git a/IO/Export/vtkPDFExporter.h b/IO/Export/vtkPDFExporter.h
index dfa5dcfd0731745f185c5fa9d7997ff11973eb3d..19e2f83af0adaf31f232d47191ad9633d209bb4c 100644
--- a/IO/Export/vtkPDFExporter.h
+++ b/IO/Export/vtkPDFExporter.h
@@ -33,7 +33,7 @@ class VTKIOEXPORT_EXPORT vtkPDFExporter: public vtkExporter
public:
static vtkPDFExporter* New();
vtkTypeMacro(vtkPDFExporter, vtkExporter)
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
/** The title of the exported document. @{ */
vtkSetStringMacro(Title)
@@ -47,9 +47,9 @@ public:
protected:
vtkPDFExporter();
- ~vtkPDFExporter() VTK_OVERRIDE;
+ ~vtkPDFExporter() override;
- void WriteData() VTK_OVERRIDE;
+ void WriteData() override;
void WritePDF();
void PrepareDocument();
diff --git a/IO/Export/vtkPOVExporter.h b/IO/Export/vtkPOVExporter.h
index ff7004efe541967358c2e7582cac8f2c33460475..56355c75d8d7bf1edf0f26affd2c6c38e0b8f700 100644
--- a/IO/Export/vtkPOVExporter.h
+++ b/IO/Export/vtkPOVExporter.h
@@ -93,7 +93,7 @@ class VTKIOEXPORT_EXPORT vtkPOVExporter : public vtkExporter
public:
static vtkPOVExporter *New();
vtkTypeMacro(vtkPOVExporter, vtkExporter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -105,9 +105,9 @@ public:
protected:
vtkPOVExporter();
- ~vtkPOVExporter() VTK_OVERRIDE;
+ ~vtkPOVExporter() override;
- void WriteData() VTK_OVERRIDE;
+ void WriteData() override;
virtual void WriteHeader(vtkRenderer *renderer);
void WriteCamera(vtkCamera *camera);
void WriteLight(vtkLight *light);
diff --git a/IO/Export/vtkRIBExporter.h b/IO/Export/vtkRIBExporter.h
index 438f85f3234618b03f1aabec47c550e42e476814..99ece347ccac1e366254eb0b8ce652e891109840 100644
--- a/IO/Export/vtkRIBExporter.h
+++ b/IO/Export/vtkRIBExporter.h
@@ -66,7 +66,7 @@ class VTKIOEXPORT_EXPORT vtkRIBExporter : public vtkExporter
public:
static vtkRIBExporter *New();
vtkTypeMacro(vtkRIBExporter,vtkExporter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -138,7 +138,7 @@ public:
protected:
vtkRIBExporter();
- ~vtkRIBExporter() VTK_OVERRIDE;
+ ~vtkRIBExporter() override;
int Background;
int Size[2];
@@ -167,7 +167,7 @@ protected:
vtkProperty *aProperty);
//@}
- void WriteData() VTK_OVERRIDE;
+ void WriteData() override;
void WriteActor(vtkActor *anActor);
/**
diff --git a/IO/Export/vtkRIBLight.h b/IO/Export/vtkRIBLight.h
index fdcca038430015e9fe6ce9a5f43d49154598a4fa..b1ad6a9230fa5f84780bcc1c34d68f8c619dc0a8 100644
--- a/IO/Export/vtkRIBLight.h
+++ b/IO/Export/vtkRIBLight.h
@@ -37,16 +37,16 @@ class VTKIOEXPORT_EXPORT vtkRIBLight : public vtkLight
public:
static vtkRIBLight *New();
vtkTypeMacro(vtkRIBLight,vtkLight);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
vtkBooleanMacro(Shadows,int);
vtkSetMacro(Shadows,int);
vtkGetMacro(Shadows,int);
- void Render(vtkRenderer *ren, int index) VTK_OVERRIDE;
+ void Render(vtkRenderer *ren, int index) override;
protected:
vtkRIBLight();
- ~vtkRIBLight() VTK_OVERRIDE;
+ ~vtkRIBLight() override;
vtkLight *Light;
int Shadows;
diff --git a/IO/Export/vtkRIBProperty.h b/IO/Export/vtkRIBProperty.h
index de0299b786203d7a6ac082b75726065239d4213d..6e43b5ddaca47f93c155d0b7aa356508fb0589e7 100644
--- a/IO/Export/vtkRIBProperty.h
+++ b/IO/Export/vtkRIBProperty.h
@@ -38,7 +38,7 @@ class VTKIOEXPORT_EXPORT vtkRIBProperty : public vtkProperty
public:
static vtkRIBProperty *New();
vtkTypeMacro(vtkRIBProperty,vtkProperty);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -122,9 +122,9 @@ public:
protected:
vtkRIBProperty();
- ~vtkRIBProperty() VTK_OVERRIDE;
+ ~vtkRIBProperty() override;
- void Render(vtkActor *a, vtkRenderer *ren) VTK_OVERRIDE;
+ void Render(vtkActor *a, vtkRenderer *ren) override;
vtkProperty *Property;
char *SurfaceShader;
char *DisplacementShader;
diff --git a/IO/Export/vtkSVGContextDevice2D.h b/IO/Export/vtkSVGContextDevice2D.h
index 74bad01ebd6b625eddaefb2088d23e7fa4c8db1a..d856236419aedd11b8bd5741721a429919a84f2c 100644
--- a/IO/Export/vtkSVGContextDevice2D.h
+++ b/IO/Export/vtkSVGContextDevice2D.h
@@ -58,7 +58,7 @@ class VTKIOEXPORT_EXPORT vtkSVGContextDevice2D: public vtkContextDevice2D
public:
static vtkSVGContextDevice2D* New();
vtkTypeMacro(vtkSVGContextDevice2D, vtkContextDevice2D)
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
/** The svg container element to draw into, and the global definitions
* element. */
@@ -125,59 +125,59 @@ public:
*/
void GenerateDefinitions();
- void Begin(vtkViewport*) VTK_OVERRIDE;
- void End() VTK_OVERRIDE;
+ void Begin(vtkViewport*) override;
+ void End() override;
void DrawPoly(float *points, int n, unsigned char *colors = nullptr,
- int nc_comps = 0) VTK_OVERRIDE;
+ int nc_comps = 0) override;
void DrawLines(float *f, int n, unsigned char *colors = nullptr,
- int nc_comps = 0) VTK_OVERRIDE;
+ int nc_comps = 0) override;
void DrawPoints(float *points, int n, unsigned char* colors = nullptr,
- int nc_comps = 0) VTK_OVERRIDE;
+ int nc_comps = 0) override;
void DrawPointSprites(vtkImageData *sprite, float *points, int n,
unsigned char *colors = nullptr,
- int nc_comps = 0) VTK_OVERRIDE;
+ int nc_comps = 0) override;
void DrawMarkers(int shape, bool highlight, float *points, int n,
- unsigned char *colors = nullptr, int nc_comps = 0) VTK_OVERRIDE;
- void DrawQuad(float *, int) VTK_OVERRIDE;
- void DrawQuadStrip(float *, int) VTK_OVERRIDE;
- void DrawPolygon(float *, int) VTK_OVERRIDE;
+ unsigned char *colors = nullptr, int nc_comps = 0) override;
+ void DrawQuad(float *, int) override;
+ void DrawQuadStrip(float *, int) override;
+ void DrawPolygon(float *, int) override;
void DrawColoredPolygon(float *points, int numPoints,
unsigned char *colors = nullptr,
- int nc_comps = 0) VTK_OVERRIDE;
+ int nc_comps = 0) override;
void DrawEllipseWedge(float x, float y, float outRx, float outRy,
float inRx, float inRy, float startAngle,
- float stopAngle) VTK_OVERRIDE;
+ float stopAngle) override;
void DrawEllipticArc(float x, float y, float rX, float rY,
- float startAngle, float stopAngle) VTK_OVERRIDE;
- void DrawString(float *point, const vtkStdString &string) VTK_OVERRIDE;
+ float startAngle, float stopAngle) override;
+ void DrawString(float *point, const vtkStdString &string) override;
void ComputeStringBounds(const vtkStdString &string,
- float bounds[4]) VTK_OVERRIDE;
- void DrawString(float *point, const vtkUnicodeString &string) VTK_OVERRIDE;
+ float bounds[4]) override;
+ void DrawString(float *point, const vtkUnicodeString &string) override;
void ComputeStringBounds(const vtkUnicodeString &string,
- float bounds[4]) VTK_OVERRIDE;
+ float bounds[4]) override;
void ComputeJustifiedStringBounds(const char* string,
- float bounds[4]) VTK_OVERRIDE;
- void DrawMathTextString(float *point, const vtkStdString &str) VTK_OVERRIDE;
- void DrawImage(float p[2], float scale, vtkImageData *image) VTK_OVERRIDE;
- void DrawImage(const vtkRectf& pos, vtkImageData *image) VTK_OVERRIDE;
- void SetColor4(unsigned char color[4]) VTK_OVERRIDE;
- void SetTexture(vtkImageData* image, int properties) VTK_OVERRIDE;
- void SetPointSize(float size) VTK_OVERRIDE;
- void SetLineWidth(float width) VTK_OVERRIDE;
-
- void SetLineType(int type) VTK_OVERRIDE;
- void SetMatrix(vtkMatrix3x3 *m) VTK_OVERRIDE;
- void GetMatrix(vtkMatrix3x3 *m) VTK_OVERRIDE;
- void MultiplyMatrix(vtkMatrix3x3 *m) VTK_OVERRIDE;
- void PushMatrix() VTK_OVERRIDE;
- void PopMatrix() VTK_OVERRIDE;
- void SetClipping(int *x) VTK_OVERRIDE;
- void EnableClipping(bool enable) VTK_OVERRIDE;
+ float bounds[4]) override;
+ void DrawMathTextString(float *point, const vtkStdString &str) override;
+ void DrawImage(float p[2], float scale, vtkImageData *image) override;
+ void DrawImage(const vtkRectf& pos, vtkImageData *image) override;
+ void SetColor4(unsigned char color[4]) override;
+ void SetTexture(vtkImageData* image, int properties) override;
+ void SetPointSize(float size) override;
+ void SetLineWidth(float width) override;
+
+ void SetLineType(int type) override;
+ void SetMatrix(vtkMatrix3x3 *m) override;
+ void GetMatrix(vtkMatrix3x3 *m) override;
+ void MultiplyMatrix(vtkMatrix3x3 *m) override;
+ void PushMatrix() override;
+ void PopMatrix() override;
+ void SetClipping(int *x) override;
+ void EnableClipping(bool enable) override;
protected:
vtkSVGContextDevice2D();
- ~vtkSVGContextDevice2D() VTK_OVERRIDE;
+ ~vtkSVGContextDevice2D() override;
void SetViewport(vtkViewport*);
diff --git a/IO/Export/vtkSVGExporter.h b/IO/Export/vtkSVGExporter.h
index b95b4c00f51d673f14d40a931571d905eb778100..d9a35896182bf2e4dd7efa556e1e1ef9b032ee8a 100644
--- a/IO/Export/vtkSVGExporter.h
+++ b/IO/Export/vtkSVGExporter.h
@@ -55,7 +55,7 @@ class VTKIOEXPORT_EXPORT vtkSVGExporter: public vtkExporter
public:
static vtkSVGExporter* New();
vtkTypeMacro(vtkSVGExporter, vtkExporter)
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
/** The title of the exported document. @{ */
vtkSetStringMacro(Title)
@@ -123,9 +123,9 @@ public:
protected:
vtkSVGExporter();
- ~vtkSVGExporter() VTK_OVERRIDE;
+ ~vtkSVGExporter() override;
- void WriteData() VTK_OVERRIDE;
+ void WriteData() override;
void WriteSVG();
void PrepareDocument();
diff --git a/IO/Export/vtkVRMLExporter.h b/IO/Export/vtkVRMLExporter.h
index 18cffaa133863867e5582d535f5e6871b587b24f..ac9f786b010695771eb1c069cf9ae25768af31e1 100644
--- a/IO/Export/vtkVRMLExporter.h
+++ b/IO/Export/vtkVRMLExporter.h
@@ -43,7 +43,7 @@ class VTKIOEXPORT_EXPORT vtkVRMLExporter : public vtkExporter
public:
static vtkVRMLExporter *New();
vtkTypeMacro(vtkVRMLExporter,vtkExporter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -69,9 +69,9 @@ public:
protected:
vtkVRMLExporter();
- ~vtkVRMLExporter() VTK_OVERRIDE;
+ ~vtkVRMLExporter() override;
- void WriteData() VTK_OVERRIDE;
+ void WriteData() override;
void WriteALight(vtkLight *aLight, FILE *fp);
void WriteAnActor(vtkActor *anActor, FILE *fp);
void WritePointData(vtkPoints *points, vtkDataArray *normals,
diff --git a/IO/Export/vtkX3DExporter.h b/IO/Export/vtkX3DExporter.h
index 2331d876e9b932bfacfec1e1fdf3640156db8c81..13109f094f521638fb894480f9ddfb7dbd9bfa23 100644
--- a/IO/Export/vtkX3DExporter.h
+++ b/IO/Export/vtkX3DExporter.h
@@ -45,7 +45,7 @@ class VTKIOEXPORT_EXPORT vtkX3DExporter : public vtkExporter
public:
static vtkX3DExporter *New();
vtkTypeMacro(vtkX3DExporter,vtkExporter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -113,7 +113,7 @@ public:
protected:
vtkX3DExporter();
- ~vtkX3DExporter() VTK_OVERRIDE;
+ ~vtkX3DExporter() override;
// Stream management
int WriteToOutputString;
@@ -123,7 +123,7 @@ protected:
/**
* Write data to output.
*/
- void WriteData() VTK_OVERRIDE;
+ void WriteData() override;
void WriteALight(vtkLight *aLight, vtkX3DExporterWriter* writer);
void WriteAnActor(vtkActor *anActor, vtkX3DExporterWriter* writer,
diff --git a/IO/Export/vtkX3DExporterFIWriter.h b/IO/Export/vtkX3DExporterFIWriter.h
index 734a8b291ea3ca4a49079e18ffb708e56926e840..03fbd46e78a95eb492521fbb1e44cb1f3fae9cce 100644
--- a/IO/Export/vtkX3DExporterFIWriter.h
+++ b/IO/Export/vtkX3DExporterFIWriter.h
@@ -32,44 +32,44 @@ class VTKIOEXPORT_EXPORT vtkX3DExporterFIWriter : public vtkX3DExporterWriter
public:
static vtkX3DExporterFIWriter *New();
vtkTypeMacro(vtkX3DExporterFIWriter, vtkX3DExporterWriter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
- void CloseFile() VTK_OVERRIDE;
- int OpenFile(const char* file) VTK_OVERRIDE;
- int OpenStream() VTK_OVERRIDE;
+ void CloseFile() override;
+ int OpenFile(const char* file) override;
+ int OpenStream() override;
//void Write(const char* str);
- void Flush() VTK_OVERRIDE;
+ void Flush() override;
- void StartDocument() VTK_OVERRIDE;
- void EndDocument() VTK_OVERRIDE;
+ void StartDocument() override;
+ void EndDocument() override;
// Elements
- void StartNode(int elementID) VTK_OVERRIDE;
- void EndNode() VTK_OVERRIDE;
+ void StartNode(int elementID) override;
+ void EndNode() override;
// Attributes
// SFString / MFString
//void SetField(int attributeID, const std::string &value);
- void SetField(int attributeID, const char*, bool mfstring = false) VTK_OVERRIDE;
+ void SetField(int attributeID, const char*, bool mfstring = false) override;
// SFInt32
- void SetField(int attributeID, int) VTK_OVERRIDE;
+ void SetField(int attributeID, int) override;
// SFFloat
- void SetField(int attributeID, float) VTK_OVERRIDE;
+ void SetField(int attributeID, float) override;
// SFDouble
- void SetField(int attributeID, double) VTK_OVERRIDE;
+ void SetField(int attributeID, double) override;
// SFBool
- void SetField(int attributeID, bool) VTK_OVERRIDE;
+ void SetField(int attributeID, bool) override;
// For MFxxx attributes
- void SetField(int attributeID, int type, const double* a) VTK_OVERRIDE;
- void SetField(int attributeID, int type, vtkDataArray* a) VTK_OVERRIDE;
- void SetField(int attributeID, const double* values, size_t size) VTK_OVERRIDE;
+ void SetField(int attributeID, int type, const double* a) override;
+ void SetField(int attributeID, int type, vtkDataArray* a) override;
+ void SetField(int attributeID, const double* values, size_t size) override;
// MFInt32
void SetField(int attributeID, int type, vtkCellArray* a);
- void SetField(int attributeID, const int* values, size_t size, bool image = false) VTK_OVERRIDE;
+ void SetField(int attributeID, const int* values, size_t size, bool image = false) override;
//@{
/**
@@ -82,7 +82,7 @@ public:
protected:
vtkX3DExporterFIWriter();
- ~vtkX3DExporterFIWriter() VTK_OVERRIDE;
+ ~vtkX3DExporterFIWriter() override;
private:
void StartAttribute(int attributeID, bool literal, bool addToTable = false);
diff --git a/IO/Export/vtkX3DExporterWriter.h b/IO/Export/vtkX3DExporterWriter.h
index 75f1a6cbc6ae23444827f7c876ffe2803d37340d..41f5c9f55b71bdb760b1c963b40f18e92f2db980 100644
--- a/IO/Export/vtkX3DExporterWriter.h
+++ b/IO/Export/vtkX3DExporterWriter.h
@@ -36,7 +36,7 @@ class VTKIOEXPORT_EXPORT vtkX3DExporterWriter : public vtkObject
{
public:
vtkTypeMacro(vtkX3DExporterWriter, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Opens the file specified with file
@@ -189,7 +189,7 @@ public:
protected:
vtkX3DExporterWriter();
- ~vtkX3DExporterWriter() VTK_OVERRIDE;
+ ~vtkX3DExporterWriter() override;
char *OutputString;
int OutputStringLength;
diff --git a/IO/Export/vtkX3DExporterXMLWriter.h b/IO/Export/vtkX3DExporterXMLWriter.h
index dd78f31308984c840ac333a0293d6f640356e5fc..40ec7f4ffab4adf82dbfc7324e7ea69108534eb4 100644
--- a/IO/Export/vtkX3DExporterXMLWriter.h
+++ b/IO/Export/vtkX3DExporterXMLWriter.h
@@ -33,43 +33,43 @@ class VTKIOEXPORT_EXPORT vtkX3DExporterXMLWriter : public vtkX3DExporterWriter
public:
static vtkX3DExporterXMLWriter *New();
vtkTypeMacro(vtkX3DExporterXMLWriter, vtkX3DExporterWriter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
- void CloseFile() VTK_OVERRIDE;
- int OpenFile(const char* file) VTK_OVERRIDE;
- void Flush() VTK_OVERRIDE;
+ void CloseFile() override;
+ int OpenFile(const char* file) override;
+ void Flush() override;
- int OpenStream() VTK_OVERRIDE;
+ int OpenStream() override;
- void StartDocument() VTK_OVERRIDE;
- void EndDocument() VTK_OVERRIDE;
+ void StartDocument() override;
+ void EndDocument() override;
// Elements
- void StartNode(int elementID) VTK_OVERRIDE;
- void EndNode() VTK_OVERRIDE;
+ void StartNode(int elementID) override;
+ void EndNode() override;
// Attributes
// SFString / MFString
- void SetField(int attributeID, const char*, bool mfstring = true) VTK_OVERRIDE;
+ void SetField(int attributeID, const char*, bool mfstring = true) override;
// SFInt32
- void SetField(int attributeID, int) VTK_OVERRIDE;
+ void SetField(int attributeID, int) override;
// SFFloat
- void SetField(int attributeID, float) VTK_OVERRIDE;
+ void SetField(int attributeID, float) override;
// SFDouble
- void SetField(int attributeID, double) VTK_OVERRIDE;
+ void SetField(int attributeID, double) override;
// SFBool
- void SetField(int attributeID, bool) VTK_OVERRIDE;
+ void SetField(int attributeID, bool) override;
// For MFxxx attributes
- void SetField(int attributeID, int type, const double* a) VTK_OVERRIDE;
- void SetField(int attributeID, int type, vtkDataArray* a) VTK_OVERRIDE;
- void SetField(int attributeID, const double* values, size_t size) VTK_OVERRIDE;
+ void SetField(int attributeID, int type, const double* a) override;
+ void SetField(int attributeID, int type, vtkDataArray* a) override;
+ void SetField(int attributeID, const double* values, size_t size) override;
// MFInt32, SFIMAGE
- void SetField(int attributeID, const int* values, size_t size, bool image = false) VTK_OVERRIDE;
+ void SetField(int attributeID, const int* values, size_t size, bool image = false) override;
protected:
vtkX3DExporterXMLWriter();
- ~vtkX3DExporterXMLWriter() VTK_OVERRIDE;
+ ~vtkX3DExporterXMLWriter() override;
private:
diff --git a/IO/ExportOpenGL/Testing/Cxx/TestGL2PSContext.cxx b/IO/ExportOpenGL/Testing/Cxx/TestGL2PSContext.cxx
index 9516f3c4928506eeec0160e3c5afbec0f6327fac..b71ad2129710eed1ecaa5e8337a446a66c414fca 100644
--- a/IO/ExportOpenGL/Testing/Cxx/TestGL2PSContext.cxx
+++ b/IO/ExportOpenGL/Testing/Cxx/TestGL2PSContext.cxx
@@ -46,7 +46,7 @@ public:
static ContextGL2PSTest *New();
vtkTypeMacro(ContextGL2PSTest, 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;
};
//----------------------------------------------------------------------------
diff --git a/IO/ExportOpenGL/vtkOpenGLGL2PSExporter.h b/IO/ExportOpenGL/vtkOpenGLGL2PSExporter.h
index 2c5b494e15a8ee7f8a37abf0eee7aee996c7e657..5b382f738b81764357e79d4495d51f35cb7fb1e3 100644
--- a/IO/ExportOpenGL/vtkOpenGLGL2PSExporter.h
+++ b/IO/ExportOpenGL/vtkOpenGLGL2PSExporter.h
@@ -110,13 +110,13 @@ class VTKIOEXPORTOPENGL_EXPORT vtkOpenGLGL2PSExporter : public vtkGL2PSExporter
public:
static vtkOpenGLGL2PSExporter *New();
vtkTypeMacro(vtkOpenGLGL2PSExporter, vtkGL2PSExporter)
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkOpenGLGL2PSExporter();
- ~vtkOpenGLGL2PSExporter() VTK_OVERRIDE;
+ ~vtkOpenGLGL2PSExporter() override;
- void WriteData() VTK_OVERRIDE;
+ void WriteData() override;
void SavePropVisibility(vtkRendererCollection *renCol,
vtkIntArray *volVis, vtkIntArray *actVis,
diff --git a/IO/ExportOpenGL2/Testing/Cxx/TestGL2PSContext.cxx b/IO/ExportOpenGL2/Testing/Cxx/TestGL2PSContext.cxx
index 9516f3c4928506eeec0160e3c5afbec0f6327fac..b71ad2129710eed1ecaa5e8337a446a66c414fca 100644
--- a/IO/ExportOpenGL2/Testing/Cxx/TestGL2PSContext.cxx
+++ b/IO/ExportOpenGL2/Testing/Cxx/TestGL2PSContext.cxx
@@ -46,7 +46,7 @@ public:
static ContextGL2PSTest *New();
vtkTypeMacro(ContextGL2PSTest, 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;
};
//----------------------------------------------------------------------------
diff --git a/IO/ExportOpenGL2/vtkOpenGLGL2PSExporter.h b/IO/ExportOpenGL2/vtkOpenGLGL2PSExporter.h
index e402a300ef3b583194c0a80b0c9ae60393f60bb3..0bb128c37aa177728ed7e10138803a6c941cc247 100644
--- a/IO/ExportOpenGL2/vtkOpenGLGL2PSExporter.h
+++ b/IO/ExportOpenGL2/vtkOpenGLGL2PSExporter.h
@@ -34,13 +34,13 @@ class VTKIOEXPORTOPENGL2_EXPORT vtkOpenGLGL2PSExporter: public vtkGL2PSExporter
public:
static vtkOpenGLGL2PSExporter *New();
vtkTypeMacro(vtkOpenGLGL2PSExporter, vtkGL2PSExporter)
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
protected:
vtkOpenGLGL2PSExporter();
- ~vtkOpenGLGL2PSExporter() VTK_OVERRIDE;
+ ~vtkOpenGLGL2PSExporter() override;
- void WriteData() VTK_OVERRIDE;
+ void WriteData() override;
bool RasterizeBackground(vtkImageData *image);
bool CaptureVectorProps();
diff --git a/IO/GDAL/vtkGDAL.h b/IO/GDAL/vtkGDAL.h
index 006e6616972dde60ceea5d3728e930d8d72b25e3..c6941b5a5e5af997dcf5b49592e13adadc6dc987 100644
--- a/IO/GDAL/vtkGDAL.h
+++ b/IO/GDAL/vtkGDAL.h
@@ -37,7 +37,7 @@ class VTKIOGDAL_EXPORT vtkGDAL : public vtkObject
private:
vtkGDAL(); // Static class
- ~vtkGDAL() VTK_OVERRIDE;
+ ~vtkGDAL() override;
vtkGDAL(const vtkGDAL&) VTK_DELETE_FUNCTION;
void operator=(const vtkGDAL&) VTK_DELETE_FUNCTION;
};
diff --git a/IO/GDAL/vtkGDALRasterReader.h b/IO/GDAL/vtkGDALRasterReader.h
index 07f1148b7ab2f1229a26d586b1576c4f64bb09df..1293200858336a81312c38b8bf6fcfb1253f2f31 100644
--- a/IO/GDAL/vtkGDALRasterReader.h
+++ b/IO/GDAL/vtkGDALRasterReader.h
@@ -41,10 +41,10 @@ class VTKIOGDAL_EXPORT vtkGDALRasterReader : public vtkImageReader2
public:
static vtkGDALRasterReader* New();
vtkTypeMacro(vtkGDALRasterReader, vtkImageReader2);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
vtkGDALRasterReader();
- ~vtkGDALRasterReader() VTK_OVERRIDE;
+ ~vtkGDALRasterReader() override;
/**
* Return proj4 spatial reference
@@ -101,14 +101,14 @@ protected:
int RequestData(vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
int RequestInformation(vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
int FillOutputPortInformation(int port,
- vtkInformation* info) VTK_OVERRIDE;
+ vtkInformation* info) override;
protected:
int TargetDimensions[2];
diff --git a/IO/GDAL/vtkGDALVectorReader.h b/IO/GDAL/vtkGDALVectorReader.h
index fb58e5f21628f54496c269f8c8b44bd2549adc05..a4f321cd417561638cf5b24787c5e09fee7c7c9e 100644
--- a/IO/GDAL/vtkGDALVectorReader.h
+++ b/IO/GDAL/vtkGDALVectorReader.h
@@ -39,7 +39,7 @@ class VTKIOGDAL_EXPORT vtkGDALVectorReader : public vtkMultiBlockDataSetAlgorith
{
public:
static vtkGDALVectorReader* New();
- void PrintSelf( ostream& os, vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf( ostream& os, vtkIndent indent ) override;
vtkTypeMacro(vtkGDALVectorReader,vtkMultiBlockDataSetAlgorithm);
vtkSetStringMacro(FileName);
@@ -120,10 +120,10 @@ public:
protected:
vtkGDALVectorReader();
- ~vtkGDALVectorReader() VTK_OVERRIDE;
+ ~vtkGDALVectorReader() override;
- int RequestInformation( vtkInformation*, vtkInformationVector**, vtkInformationVector* ) VTK_OVERRIDE;
- int RequestData( vtkInformation*, vtkInformationVector**, vtkInformationVector* ) VTK_OVERRIDE;
+ int RequestInformation( vtkInformation*, vtkInformationVector**, vtkInformationVector* ) override;
+ int RequestData( vtkInformation*, vtkInformationVector**, vtkInformationVector* ) override;
int InitializeInternal();
diff --git a/IO/Geometry/vtkAVSucdReader.h b/IO/Geometry/vtkAVSucdReader.h
index 1b68857a8a72052c14402d43f6454b0a71d0bc8f..2d555b7268a0665aff3020602c8adf35b5300cab 100644
--- a/IO/Geometry/vtkAVSucdReader.h
+++ b/IO/Geometry/vtkAVSucdReader.h
@@ -49,7 +49,7 @@ class VTKIOGEOMETRY_EXPORT vtkAVSucdReader : public vtkUnstructuredGridAlgorithm
public:
static vtkAVSucdReader *New();
vtkTypeMacro(vtkAVSucdReader,vtkUnstructuredGridAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -155,9 +155,9 @@ public:
protected:
vtkAVSucdReader();
- ~vtkAVSucdReader() VTK_OVERRIDE;
- int RequestInformation(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ ~vtkAVSucdReader() override;
+ int RequestInformation(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
char *FileName;
int BinaryFile;
diff --git a/IO/Geometry/vtkBYUReader.h b/IO/Geometry/vtkBYUReader.h
index 06b9f8ec4f9ba04c4ed641e3e5e2d8e24902b897..edaf93ac9887a396eae9210cc262e024d87a1843 100644
--- a/IO/Geometry/vtkBYUReader.h
+++ b/IO/Geometry/vtkBYUReader.h
@@ -34,7 +34,7 @@ public:
static vtkBYUReader *New();
vtkTypeMacro(vtkBYUReader,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -120,9 +120,9 @@ public:
protected:
vtkBYUReader();
- ~vtkBYUReader() VTK_OVERRIDE;
+ ~vtkBYUReader() override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
// This source does not know how to generate pieces yet.
int ComputeDivisionExtents(vtkDataObject *output,
int idx, int numDivisions);
diff --git a/IO/Geometry/vtkBYUWriter.h b/IO/Geometry/vtkBYUWriter.h
index 16e777934080c722fe2904deee239a28a0fc5e39..035a326f43dccbf998c991abe7c9cdfdad4db8bc 100644
--- a/IO/Geometry/vtkBYUWriter.h
+++ b/IO/Geometry/vtkBYUWriter.h
@@ -40,7 +40,7 @@ public:
static vtkBYUWriter *New();
vtkTypeMacro(vtkBYUWriter,vtkWriter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -111,9 +111,9 @@ public:
protected:
vtkBYUWriter();
- ~vtkBYUWriter() VTK_OVERRIDE;
+ ~vtkBYUWriter() override;
- void WriteData() VTK_OVERRIDE;
+ void WriteData() override;
char *GeometryFileName;
char *DisplacementFileName;
@@ -128,7 +128,7 @@ protected:
void WriteScalarFile(int numPts);
void WriteTextureFile(int numPts);
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
private:
vtkBYUWriter(const vtkBYUWriter&) VTK_DELETE_FUNCTION;
diff --git a/IO/Geometry/vtkChacoReader.h b/IO/Geometry/vtkChacoReader.h
index 701316ffd226bbc7b72530ad06a3bb343f816fd0..a23e5825974cf00ee715bedb97b81dca6eabbec4 100644
--- a/IO/Geometry/vtkChacoReader.h
+++ b/IO/Geometry/vtkChacoReader.h
@@ -41,7 +41,7 @@ class VTKIOGEOMETRY_EXPORT vtkChacoReader : public vtkUnstructuredGridAlgorithm
public:
static vtkChacoReader *New();
vtkTypeMacro(vtkChacoReader,vtkUnstructuredGridAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Specify the base name of the Chaco files. The reader will try to
@@ -162,7 +162,7 @@ public:
protected:
vtkChacoReader();
- ~vtkChacoReader() VTK_OVERRIDE;
+ ~vtkChacoReader() override;
int BuildOutputGrid(vtkUnstructuredGrid *gr);
@@ -228,9 +228,9 @@ protected:
int RemakeDataCacheFlag;
int RequestInformation(
- vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
int RequestData(
- vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
private:
vtkChacoReader(const vtkChacoReader&) VTK_DELETE_FUNCTION;
diff --git a/IO/Geometry/vtkFLUENTReader.h b/IO/Geometry/vtkFLUENTReader.h
index 7e5e5e9be6fbd2b0d9335c427b3065fb03f398a2..516b66df299a66515474e521c69da1ab283c4791 100644
--- a/IO/Geometry/vtkFLUENTReader.h
+++ b/IO/Geometry/vtkFLUENTReader.h
@@ -53,7 +53,7 @@ class VTKIOGEOMETRY_EXPORT vtkFLUENTReader : public vtkMultiBlockDataSetAlgorith
public:
static vtkFLUENTReader *New();
vtkTypeMacro(vtkFLUENTReader,vtkMultiBlockDataSetAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -140,11 +140,11 @@ public:
protected:
vtkFLUENTReader();
- ~vtkFLUENTReader() VTK_OVERRIDE;
+ ~vtkFLUENTReader() override;
int RequestInformation(vtkInformation *,
- vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector **, vtkInformationVector *) override;
int RequestData(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
//@{
/**
diff --git a/IO/Geometry/vtkFacetWriter.h b/IO/Geometry/vtkFacetWriter.h
index e2d4d002b341b0096c8d300f9757434d6e852e85..7364c95f11696ecee04994907b7b4255a4b0d8b1 100644
--- a/IO/Geometry/vtkFacetWriter.h
+++ b/IO/Geometry/vtkFacetWriter.h
@@ -49,7 +49,7 @@ class VTKIOGEOMETRY_EXPORT vtkFacetWriter : public vtkPolyDataAlgorithm
public:
static vtkFacetWriter *New();
vtkTypeMacro(vtkFacetWriter,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -68,15 +68,15 @@ public:
protected:
vtkFacetWriter();
- ~vtkFacetWriter() VTK_OVERRIDE;
+ ~vtkFacetWriter() override;
// This is called by the superclass.
// This is the method you should override.
int RequestData(vtkInformation *request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
- int FillInputPortInformation(int, vtkInformation *) VTK_OVERRIDE;
+ int FillInputPortInformation(int, vtkInformation *) override;
int WriteDataToStream(ostream* ost, vtkPolyData* data);
diff --git a/IO/Geometry/vtkGAMBITReader.h b/IO/Geometry/vtkGAMBITReader.h
index b59aeb3f017d2a260fafa0114af59fc6c4fe4447..7052d477e58ca1dbea8fd44860f95ee10df28b45 100644
--- a/IO/Geometry/vtkGAMBITReader.h
+++ b/IO/Geometry/vtkGAMBITReader.h
@@ -41,7 +41,7 @@ class VTKIOGEOMETRY_EXPORT vtkGAMBITReader : public vtkUnstructuredGridAlgorithm
public:
static vtkGAMBITReader *New();
vtkTypeMacro(vtkGAMBITReader,vtkUnstructuredGridAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -77,9 +77,9 @@ public:
protected:
vtkGAMBITReader();
- ~vtkGAMBITReader() VTK_OVERRIDE;
- int RequestInformation(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ ~vtkGAMBITReader() override;
+ int RequestInformation(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
char *FileName;
diff --git a/IO/Geometry/vtkGaussianCubeReader.h b/IO/Geometry/vtkGaussianCubeReader.h
index aeda62afdeaa7ee86f484e2e376e22ed1b83b0aa..9eb401ff8615d3ac48ad97486b8732ba6c522bf2 100644
--- a/IO/Geometry/vtkGaussianCubeReader.h
+++ b/IO/Geometry/vtkGaussianCubeReader.h
@@ -38,23 +38,23 @@ class VTKIOGEOMETRY_EXPORT vtkGaussianCubeReader : public vtkMoleculeReaderBase
public:
static vtkGaussianCubeReader *New();
vtkTypeMacro(vtkGaussianCubeReader,vtkMoleculeReaderBase);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
vtkGetObjectMacro(Transform,vtkTransform);
vtkImageData *GetGridOutput();
protected:
vtkGaussianCubeReader();
- ~vtkGaussianCubeReader() VTK_OVERRIDE;
+ ~vtkGaussianCubeReader() override;
vtkTransform *Transform;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int RequestInformation(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int RequestInformation(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
- void ReadSpecificMolecule(FILE* fp) VTK_OVERRIDE;
+ void ReadSpecificMolecule(FILE* fp) override;
- int FillOutputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
+ int FillOutputPortInformation(int, vtkInformation*) override;
private:
vtkGaussianCubeReader(const vtkGaussianCubeReader&) VTK_DELETE_FUNCTION;
void operator=(const vtkGaussianCubeReader&) VTK_DELETE_FUNCTION;
diff --git a/IO/Geometry/vtkHoudiniPolyDataWriter.cxx b/IO/Geometry/vtkHoudiniPolyDataWriter.cxx
index 6e445e41433644161bfe4d6f01ef23710506b488..e0dc320b20f131c01dd5379015ee5ea6daa2dadc 100644
--- a/IO/Geometry/vtkHoudiniPolyDataWriter.cxx
+++ b/IO/Geometry/vtkHoudiniPolyDataWriter.cxx
@@ -175,7 +175,7 @@ namespace
this->Value.resize(this->Array->GetNumberOfComponents());
}
- void StreamHeader(std::ostream& out) const VTK_OVERRIDE
+ void StreamHeader(std::ostream& out) const override
{
std::string s = this->Array->GetName();
std::replace(s.begin(), s.end(), ' ', '_');
@@ -191,7 +191,7 @@ namespace
}
}
- void StreamData(std::ostream& out, vtkIdType index) const VTK_OVERRIDE
+ void StreamData(std::ostream& out, vtkIdType index) const override
{
assert(index < this->Array->GetNumberOfTuples());
diff --git a/IO/Geometry/vtkHoudiniPolyDataWriter.h b/IO/Geometry/vtkHoudiniPolyDataWriter.h
index 4d47b55241656984599743258576cce78207fb63..8b9bd34c674f1ec98ead1d6fe91e6ece9ad26377 100644
--- a/IO/Geometry/vtkHoudiniPolyDataWriter.h
+++ b/IO/Geometry/vtkHoudiniPolyDataWriter.h
@@ -35,7 +35,7 @@ class VTKIOGEOMETRY_EXPORT vtkHoudiniPolyDataWriter : public vtkWriter
public:
static vtkHoudiniPolyDataWriter* New();
vtkTypeMacro(vtkHoudiniPolyDataWriter, vtkWriter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -47,11 +47,11 @@ public:
protected:
vtkHoudiniPolyDataWriter();
- ~vtkHoudiniPolyDataWriter() VTK_OVERRIDE;
+ ~vtkHoudiniPolyDataWriter() override;
- void WriteData() VTK_OVERRIDE;
+ void WriteData() override;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
char* FileName;
diff --git a/IO/Geometry/vtkIVWriter.h b/IO/Geometry/vtkIVWriter.h
index 8ac0f169e6d72c6b1dac681f09eeccca435733d3..a91bf2d3989d92474e1d519c54d04bf6e8024e8e 100644
--- a/IO/Geometry/vtkIVWriter.h
+++ b/IO/Geometry/vtkIVWriter.h
@@ -36,7 +36,7 @@ class VTKIOGEOMETRY_EXPORT vtkIVWriter : public vtkWriter
public:
static vtkIVWriter *New();
vtkTypeMacro(vtkIVWriter,vtkWriter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -60,17 +60,17 @@ protected:
this->FileName = nullptr;
}
- ~vtkIVWriter() VTK_OVERRIDE
+ ~vtkIVWriter() override
{
delete[] this->FileName;
}
- void WriteData() VTK_OVERRIDE;
+ void WriteData() override;
void WritePolyData(vtkPolyData *polyData, FILE *fp);
char *FileName;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
private:
vtkIVWriter(const vtkIVWriter&) VTK_DELETE_FUNCTION;
diff --git a/IO/Geometry/vtkMCubesReader.h b/IO/Geometry/vtkMCubesReader.h
index 5105f702e9463e0faa4e361d5f023debe882af62..0b1bb5db62572c647d992df37020dd48f2fb23e4 100644
--- a/IO/Geometry/vtkMCubesReader.h
+++ b/IO/Geometry/vtkMCubesReader.h
@@ -65,7 +65,7 @@ class VTKIOGEOMETRY_EXPORT vtkMCubesReader : public vtkPolyDataAlgorithm
{
public:
vtkTypeMacro(vtkMCubesReader,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct object with FlipNormals turned off and Normals set to true.
@@ -164,13 +164,13 @@ public:
/**
* Return the mtime also considering the locator.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
protected:
vtkMCubesReader();
- ~vtkMCubesReader() VTK_OVERRIDE;
+ ~vtkMCubesReader() override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
char *FileName;
char *LimitsFileName;
diff --git a/IO/Geometry/vtkMCubesWriter.h b/IO/Geometry/vtkMCubesWriter.h
index a09086c80d102c9a8e1f7a75350e734a35378464..dfa75d9de857e4b523b0f904acabf01a45bca16a 100644
--- a/IO/Geometry/vtkMCubesWriter.h
+++ b/IO/Geometry/vtkMCubesWriter.h
@@ -47,7 +47,7 @@ class VTKIOGEOMETRY_EXPORT vtkMCubesWriter : public vtkWriter
public:
static vtkMCubesWriter *New();
vtkTypeMacro(vtkMCubesWriter,vtkWriter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -75,9 +75,9 @@ public:
protected:
vtkMCubesWriter();
- ~vtkMCubesWriter() VTK_OVERRIDE;
+ ~vtkMCubesWriter() override;
- void WriteData() VTK_OVERRIDE;
+ void WriteData() override;
void WriteMCubes(FILE *fp, vtkPoints *pts, vtkDataArray *normals,
vtkCellArray *polys);
@@ -87,7 +87,7 @@ protected:
char *FileName;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
private:
vtkMCubesWriter(const vtkMCubesWriter&) VTK_DELETE_FUNCTION;
diff --git a/IO/Geometry/vtkMFIXReader.h b/IO/Geometry/vtkMFIXReader.h
index 0a478645c22f942810225c6edf7535c35924f51f..c449bb8f47e7cac14c8eaa873e82f3f4a7a7fd48 100644
--- a/IO/Geometry/vtkMFIXReader.h
+++ b/IO/Geometry/vtkMFIXReader.h
@@ -55,7 +55,7 @@ class VTKIOGEOMETRY_EXPORT vtkMFIXReader : public vtkUnstructuredGridAlgorithm
public:
static vtkMFIXReader *New();
vtkTypeMacro(vtkMFIXReader,vtkUnstructuredGridAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -146,11 +146,11 @@ public:
protected:
vtkMFIXReader();
- ~vtkMFIXReader() VTK_OVERRIDE;
+ ~vtkMFIXReader() override;
int RequestInformation(vtkInformation *,
- vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector **, vtkInformationVector *) override;
int RequestData(vtkInformation *,
- vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector **, vtkInformationVector *) override;
//
// ParaView Variables
diff --git a/IO/Geometry/vtkMoleculeReaderBase.h b/IO/Geometry/vtkMoleculeReaderBase.h
index 827b17d49e9ea57b9efcfb53d674582f73328b1b..20e47acec2babf0b5420113cb0ad676283a189d8 100644
--- a/IO/Geometry/vtkMoleculeReaderBase.h
+++ b/IO/Geometry/vtkMoleculeReaderBase.h
@@ -42,7 +42,7 @@ class VTKIOGEOMETRY_EXPORT vtkMoleculeReaderBase : public vtkPolyDataAlgorithm
{
public:
vtkTypeMacro(vtkMoleculeReaderBase,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
vtkSetStringMacro(FileName);
vtkGetStringMacro(FileName);
@@ -67,15 +67,15 @@ public:
protected:
vtkMoleculeReaderBase();
- ~vtkMoleculeReaderBase() VTK_OVERRIDE;
+ ~vtkMoleculeReaderBase() override;
char *FileName;
double BScale;
double HBScale;
int NumberOfAtoms;
- int FillOutputPortInformation(int, vtkInformation *) VTK_OVERRIDE;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int FillOutputPortInformation(int, vtkInformation *) override;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
int ReadMolecule(FILE *fp, vtkPolyData *output);
int MakeAtomType(const char *atype);
diff --git a/IO/Geometry/vtkOBJReader.h b/IO/Geometry/vtkOBJReader.h
index 9bc9d6dab0a845d4213d88f0ea4bcaf28a46425d..f4fa13c8fc930eda0658815b6408849e6b427734 100644
--- a/IO/Geometry/vtkOBJReader.h
+++ b/IO/Geometry/vtkOBJReader.h
@@ -33,13 +33,13 @@ class VTKIOGEOMETRY_EXPORT vtkOBJReader : public vtkAbstractPolyDataReader
public:
static vtkOBJReader *New();
vtkTypeMacro(vtkOBJReader,vtkAbstractPolyDataReader);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkOBJReader();
- ~vtkOBJReader() VTK_OVERRIDE;
+ ~vtkOBJReader() override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
private:
vtkOBJReader(const vtkOBJReader&) VTK_DELETE_FUNCTION;
void operator=(const vtkOBJReader&) VTK_DELETE_FUNCTION;
diff --git a/IO/Geometry/vtkOpenFOAMReader.cxx b/IO/Geometry/vtkOpenFOAMReader.cxx
index ece17d47fd91485e9f095fa44ea35b8ee515a62d..ed7c3936449428c7e4cd3c81be45ab06fd5dd1c0 100644
--- a/IO/Geometry/vtkOpenFOAMReader.cxx
+++ b/IO/Geometry/vtkOpenFOAMReader.cxx
@@ -368,7 +368,7 @@ private:
// constructor and destructor are kept private
vtkOpenFOAMReaderPrivate();
- ~vtkOpenFOAMReaderPrivate() VTK_OVERRIDE;
+ ~vtkOpenFOAMReaderPrivate() override;
vtkOpenFOAMReaderPrivate(const vtkOpenFOAMReaderPrivate &) VTK_DELETE_FUNCTION;
void operator=(const vtkOpenFOAMReaderPrivate &) VTK_DELETE_FUNCTION;
@@ -503,7 +503,7 @@ public:
typedef ArrayT LabelArrayType;
typedef typename ArrayT::ValueType LabelType;
- ~vtkFoamLabelVectorVectorImpl() VTK_OVERRIDE
+ ~vtkFoamLabelVectorVectorImpl() override
{
this->Indices->Delete();
this->Body->Delete();
@@ -545,7 +545,7 @@ public:
this->Body->SetNumberOfValues(bodyLength);
}
- size_t GetLabelSize() const VTK_OVERRIDE
+ size_t GetLabelSize() const override
{
return sizeof(LabelType);
}
@@ -553,43 +553,43 @@ public:
// note that vtkIntArray::Resize() allocates (current size + new
// size) bytes if current size < new size until 2010-06-27
// cf. commit c869c3d5875f503e757b64f2fd1ec349aee859bf
- void ResizeBody(vtkIdType bodyLength) VTK_OVERRIDE
+ void ResizeBody(vtkIdType bodyLength) override
{
this->Body->Resize(bodyLength);
}
- void* WritePointer(vtkIdType i, vtkIdType bodyI, vtkIdType number) VTK_OVERRIDE
+ void* WritePointer(vtkIdType i, vtkIdType bodyI, vtkIdType number) override
{
return this->Body->WritePointer(*this->Indices->GetPointer(i) = bodyI,
number);
}
- void SetIndex(vtkIdType i, vtkIdType bodyI) VTK_OVERRIDE
+ void SetIndex(vtkIdType i, vtkIdType bodyI) override
{
this->Indices->SetValue(i, static_cast<LabelType>(bodyI));
}
- void SetValue(vtkIdType bodyI, vtkTypeInt64 value) VTK_OVERRIDE
+ void SetValue(vtkIdType bodyI, vtkTypeInt64 value) override
{
this->Body->SetValue(bodyI, static_cast<LabelType>(value));
}
- void InsertValue(vtkIdType bodyI, vtkTypeInt64 value) VTK_OVERRIDE
+ void InsertValue(vtkIdType bodyI, vtkTypeInt64 value) override
{
this->Body->InsertValue(bodyI, value);
}
- const void* operator[](vtkIdType i) const VTK_OVERRIDE
+ const void* operator[](vtkIdType i) const override
{
return this->Body->GetPointer(this->Indices->GetValue(i));
}
- vtkIdType GetSize(vtkIdType i) const VTK_OVERRIDE
+ vtkIdType GetSize(vtkIdType i) const override
{
return this->Indices->GetValue(i + 1) - this->Indices->GetValue(i);
}
- void GetCell(vtkIdType cellId, CellType &cell) const VTK_OVERRIDE
+ void GetCell(vtkIdType cellId, CellType &cell) const override
{
LabelType cellStart = this->Indices->GetValue(cellId);
LabelType cellSize = this->Indices->GetValue(cellId + 1) - cellStart;
@@ -600,7 +600,7 @@ public:
}
}
- void SetCell(vtkIdType cellId, const CellType &cell) VTK_OVERRIDE
+ void SetCell(vtkIdType cellId, const CellType &cell) override
{
LabelType cellStart = this->Indices->GetValue(cellId);
LabelType cellSize = this->Indices->GetValue(cellId + 1) - cellStart;
@@ -610,17 +610,17 @@ public:
}
}
- vtkIdType GetNumberOfElements() const VTK_OVERRIDE
+ vtkIdType GetNumberOfElements() const override
{
return this->Indices->GetNumberOfTuples() - 1;
}
- vtkDataArray* GetIndices() VTK_OVERRIDE
+ vtkDataArray* GetIndices() override
{
return this->Indices;
}
- vtkDataArray* GetBody() VTK_OVERRIDE
+ vtkDataArray* GetBody() override
{
return this->Body;
}
diff --git a/IO/Geometry/vtkOpenFOAMReader.h b/IO/Geometry/vtkOpenFOAMReader.h
index dc20a5a47f1cbafd851aeb96c1c80672065d8beb..497c10364077921118007eb225205abdb800de2a 100644
--- a/IO/Geometry/vtkOpenFOAMReader.h
+++ b/IO/Geometry/vtkOpenFOAMReader.h
@@ -62,7 +62,7 @@ class VTKIOGEOMETRY_EXPORT vtkOpenFOAMReader : public vtkMultiBlockDataSetAlgori
public:
static vtkOpenFOAMReader *New();
vtkTypeMacro(vtkOpenFOAMReader, vtkMultiBlockDataSetAlgorithm);
- void PrintSelf(ostream &, vtkIndent) VTK_OVERRIDE;
+ void PrintSelf(ostream &, vtkIndent) override;
/**
* Determine if the file can be read with this reader.
@@ -383,11 +383,11 @@ protected:
int CurrentReaderIndex;
vtkOpenFOAMReader();
- ~vtkOpenFOAMReader() VTK_OVERRIDE;
+ ~vtkOpenFOAMReader() override;
int RequestInformation(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
int RequestData(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
void CreateCasePath(vtkStdString &, vtkStdString &);
void SetTimeInformation(vtkInformationVector *, vtkDoubleArray *);
diff --git a/IO/Geometry/vtkPDBReader.h b/IO/Geometry/vtkPDBReader.h
index 73551e7b42cb1563b7269bda9bede229514df72f..0a79d58ce1f89035f2c28d657ac913d15278e816 100644
--- a/IO/Geometry/vtkPDBReader.h
+++ b/IO/Geometry/vtkPDBReader.h
@@ -34,15 +34,15 @@ class VTKIOGEOMETRY_EXPORT vtkPDBReader : public vtkMoleculeReaderBase
{
public:
vtkTypeMacro(vtkPDBReader,vtkMoleculeReaderBase);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkPDBReader *New();
protected:
vtkPDBReader();
- ~vtkPDBReader() VTK_OVERRIDE;
+ ~vtkPDBReader() override;
- void ReadSpecificMolecule(FILE* fp) VTK_OVERRIDE;
+ void ReadSpecificMolecule(FILE* fp) override;
private:
vtkPDBReader(const vtkPDBReader&) VTK_DELETE_FUNCTION;
diff --git a/IO/Geometry/vtkPTSReader.h b/IO/Geometry/vtkPTSReader.h
index bea7b93810bfa70c5134e6b943ba71875225d199..485eff503f225c2edeb35d850f5deb62a95f039b 100644
--- a/IO/Geometry/vtkPTSReader.h
+++ b/IO/Geometry/vtkPTSReader.h
@@ -34,7 +34,7 @@ class VTKIOGEOMETRY_EXPORT vtkPTSReader : public vtkPolyDataAlgorithm
public:
static vtkPTSReader *New();
vtkTypeMacro(vtkPTSReader,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -114,10 +114,10 @@ public:
protected:
vtkPTSReader();
- ~vtkPTSReader() VTK_OVERRIDE;
+ ~vtkPTSReader() override;
- int RequestInformation(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestInformation(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
char *FileName;
bool OutputDataTypeIsDouble;
diff --git a/IO/Geometry/vtkParticleReader.h b/IO/Geometry/vtkParticleReader.h
index 745baf0ef6a988a7288bb2cbc818f757361043b4..a9c1b31f6ba9878858232de67945445b38a3b2fd 100644
--- a/IO/Geometry/vtkParticleReader.h
+++ b/IO/Geometry/vtkParticleReader.h
@@ -46,7 +46,7 @@ class VTKIOGEOMETRY_EXPORT vtkParticleReader : public vtkPolyDataAlgorithm
public:
static vtkParticleReader *New();
vtkTypeMacro(vtkParticleReader,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -129,15 +129,15 @@ public:
protected:
vtkParticleReader();
- ~vtkParticleReader() VTK_OVERRIDE;
+ ~vtkParticleReader() override;
void OpenFile();
char *FileName;
ifstream *File;
- int RequestInformation(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestInformation(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
//@{
/**
diff --git a/IO/Geometry/vtkProStarReader.h b/IO/Geometry/vtkProStarReader.h
index bd9240f2a42bfa5207d70296bff602bf17db5b07..e673617898953fe3dc7e92d8b4dea446b39a8ac6 100644
--- a/IO/Geometry/vtkProStarReader.h
+++ b/IO/Geometry/vtkProStarReader.h
@@ -35,7 +35,7 @@ class VTKIOGEOMETRY_EXPORT vtkProStarReader : public vtkUnstructuredGridAlgorith
public:
static vtkProStarReader *New();
vtkTypeMacro(vtkProStarReader,vtkUnstructuredGridAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -85,12 +85,12 @@ public:
protected:
vtkProStarReader();
- ~vtkProStarReader() VTK_OVERRIDE;
+ ~vtkProStarReader() override;
int RequestInformation
- (vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ (vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
int RequestData
- (vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ (vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
/**
* The name of the file to be read. If it has a .cel, .vrt, or .inp
diff --git a/IO/Geometry/vtkSTLReader.h b/IO/Geometry/vtkSTLReader.h
index a585fd10473ef0f15e318d450f8e4a07fda87c6e..aee225da74a6930fd21ae614e558b622f8e33a9b 100644
--- a/IO/Geometry/vtkSTLReader.h
+++ b/IO/Geometry/vtkSTLReader.h
@@ -47,7 +47,7 @@ class VTKIOGEOMETRY_EXPORT vtkSTLReader : public vtkAbstractPolyDataReader
{
public:
vtkTypeMacro(vtkSTLReader,vtkAbstractPolyDataReader);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct object with merging set to true.
@@ -58,7 +58,7 @@ public:
* Overload standard modified time function. If locator is modified,
* then this object is modified as well.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
//@{
/**
@@ -89,7 +89,7 @@ public:
protected:
vtkSTLReader();
- ~vtkSTLReader() VTK_OVERRIDE;
+ ~vtkSTLReader() override;
/**
* Create default locator. Used to create one when none is specified.
@@ -100,7 +100,7 @@ protected:
int ScalarTags;
vtkIncrementalPointLocator *Locator;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
bool ReadBinarySTL(FILE *fp, vtkPoints*, vtkCellArray*);
bool ReadASCIISTL(FILE *fp, vtkPoints*, vtkCellArray*,
vtkFloatArray* scalars=nullptr);
diff --git a/IO/Geometry/vtkSTLWriter.h b/IO/Geometry/vtkSTLWriter.h
index 48dc10e485c6443da9c99668ca6cd649bad30b45..5c607374ee02fc69577e138436d4c0520c361d1b 100644
--- a/IO/Geometry/vtkSTLWriter.h
+++ b/IO/Geometry/vtkSTLWriter.h
@@ -42,7 +42,7 @@ class VTKIOGEOMETRY_EXPORT vtkSTLWriter : public vtkWriter
public:
static vtkSTLWriter *New();
vtkTypeMacro(vtkSTLWriter,vtkWriter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -80,13 +80,13 @@ public:
protected:
vtkSTLWriter();
- ~vtkSTLWriter() VTK_OVERRIDE
+ ~vtkSTLWriter() override
{
delete[] this->FileName;
delete[] this->Header;
}
- void WriteData() VTK_OVERRIDE;
+ void WriteData() override;
void WriteBinarySTL(
vtkPoints *pts, vtkCellArray *polys, vtkCellArray *strips);
@@ -97,7 +97,7 @@ protected:
char *Header;
int FileType;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
private:
vtkSTLWriter(const vtkSTLWriter&) VTK_DELETE_FUNCTION;
diff --git a/IO/Geometry/vtkTecplotReader.h b/IO/Geometry/vtkTecplotReader.h
index e7f5ba7bf9f1e5e3004c03079aa2475c71757ff7..af9dff3ab68e601544a95ac8f9c250bb3353cf0a 100644
--- a/IO/Geometry/vtkTecplotReader.h
+++ b/IO/Geometry/vtkTecplotReader.h
@@ -96,7 +96,7 @@ class VTKIOGEOMETRY_EXPORT vtkTecplotReader : public vtkMultiBlockDataSetAlgorit
public:
static vtkTecplotReader * New();
vtkTypeMacro( vtkTecplotReader, vtkMultiBlockDataSetAlgorithm );
- void PrintSelf( ostream & os, vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf( ostream & os, vtkIndent indent ) override;
//@{
/**
@@ -175,14 +175,14 @@ public:
protected:
vtkTecplotReader();
- ~vtkTecplotReader() VTK_OVERRIDE;
+ ~vtkTecplotReader() override;
- int FillOutputPortInformation( int port, vtkInformation * info ) VTK_OVERRIDE;
+ int FillOutputPortInformation( int port, vtkInformation * info ) override;
int RequestInformation( vtkInformation * request,
vtkInformationVector ** inputVector,
- vtkInformationVector * outputVector ) VTK_OVERRIDE;
+ vtkInformationVector * outputVector ) override;
int RequestData
- ( vtkInformation *, vtkInformationVector **, vtkInformationVector * ) VTK_OVERRIDE;
+ ( vtkInformation *, vtkInformationVector **, vtkInformationVector * ) override;
/**
* A callback function registered with the selection observer.
diff --git a/IO/Geometry/vtkUGFacetReader.h b/IO/Geometry/vtkUGFacetReader.h
index 9ece7bc76f0df0a0c62435e3f76ca5f26c8fe537..480e343614e6f4a5452b90de8f5ef4c8f1054eb0 100644
--- a/IO/Geometry/vtkUGFacetReader.h
+++ b/IO/Geometry/vtkUGFacetReader.h
@@ -36,7 +36,7 @@ class VTKIOGEOMETRY_EXPORT vtkUGFacetReader : public vtkPolyDataAlgorithm
{
public:
vtkTypeMacro(vtkUGFacetReader,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct object to extract all parts, and with point merging
@@ -48,7 +48,7 @@ public:
* Overload standard modified time function. If locator is modified,
* then this object is modified as well.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
//@{
/**
@@ -104,9 +104,9 @@ public:
protected:
vtkUGFacetReader();
- ~vtkUGFacetReader() VTK_OVERRIDE;
+ ~vtkUGFacetReader() override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
char *FileName;
vtkShortArray *PartColors;
diff --git a/IO/Geometry/vtkWindBladeReader.h b/IO/Geometry/vtkWindBladeReader.h
index 41f217bdf23f718597e0ff22f52e4669af34fd3a..6b5761b98c15c2fb7dff3b3bcb4d241bfe0daeba 100644
--- a/IO/Geometry/vtkWindBladeReader.h
+++ b/IO/Geometry/vtkWindBladeReader.h
@@ -50,7 +50,7 @@ class VTKIOGEOMETRY_EXPORT vtkWindBladeReader : public vtkStructuredGridAlgorith
public:
static vtkWindBladeReader *New();
vtkTypeMacro(vtkWindBladeReader,vtkStructuredGridAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
vtkSetStringMacro(Filename);
vtkGetStringMacro(Filename);
@@ -98,7 +98,7 @@ protected:
static int INTEGER;
vtkWindBladeReader();
- ~vtkWindBladeReader() VTK_OVERRIDE;
+ ~vtkWindBladeReader() override;
char* Filename; // Base file name
@@ -236,11 +236,11 @@ protected:
void ReadBladeData(std::stringstream &inStr);
int RequestInformation(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
int RequestData(
vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
static void SelectionCallback(
vtkObject *caller,
@@ -253,7 +253,7 @@ protected:
unsigned long eid,
void* clientdata, void* calldata);
- int FillOutputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
+ int FillOutputPortInformation(int, vtkInformation*) override;
/**
* We intercept the requests to check for which port
@@ -263,7 +263,7 @@ protected:
*/
int ProcessRequest(vtkInformation *request,
vtkInformationVector **inInfo,
- vtkInformationVector *outInfo) VTK_OVERRIDE;
+ vtkInformationVector *outInfo) override;
private:
WindBladeReaderInternal * Internal;
diff --git a/IO/Geometry/vtkXYZMolReader.h b/IO/Geometry/vtkXYZMolReader.h
index 765d9ef613c4a1711da3f36ae1097c1f006e6dce..cc47d462cb3d3e24b312d8121ed1e8f0e765a03d 100644
--- a/IO/Geometry/vtkXYZMolReader.h
+++ b/IO/Geometry/vtkXYZMolReader.h
@@ -34,7 +34,7 @@ class VTKIOGEOMETRY_EXPORT vtkXYZMolReader : public vtkMoleculeReaderBase
{
public:
vtkTypeMacro(vtkXYZMolReader,vtkMoleculeReaderBase);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkXYZMolReader *New();
@@ -62,9 +62,9 @@ public:
protected:
vtkXYZMolReader();
- ~vtkXYZMolReader() VTK_OVERRIDE;
+ ~vtkXYZMolReader() override;
- void ReadSpecificMolecule(FILE* fp) VTK_OVERRIDE;
+ void ReadSpecificMolecule(FILE* fp) override;
/**
* Get next line that is not a comment. It returns the beginning of data on
diff --git a/IO/Image/vtkBMPReader.h b/IO/Image/vtkBMPReader.h
index 704c2e52423078c4734953bd23fe846b7d2affc9..025ef0cdaf7a73c6cd65e846869b4fbeca24ef4d 100644
--- a/IO/Image/vtkBMPReader.h
+++ b/IO/Image/vtkBMPReader.h
@@ -51,7 +51,7 @@ public:
static vtkBMPReader *New();
vtkTypeMacro(vtkBMPReader,vtkImageReader);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -63,14 +63,14 @@ public:
/**
* Is the given file a BMP file?
*/
- int CanReadFile(const char* fname) VTK_OVERRIDE;
+ int CanReadFile(const char* fname) override;
/**
* Get the file extensions for this format.
* Returns a string with a space separated list of extensions in
* the format .extension
*/
- const char* GetFileExtensions() VTK_OVERRIDE
+ const char* GetFileExtensions() override
{
return ".bmp";
}
@@ -78,7 +78,7 @@ public:
/**
* Return a descriptive name for the file format that might be useful in a GUI.
*/
- const char* GetDescriptiveName() VTK_OVERRIDE
+ const char* GetDescriptiveName() override
{
return "Windows BMP";
}
@@ -105,16 +105,16 @@ public:
protected:
vtkBMPReader();
- ~vtkBMPReader() VTK_OVERRIDE;
+ ~vtkBMPReader() override;
unsigned char *Colors;
short Depth;
int Allow8BitBMP;
vtkLookupTable *LookupTable;
- void ComputeDataIncrements() VTK_OVERRIDE;
- void ExecuteInformation() VTK_OVERRIDE;
- void ExecuteDataWithInformation(vtkDataObject *out, vtkInformation* outInfo) VTK_OVERRIDE;
+ void ComputeDataIncrements() override;
+ void ExecuteInformation() override;
+ void ExecuteDataWithInformation(vtkDataObject *out, vtkInformation* outInfo) override;
private:
vtkBMPReader(const vtkBMPReader&) VTK_DELETE_FUNCTION;
void operator=(const vtkBMPReader&) VTK_DELETE_FUNCTION;
diff --git a/IO/Image/vtkBMPWriter.h b/IO/Image/vtkBMPWriter.h
index 6843515eb6bd18acd64f69bcad977d970f7012a5..8b4b7242167b6210e444b1ca129182dd84a534a1 100644
--- a/IO/Image/vtkBMPWriter.h
+++ b/IO/Image/vtkBMPWriter.h
@@ -34,14 +34,14 @@ class VTKIOIMAGE_EXPORT vtkBMPWriter : public vtkImageWriter
public:
static vtkBMPWriter *New();
vtkTypeMacro(vtkBMPWriter,vtkImageWriter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkBMPWriter();
- ~vtkBMPWriter() VTK_OVERRIDE {}
+ ~vtkBMPWriter() override {}
- void WriteFile(ofstream *file, vtkImageData *data, int ext[6], int wExt[6]) VTK_OVERRIDE;
- void WriteFileHeader(ofstream *, vtkImageData *, int wExt[6]) VTK_OVERRIDE;
+ void WriteFile(ofstream *file, vtkImageData *data, int ext[6], int wExt[6]) override;
+ void WriteFileHeader(ofstream *, vtkImageData *, int wExt[6]) override;
private:
vtkBMPWriter(const vtkBMPWriter&) VTK_DELETE_FUNCTION;
void operator=(const vtkBMPWriter&) VTK_DELETE_FUNCTION;
diff --git a/IO/Image/vtkDEMReader.h b/IO/Image/vtkDEMReader.h
index 55c64260e9340dc0c58e15bb1df97dd91301c7c1..251aab17735a73288899ecbf0a0f4966e348457d 100644
--- a/IO/Image/vtkDEMReader.h
+++ b/IO/Image/vtkDEMReader.h
@@ -37,7 +37,7 @@ class VTKIOIMAGE_EXPORT vtkDEMReader : public vtkImageAlgorithm
public:
static vtkDEMReader *New();
vtkTypeMacro(vtkDEMReader,vtkImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -176,11 +176,11 @@ public:
* to 1 and the output scalar type is VTK_FLOAT.
*/
int RequestInformation (vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
protected:
vtkDEMReader();
- ~vtkDEMReader() VTK_OVERRIDE;
+ ~vtkDEMReader() override;
vtkTimeStamp ReadHeaderTime;
int NumberOfColumns;
@@ -212,7 +212,7 @@ protected:
int ReadProfiles (vtkImageData *data);
int RequestData( vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
private:
vtkDEMReader(const vtkDEMReader&) VTK_DELETE_FUNCTION;
diff --git a/IO/Image/vtkDICOMImageReader.h b/IO/Image/vtkDICOMImageReader.h
index 1c4815311147736833421e15d8dce9d4df14ae3f..ecf384458992d3d4d64015e82f43c9fc6887e0c5 100644
--- a/IO/Image/vtkDICOMImageReader.h
+++ b/IO/Image/vtkDICOMImageReader.h
@@ -58,14 +58,14 @@ class VTKIOIMAGE_EXPORT vtkDICOMImageReader : public vtkImageReader2
/**
* Prints the ivars.
*/
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
* Set the filename for the file to read. If this method is used,
* the reader will only read a single file.
*/
- void SetFileName(const char* fn) VTK_OVERRIDE
+ void SetFileName(const char* fn) override
{
delete [] this->DirectoryName;
delete [] this->FileName;
@@ -181,12 +181,12 @@ class VTKIOIMAGE_EXPORT vtkDICOMImageReader : public vtkImageReader2
//
// Can I read the file?
//
- int CanReadFile(const char* fname) VTK_OVERRIDE;
+ int CanReadFile(const char* fname) override;
//
// What file extensions are supported?
//
- const char* GetFileExtensions() VTK_OVERRIDE
+ const char* GetFileExtensions() override
{
return ".dcm";
}
@@ -194,7 +194,7 @@ class VTKIOIMAGE_EXPORT vtkDICOMImageReader : public vtkImageReader2
/**
* Return a descriptive name for the file format that might be useful in a GUI.
*/
- const char* GetDescriptiveName() VTK_OVERRIDE
+ const char* GetDescriptiveName() override
{
return "DICOM";
}
@@ -205,8 +205,8 @@ protected:
//
void SetupOutputInformation(int num_slices);
- void ExecuteInformation() VTK_OVERRIDE;
- void ExecuteDataWithInformation(vtkDataObject *out, vtkInformation *outInfo) VTK_OVERRIDE;
+ void ExecuteInformation() override;
+ void ExecuteDataWithInformation(vtkDataObject *out, vtkInformation *outInfo) override;
//
// Constructor
@@ -216,7 +216,7 @@ protected:
//
// Destructor
//
- ~vtkDICOMImageReader() VTK_OVERRIDE;
+ ~vtkDICOMImageReader() override;
//
// Instance of the parser used to parse the file.
diff --git a/IO/Image/vtkGESignaReader.h b/IO/Image/vtkGESignaReader.h
index c29be83780cba672fd23db25440edfc46a772787..1d78e0f7e9a2dff0e94486fccb46f8ec1626964c 100644
--- a/IO/Image/vtkGESignaReader.h
+++ b/IO/Image/vtkGESignaReader.h
@@ -40,17 +40,17 @@ class VTKIOIMAGE_EXPORT vtkGESignaReader : public vtkMedicalImageReader2
public:
static vtkGESignaReader *New();
vtkTypeMacro(vtkGESignaReader,vtkMedicalImageReader2);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Is the given file a GESigna file?
*/
- int CanReadFile(const char* fname) VTK_OVERRIDE;
+ int CanReadFile(const char* fname) override;
/**
* Valid extentsions
*/
- const char* GetFileExtensions() VTK_OVERRIDE
+ const char* GetFileExtensions() override
{
return ".MR .CT";
}
@@ -58,17 +58,17 @@ public:
/**
* A descriptive name for this format
*/
- const char* GetDescriptiveName() VTK_OVERRIDE
+ const char* GetDescriptiveName() override
{
return "GESigna";
}
protected:
vtkGESignaReader() {}
- ~vtkGESignaReader() VTK_OVERRIDE {}
+ ~vtkGESignaReader() override {}
- void ExecuteInformation() VTK_OVERRIDE;
- void ExecuteDataWithInformation(vtkDataObject *out, vtkInformation* outInfo) VTK_OVERRIDE;
+ void ExecuteInformation() override;
+ void ExecuteDataWithInformation(vtkDataObject *out, vtkInformation* outInfo) override;
private:
vtkGESignaReader(const vtkGESignaReader&) VTK_DELETE_FUNCTION;
diff --git a/IO/Image/vtkImageExport.h b/IO/Image/vtkImageExport.h
index 7435308104e1c335244de3703a49c8d2543d303e..c2f23fa874cc27840d8e92c356e6094d3e596602 100644
--- a/IO/Image/vtkImageExport.h
+++ b/IO/Image/vtkImageExport.h
@@ -40,7 +40,7 @@ class VTKIOIMAGE_EXPORT vtkImageExport : public vtkImageAlgorithm
public:
static vtkImageExport *New();
vtkTypeMacro(vtkImageExport,vtkImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Get the number of bytes required for the output C array.
@@ -175,12 +175,12 @@ public:
protected:
vtkImageExport();
- ~vtkImageExport() VTK_OVERRIDE;
+ ~vtkImageExport() override;
// This is called by the superclass.
int RequestData(vtkInformation *request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
virtual void UpdateInformationCallback();
virtual int PipelineModifiedCallback();
diff --git a/IO/Image/vtkImageImport.h b/IO/Image/vtkImageImport.h
index 33e49048db3a2df37ccef144b875da26bccd8eee..72d3269edb13603dd9454cdf0cbd6db0fd7aa0bf 100644
--- a/IO/Image/vtkImageImport.h
+++ b/IO/Image/vtkImageImport.h
@@ -40,7 +40,7 @@ class VTKIOIMAGE_EXPORT vtkImageImport : public vtkImageAlgorithm
public:
static vtkImageImport *New();
vtkTypeMacro(vtkImageImport,vtkImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Import data and make an internal copy of it. If you do not want
@@ -143,7 +143,7 @@ public:
*/
int RequestUpdateExtent( vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
/**
* Override vtkAlgorithm
*/
@@ -152,7 +152,7 @@ public:
vtkInformationVector** inInfoVec,
vtkInformationVector* outInfoVec,
int requestFromOutputPort,
- vtkMTimeType* mtime) VTK_OVERRIDE;
+ vtkMTimeType* mtime) override;
//@{
/**
@@ -320,10 +320,10 @@ public:
protected:
vtkImageImport();
- ~vtkImageImport() VTK_OVERRIDE;
+ ~vtkImageImport() override;
int RequestInformation (vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
void *ImportVoidPointer;
@@ -352,7 +352,7 @@ protected:
DataExtentCallbackType DataExtentCallback;
BufferPointerCallbackType BufferPointerCallback;
- void ExecuteDataWithInformation(vtkDataObject *d, vtkInformation* outInfo) VTK_OVERRIDE;
+ void ExecuteDataWithInformation(vtkDataObject *d, vtkInformation* outInfo) override;
private:
vtkImageImport(const vtkImageImport&) VTK_DELETE_FUNCTION;
diff --git a/IO/Image/vtkImageImportExecutive.h b/IO/Image/vtkImageImportExecutive.h
index cd663f2a56d2e1ad9fe26121ff9b0c595b72bd50..b0cf0cbe7ab7f57ce3b9bd98d749f4531bc9227b 100644
--- a/IO/Image/vtkImageImportExecutive.h
+++ b/IO/Image/vtkImageImportExecutive.h
@@ -37,11 +37,11 @@ public:
*/
int ProcessRequest(vtkInformation* request,
vtkInformationVector** inInfo,
- vtkInformationVector* outInfo) VTK_OVERRIDE;
+ vtkInformationVector* outInfo) override;
protected:
vtkImageImportExecutive() {}
- ~vtkImageImportExecutive() VTK_OVERRIDE {}
+ ~vtkImageImportExecutive() override {}
private:
vtkImageImportExecutive(const vtkImageImportExecutive&) VTK_DELETE_FUNCTION;
diff --git a/IO/Image/vtkImageReader.h b/IO/Image/vtkImageReader.h
index 95ad4f888dcf68154edbdab7e5e1f22bfb548c85..4bbcf39db6685496b1cde618d8d2393ecfc26706 100644
--- a/IO/Image/vtkImageReader.h
+++ b/IO/Image/vtkImageReader.h
@@ -40,7 +40,7 @@ class VTKIOIMAGE_EXPORT vtkImageReader : public vtkImageReader2
public:
static vtkImageReader *New();
vtkTypeMacro(vtkImageReader,vtkImageReader2);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -92,7 +92,7 @@ public:
protected:
vtkImageReader();
- ~vtkImageReader() VTK_OVERRIDE;
+ ~vtkImageReader() override;
vtkTypeUInt64 DataMask;
@@ -111,9 +111,9 @@ protected:
int RequestInformation(vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
- void ExecuteDataWithInformation(vtkDataObject *data, vtkInformation *outInfo) VTK_OVERRIDE;
+ void ExecuteDataWithInformation(vtkDataObject *data, vtkInformation *outInfo) override;
private:
vtkImageReader(const vtkImageReader&) VTK_DELETE_FUNCTION;
void operator=(const vtkImageReader&) VTK_DELETE_FUNCTION;
diff --git a/IO/Image/vtkImageReader2.h b/IO/Image/vtkImageReader2.h
index cc0d3d85f4ffa2df0962e5d46afee57a95d188b2..4a75e81d5a78c9f0d44f4871ec3ec92870cdc5a0 100644
--- a/IO/Image/vtkImageReader2.h
+++ b/IO/Image/vtkImageReader2.h
@@ -54,7 +54,7 @@ class VTKIOIMAGE_EXPORT vtkImageReader2 : public vtkImageAlgorithm
public:
static vtkImageReader2 *New();
vtkTypeMacro(vtkImageReader2,vtkImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -301,7 +301,7 @@ public:
}
protected:
vtkImageReader2();
- ~vtkImageReader2() VTK_OVERRIDE;
+ ~vtkImageReader2() override;
//@}
vtkStringArray *FileNames;
@@ -334,9 +334,9 @@ protected:
int RequestInformation(vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
virtual void ExecuteInformation();
- void ExecuteDataWithInformation(vtkDataObject *data, vtkInformation *outInfo) VTK_OVERRIDE;
+ void ExecuteDataWithInformation(vtkDataObject *data, vtkInformation *outInfo) override;
virtual void ComputeDataIncrements();
private:
vtkImageReader2(const vtkImageReader2&) VTK_DELETE_FUNCTION;
diff --git a/IO/Image/vtkImageReader2Collection.h b/IO/Image/vtkImageReader2Collection.h
index 44f34bfbae204047bb2ed132301a1e3228112cb5..5bbd567f7b7720754eee87666c8aa011e7387f92 100644
--- a/IO/Image/vtkImageReader2Collection.h
+++ b/IO/Image/vtkImageReader2Collection.h
@@ -35,7 +35,7 @@ class VTKIOIMAGE_EXPORT vtkImageReader2Collection : public vtkCollection
public:
vtkTypeMacro(vtkImageReader2Collection,vtkCollection);
static vtkImageReader2Collection *New();
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Add an image reader to the list.
@@ -55,7 +55,7 @@ public:
protected:
vtkImageReader2Collection() {}
- ~vtkImageReader2Collection() VTK_OVERRIDE {}
+ ~vtkImageReader2Collection() override {}
private:
diff --git a/IO/Image/vtkImageReader2Factory.h b/IO/Image/vtkImageReader2Factory.h
index a47253c2b3e96a18ddb7ecfb267dd2779a53d4b2..e7ee2bf5836abb92c69de94061ea2d7d6617fb06 100644
--- a/IO/Image/vtkImageReader2Factory.h
+++ b/IO/Image/vtkImageReader2Factory.h
@@ -48,7 +48,7 @@ class VTKIOIMAGE_EXPORT vtkImageReader2Factory : public vtkObject
public:
static vtkImageReader2Factory *New();
vtkTypeMacro(vtkImageReader2Factory,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* registered readers will be queried in CreateImageReader2 to
@@ -72,7 +72,7 @@ public:
protected:
vtkImageReader2Factory();
- ~vtkImageReader2Factory() VTK_OVERRIDE;
+ ~vtkImageReader2Factory() override;
static void InitializeReaders();
diff --git a/IO/Image/vtkImageWriter.h b/IO/Image/vtkImageWriter.h
index c231bfcf977f949168c2effca4b670e1d1536531..3d3f0497d18797d025224a7d2e825a04bd0609f6 100644
--- a/IO/Image/vtkImageWriter.h
+++ b/IO/Image/vtkImageWriter.h
@@ -34,7 +34,7 @@ class VTKIOIMAGE_EXPORT vtkImageWriter : public vtkImageAlgorithm
public:
static vtkImageWriter *New();
vtkTypeMacro(vtkImageWriter,vtkImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -88,7 +88,7 @@ public:
protected:
vtkImageWriter();
- ~vtkImageWriter() VTK_OVERRIDE;
+ ~vtkImageWriter() override;
int FileDimensionality;
char *FilePrefix;
@@ -122,7 +122,7 @@ protected:
// This is the method you should override.
int RequestData(vtkInformation *request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
int MinimumFileNumber;
int MaximumFileNumber;
diff --git a/IO/Image/vtkJPEGReader.h b/IO/Image/vtkJPEGReader.h
index eb86468174b4c3d6425384688df45f5f677448b2..773d7739c31c58c063a133e7462ce248da809556 100644
--- a/IO/Image/vtkJPEGReader.h
+++ b/IO/Image/vtkJPEGReader.h
@@ -36,19 +36,19 @@ class VTKIOIMAGE_EXPORT vtkJPEGReader : public vtkImageReader2
public:
static vtkJPEGReader *New();
vtkTypeMacro(vtkJPEGReader,vtkImageReader2);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Is the given file a JPEG file?
*/
- int CanReadFile(const char* fname) VTK_OVERRIDE;
+ int CanReadFile(const char* fname) override;
/**
* Get the file extensions for this format.
* Returns a string with a space separated list of extensions in
* the format .extension
*/
- const char* GetFileExtensions() VTK_OVERRIDE
+ const char* GetFileExtensions() override
{
return ".jpeg .jpg";
}
@@ -56,16 +56,16 @@ public:
/**
* Return a descriptive name for the file format that might be useful in a GUI.
*/
- const char* GetDescriptiveName() VTK_OVERRIDE
+ const char* GetDescriptiveName() override
{
return "JPEG";
}
protected:
vtkJPEGReader() {}
- ~vtkJPEGReader() VTK_OVERRIDE {}
+ ~vtkJPEGReader() override {}
- void ExecuteInformation() VTK_OVERRIDE;
- void ExecuteDataWithInformation(vtkDataObject *out, vtkInformation *outInfo) VTK_OVERRIDE;
+ void ExecuteInformation() override;
+ void ExecuteDataWithInformation(vtkDataObject *out, vtkInformation *outInfo) override;
private:
vtkJPEGReader(const vtkJPEGReader&) VTK_DELETE_FUNCTION;
void operator=(const vtkJPEGReader&) VTK_DELETE_FUNCTION;
diff --git a/IO/Image/vtkJPEGWriter.h b/IO/Image/vtkJPEGWriter.h
index f882adc6102b7e40cc541611fd7e0aa3eafa4aa9..79c4d136b22531543c2f93874f551374aabf8aaf 100644
--- a/IO/Image/vtkJPEGWriter.h
+++ b/IO/Image/vtkJPEGWriter.h
@@ -38,12 +38,12 @@ class VTKIOIMAGE_EXPORT vtkJPEGWriter : public vtkImageWriter
public:
static vtkJPEGWriter *New();
vtkTypeMacro(vtkJPEGWriter,vtkImageWriter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* The main interface which triggers the writer to start.
*/
- void Write() VTK_OVERRIDE;
+ void Write() override;
//@{
/**
@@ -82,7 +82,7 @@ public:
protected:
vtkJPEGWriter();
- ~vtkJPEGWriter() VTK_OVERRIDE;
+ ~vtkJPEGWriter() override;
void WriteSlice(vtkImageData *data, int* uExtent);
diff --git a/IO/Image/vtkJSONImageWriter.h b/IO/Image/vtkJSONImageWriter.h
index fa9fa9dc2e93e8defd4ec567f8000dc2bb49cfab..c7934fb3e5fe5bee3eb471ae66ffcc3332fe0d42 100644
--- a/IO/Image/vtkJSONImageWriter.h
+++ b/IO/Image/vtkJSONImageWriter.h
@@ -31,7 +31,7 @@ class VTKIOIMAGE_EXPORT vtkJSONImageWriter : public vtkImageAlgorithm
public:
static vtkJSONImageWriter *New();
vtkTypeMacro(vtkJSONImageWriter,vtkImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -64,7 +64,7 @@ public:
protected:
vtkJSONImageWriter();
- ~vtkJSONImageWriter() VTK_OVERRIDE;
+ ~vtkJSONImageWriter() override;
char *FileName;
char *ArrayName;
@@ -72,7 +72,7 @@ protected:
int RequestData(vtkInformation *request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
private:
vtkJSONImageWriter(const vtkJSONImageWriter&) VTK_DELETE_FUNCTION;
diff --git a/IO/Image/vtkMRCReader.h b/IO/Image/vtkMRCReader.h
index 77427a677df9d1ec5455341bb76269e9a39247ec..51f75ae9e03ff3811f049298ad5131aefdd2cf56 100644
--- a/IO/Image/vtkMRCReader.h
+++ b/IO/Image/vtkMRCReader.h
@@ -36,7 +36,7 @@ public:
static vtkMRCReader* New();
vtkTypeMacro(vtkMRCReader, vtkImageAlgorithm)
- void PrintSelf(ostream& stream, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& stream, vtkIndent indent) override;
// .Description
// Get/Set the file to read
@@ -45,13 +45,13 @@ public:
protected:
vtkMRCReader();
- ~vtkMRCReader() VTK_OVERRIDE;
+ ~vtkMRCReader() override;
int RequestInformation(vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
void ExecuteDataWithInformation(vtkDataObject *output,
- vtkInformation* outInfo) VTK_OVERRIDE;
+ vtkInformation* outInfo) override;
char* FileName;
diff --git a/IO/Image/vtkMedicalImageProperties.h b/IO/Image/vtkMedicalImageProperties.h
index 428c045ae08aa32592e81da41cba744875e0bb1c..340251e744dda781e66b3a74f5f1efff2532597f 100644
--- a/IO/Image/vtkMedicalImageProperties.h
+++ b/IO/Image/vtkMedicalImageProperties.h
@@ -37,7 +37,7 @@ class VTKIOIMAGE_EXPORT vtkMedicalImageProperties : public vtkObject
public:
static vtkMedicalImageProperties *New();
vtkTypeMacro(vtkMedicalImageProperties,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Convenience method to reset all fields to an emptry string/value
@@ -480,7 +480,7 @@ public:
protected:
vtkMedicalImageProperties();
- ~vtkMedicalImageProperties() VTK_OVERRIDE;
+ ~vtkMedicalImageProperties() override;
char *StudyDate;
char *AcquisitionDate;
diff --git a/IO/Image/vtkMedicalImageReader2.h b/IO/Image/vtkMedicalImageReader2.h
index e93d43f1e84baefd3aa690f9821f1a573fb623e2..275974d2dfe7eac0c6eaf01f7e91ad80923c7776 100644
--- a/IO/Image/vtkMedicalImageReader2.h
+++ b/IO/Image/vtkMedicalImageReader2.h
@@ -36,7 +36,7 @@ class VTKIOIMAGE_EXPORT vtkMedicalImageReader2 : public vtkImageReader2
public:
static vtkMedicalImageReader2 *New();
vtkTypeMacro(vtkMedicalImageReader2,vtkImageReader2);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -68,7 +68,7 @@ public:
protected:
vtkMedicalImageReader2();
- ~vtkMedicalImageReader2() VTK_OVERRIDE;
+ ~vtkMedicalImageReader2() override;
/**
* Medical Image properties
diff --git a/IO/Image/vtkMetaImageReader.h b/IO/Image/vtkMetaImageReader.h
index e4facf1ad63504e755881e959c8a207cea2735f3..d3b27a3b3dc34108900cd4f2082bdb0562b57153 100644
--- a/IO/Image/vtkMetaImageReader.h
+++ b/IO/Image/vtkMetaImageReader.h
@@ -69,17 +69,17 @@ class VTKIOIMAGE_EXPORT vtkMetaImageReader : public vtkImageReader2
{
public:
vtkTypeMacro(vtkMetaImageReader,vtkImageReader2);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct object with FlipNormals turned off and Normals set to true.
*/
static vtkMetaImageReader *New();
- const char * GetFileExtensions() VTK_OVERRIDE
+ const char * GetFileExtensions() override
{ return ".mhd .mha"; }
- const char * GetDescriptiveName() VTK_OVERRIDE
+ const char * GetDescriptiveName() override
{ return "MetaIO Library: MetaImage"; }
// These duplicate functions in vtkImageReader2, vtkMedicalImageReader.
@@ -95,7 +95,7 @@ public:
{ return this->GetNumberOfScalarComponents(); }
int GetPixelRepresentation()
{ return this->GetDataScalarType(); }
- int GetDataByteOrder(void) VTK_OVERRIDE;
+ int GetDataByteOrder(void) override;
vtkGetMacro(RescaleSlope, double);
vtkGetMacro(RescaleOffset, double);
@@ -117,11 +117,11 @@ public:
* Test whether the file with the given name can be read by this
* reader.
*/
- int CanReadFile(const char* name) VTK_OVERRIDE;
+ int CanReadFile(const char* name) override;
protected:
vtkMetaImageReader();
- ~vtkMetaImageReader() VTK_OVERRIDE;
+ ~vtkMetaImageReader() override;
// These functions make no sense for this (or most) file readers
// and should be hidden from the user...but then the getsettest fails.
@@ -173,11 +173,11 @@ protected:
unsigned long GetHeaderSize(void)
{ return vtkImageReader2::GetHeaderSize(); }*/
- void ExecuteInformation() VTK_OVERRIDE;
- void ExecuteDataWithInformation(vtkDataObject *out, vtkInformation *outInfo) VTK_OVERRIDE;
+ void ExecuteInformation() override;
+ void ExecuteDataWithInformation(vtkDataObject *out, vtkInformation *outInfo) override;
int RequestInformation(vtkInformation * request,
vtkInformationVector ** inputVector,
- vtkInformationVector * outputVector) VTK_OVERRIDE;
+ vtkInformationVector * outputVector) override;
private:
vtkMetaImageReader(const vtkMetaImageReader&) VTK_DELETE_FUNCTION;
diff --git a/IO/Image/vtkMetaImageWriter.h b/IO/Image/vtkMetaImageWriter.h
index ee16414c4438fbbb460a12fe8c6ad8e4e4195ec2..4b77f54da979eb81d8334021b9c9131f25d84573 100644
--- a/IO/Image/vtkMetaImageWriter.h
+++ b/IO/Image/vtkMetaImageWriter.h
@@ -71,7 +71,7 @@ class VTKIOIMAGE_EXPORT vtkMetaImageWriter : public vtkImageWriter
{
public:
vtkTypeMacro(vtkMetaImageWriter,vtkImageWriter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct object with FlipNormals turned off and Normals set to true.
@@ -81,8 +81,8 @@ public:
/**
* Specify file name of meta file
*/
- void SetFileName(const char* fname) VTK_OVERRIDE;
- char* GetFileName() VTK_OVERRIDE { return this->MHDFileName; }
+ void SetFileName(const char* fname) override;
+ char* GetFileName() override { return this->MHDFileName; }
//@{
/**
@@ -103,11 +103,11 @@ public:
// This is called by the superclass.
// This is the method you should override.
- void Write() VTK_OVERRIDE;
+ void Write() override;
protected:
vtkMetaImageWriter();
- ~vtkMetaImageWriter() VTK_OVERRIDE;
+ ~vtkMetaImageWriter() override;
vtkSetStringMacro(MHDFileName);
char* MHDFileName;
diff --git a/IO/Image/vtkNIFTIImageHeader.h b/IO/Image/vtkNIFTIImageHeader.h
index 974555a3558e0ad819084c0a66ed54b6651eecbd..ac9b1f2ff928232089d7c201f51b0ae393e6f9d0 100644
--- a/IO/Image/vtkNIFTIImageHeader.h
+++ b/IO/Image/vtkNIFTIImageHeader.h
@@ -179,7 +179,7 @@ public:
/**
* Print information about this object.
*/
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Get the magic number for the NIFTI file as a null-terminated string.
@@ -398,7 +398,7 @@ public:
protected:
vtkNIFTIImageHeader();
- ~vtkNIFTIImageHeader() VTK_OVERRIDE;
+ ~vtkNIFTIImageHeader() override;
char Magic[12];
vtkTypeInt64 VoxOffset;
diff --git a/IO/Image/vtkNIFTIImageReader.h b/IO/Image/vtkNIFTIImageReader.h
index e2fc5578044aa88250fcb88978303716a2fa5142..d284e6bf0278696810ec8f7a7f7b7e3698995e74 100644
--- a/IO/Image/vtkNIFTIImageReader.h
+++ b/IO/Image/vtkNIFTIImageReader.h
@@ -58,24 +58,24 @@ public:
/**
* Print information about this object.
*/
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Valid extensions for this file type.
*/
- const char* GetFileExtensions() VTK_OVERRIDE {
+ const char* GetFileExtensions() override {
return ".nii .nii.gz .img .img.gz .hdr .hdr.gz"; }
/**
* Return a descriptive name that might be useful in a GUI.
*/
- const char* GetDescriptiveName() VTK_OVERRIDE {
+ const char* GetDescriptiveName() override {
return "NIfTI"; }
/**
* Return true if this reader can read the given file.
*/
- int CanReadFile(const char* filename) VTK_OVERRIDE;
+ int CanReadFile(const char* filename) override;
//@{
/**
@@ -168,21 +168,21 @@ public:
protected:
vtkNIFTIImageReader();
- ~vtkNIFTIImageReader() VTK_OVERRIDE;
+ ~vtkNIFTIImageReader() override;
/**
* Read the header information.
*/
int RequestInformation(
vtkInformation* request, vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
/**
* Read the voxel data.
*/
int RequestData(
vtkInformation* request, vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
/**
* Do a case-insensitive check for the given extension.
diff --git a/IO/Image/vtkNIFTIImageWriter.h b/IO/Image/vtkNIFTIImageWriter.h
index 447517ca276fdaed9d9dc53b5ac6f7dd4521ba04..bc131909f1cc1ab80e76bdf0172a7113cbc805f4 100644
--- a/IO/Image/vtkNIFTIImageWriter.h
+++ b/IO/Image/vtkNIFTIImageWriter.h
@@ -53,7 +53,7 @@ public:
/**
* Print information about this object.
*/
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -160,7 +160,7 @@ public:
protected:
vtkNIFTIImageWriter();
- ~vtkNIFTIImageWriter() VTK_OVERRIDE;
+ ~vtkNIFTIImageWriter() override;
/**
* Generate the header information for the file.
@@ -172,7 +172,7 @@ protected:
*/
int RequestData(vtkInformation *request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
/**
* Make a new filename by replacing extension "ext1" with "ext2".
diff --git a/IO/Image/vtkNrrdReader.h b/IO/Image/vtkNrrdReader.h
index e6b6e6aa526014efd0441b17086fcf298e4f1117..71361931a16c37aed0dcee2b261b8e735b99b7dc 100644
--- a/IO/Image/vtkNrrdReader.h
+++ b/IO/Image/vtkNrrdReader.h
@@ -46,21 +46,21 @@ class VTKIOIMAGE_EXPORT vtkNrrdReader : public vtkImageReader
public:
vtkTypeMacro(vtkNrrdReader, vtkImageReader);
static vtkNrrdReader *New();
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
- int CanReadFile(const char *filename) VTK_OVERRIDE;
+ int CanReadFile(const char *filename) override;
protected:
vtkNrrdReader();
- ~vtkNrrdReader() VTK_OVERRIDE;
+ ~vtkNrrdReader() override;
int RequestInformation(vtkInformation *request,
vtkInformationVector **inputVector,
- vtkInformationVector *outputVector) VTK_OVERRIDE;
+ vtkInformationVector *outputVector) override;
int RequestData(vtkInformation *request,
vtkInformationVector **inputVector,
- vtkInformationVector *outputVector) VTK_OVERRIDE;
+ vtkInformationVector *outputVector) override;
int ReadHeaderInternal(vtkCharArray *headerBuffer);
virtual int ReadHeader();
diff --git a/IO/Image/vtkPNGReader.h b/IO/Image/vtkPNGReader.h
index a96ebf7b7084aa1e63f6cae6fa3455aa8ed696b3..8b470c4599d36e269f4c80b5aff06f3c034cff7a 100644
--- a/IO/Image/vtkPNGReader.h
+++ b/IO/Image/vtkPNGReader.h
@@ -34,19 +34,19 @@ class VTKIOIMAGE_EXPORT vtkPNGReader : public vtkImageReader2
public:
static vtkPNGReader *New();
vtkTypeMacro(vtkPNGReader,vtkImageReader2);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Is the given file a PNG file?
*/
- int CanReadFile(const char* fname) VTK_OVERRIDE;
+ int CanReadFile(const char* fname) override;
/**
* Get the file extensions for this format.
* Returns a string with a space separated list of extensions in
* the format .extension
*/
- const char* GetFileExtensions() VTK_OVERRIDE
+ const char* GetFileExtensions() override
{
return ".png";
}
@@ -54,7 +54,7 @@ public:
/**
* Return a descriptive name for the file format that might be useful in a GUI.
*/
- const char* GetDescriptiveName() VTK_OVERRIDE
+ const char* GetDescriptiveName() override
{
return "PNG";
}
@@ -93,10 +93,10 @@ public:
//@}
protected:
vtkPNGReader();
- ~vtkPNGReader() VTK_OVERRIDE;
+ ~vtkPNGReader() override;
- void ExecuteInformation() VTK_OVERRIDE;
- void ExecuteDataWithInformation(vtkDataObject *out, vtkInformation *outInfo) VTK_OVERRIDE;
+ void ExecuteInformation() override;
+ void ExecuteDataWithInformation(vtkDataObject *out, vtkInformation *outInfo) override;
template <class OT>
void vtkPNGReaderUpdate(vtkImageData *data, OT *outPtr);
template <class OT>
diff --git a/IO/Image/vtkPNGWriter.h b/IO/Image/vtkPNGWriter.h
index b256088d0ab4b148a9d6df687d9c45b96550e1f2..2d168a10286e7ce27b4b3fb1fe626fde76e1a7d3 100644
--- a/IO/Image/vtkPNGWriter.h
+++ b/IO/Image/vtkPNGWriter.h
@@ -37,12 +37,12 @@ class VTKIOIMAGE_EXPORT vtkPNGWriter : public vtkImageWriter
public:
static vtkPNGWriter *New();
vtkTypeMacro(vtkPNGWriter,vtkImageWriter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* The main interface which triggers the writer to start.
*/
- void Write() VTK_OVERRIDE;
+ void Write() override;
//@{
/**
@@ -100,7 +100,7 @@ public:
protected:
vtkPNGWriter();
- ~vtkPNGWriter() VTK_OVERRIDE;
+ ~vtkPNGWriter() override;
void WriteSlice(vtkImageData *data, int* uExtent);
int CompressionLevel;
diff --git a/IO/Image/vtkPNMReader.h b/IO/Image/vtkPNMReader.h
index cdeff6d4e2e7de29f237de13e52a30c7ab9152f0..7a12d9bc84b3dd76a5fddfd59e336fcf2c8f6847 100644
--- a/IO/Image/vtkPNMReader.h
+++ b/IO/Image/vtkPNMReader.h
@@ -43,13 +43,13 @@ class VTKIOIMAGE_EXPORT vtkPNMReader : public vtkImageReader
public:
static vtkPNMReader *New();
vtkTypeMacro(vtkPNMReader,vtkImageReader);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
- int CanReadFile(const char* fname) VTK_OVERRIDE;
+ int CanReadFile(const char* fname) override;
/**
* .pnm .pgm .ppm
*/
- const char* GetFileExtensions() VTK_OVERRIDE
+ const char* GetFileExtensions() override
{
return ".pnm .pgm .ppm";
}
@@ -57,15 +57,15 @@ public:
/**
* PNM
*/
- const char* GetDescriptiveName() VTK_OVERRIDE
+ const char* GetDescriptiveName() override
{
return "PNM";
}
protected:
vtkPNMReader() {}
- ~vtkPNMReader() VTK_OVERRIDE {}
- void ExecuteInformation() VTK_OVERRIDE;
+ ~vtkPNMReader() override {}
+ void ExecuteInformation() override;
private:
vtkPNMReader(const vtkPNMReader&) VTK_DELETE_FUNCTION;
void operator=(const vtkPNMReader&) VTK_DELETE_FUNCTION;
diff --git a/IO/Image/vtkPNMWriter.h b/IO/Image/vtkPNMWriter.h
index 95ccd921b1861205b8cf83321a73d380acc8f95a..77285be2b7dd4ab0ff3dc282db45acd55de5efba 100644
--- a/IO/Image/vtkPNMWriter.h
+++ b/IO/Image/vtkPNMWriter.h
@@ -31,16 +31,16 @@ class VTKIOIMAGE_EXPORT vtkPNMWriter : public vtkImageWriter
public:
static vtkPNMWriter *New();
vtkTypeMacro(vtkPNMWriter,vtkImageWriter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkPNMWriter() {}
- ~vtkPNMWriter() VTK_OVERRIDE {}
+ ~vtkPNMWriter() override {}
void WriteFile(
- ofstream *file, vtkImageData *data, int extent[6], int wExt[6]) VTK_OVERRIDE;
+ ofstream *file, vtkImageData *data, int extent[6], int wExt[6]) override;
void WriteFileHeader(
- ofstream *, vtkImageData *, int wExt[6]) VTK_OVERRIDE;
+ ofstream *, vtkImageData *, int wExt[6]) override;
private:
vtkPNMWriter(const vtkPNMWriter&) VTK_DELETE_FUNCTION;
void operator=(const vtkPNMWriter&) VTK_DELETE_FUNCTION;
diff --git a/IO/Image/vtkPostScriptWriter.h b/IO/Image/vtkPostScriptWriter.h
index a72b730cd00d78897565c34c99581ba5abeede94..736f825c069e18ae9aea94ceb3c8afcda253285c 100644
--- a/IO/Image/vtkPostScriptWriter.h
+++ b/IO/Image/vtkPostScriptWriter.h
@@ -33,16 +33,16 @@ class VTKIOIMAGE_EXPORT vtkPostScriptWriter : public vtkImageWriter
public:
static vtkPostScriptWriter *New();
vtkTypeMacro(vtkPostScriptWriter,vtkImageWriter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkPostScriptWriter() {}
- ~vtkPostScriptWriter() VTK_OVERRIDE {}
+ ~vtkPostScriptWriter() override {}
void WriteFile(
- ofstream *file, vtkImageData *data, int extent[6], int wExt[6]) VTK_OVERRIDE;
- void WriteFileHeader(ofstream *, vtkImageData *, int wExt[6]) VTK_OVERRIDE;
- void WriteFileTrailer(ofstream *, vtkImageData *) VTK_OVERRIDE;
+ ofstream *file, vtkImageData *data, int extent[6], int wExt[6]) override;
+ void WriteFileHeader(ofstream *, vtkImageData *, int wExt[6]) override;
+ void WriteFileTrailer(ofstream *, vtkImageData *) override;
private:
vtkPostScriptWriter(const vtkPostScriptWriter&) VTK_DELETE_FUNCTION;
void operator=(const vtkPostScriptWriter&) VTK_DELETE_FUNCTION;
diff --git a/IO/Image/vtkSLCReader.h b/IO/Image/vtkSLCReader.h
index b8721eb1ba53feadf2ad9a76c385b5b75e94623e..0c30714ba95e34d05601db7399838e45374856d3 100644
--- a/IO/Image/vtkSLCReader.h
+++ b/IO/Image/vtkSLCReader.h
@@ -33,7 +33,7 @@ class VTKIOIMAGE_EXPORT vtkSLCReader : public vtkImageReader2
public:
static vtkSLCReader *New();
vtkTypeMacro(vtkSLCReader,vtkImageReader2);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -45,11 +45,11 @@ public:
/**
* Is the given file an SLC file?
*/
- int CanReadFile(const char* fname) VTK_OVERRIDE;
+ int CanReadFile(const char* fname) override;
/**
* .slc
*/
- const char* GetFileExtensions() VTK_OVERRIDE
+ const char* GetFileExtensions() override
{
return ".slc";
}
@@ -57,21 +57,21 @@ public:
/**
* SLC
*/
- const char* GetDescriptiveName() VTK_OVERRIDE
+ const char* GetDescriptiveName() override
{
return "SLC";
}
protected:
vtkSLCReader();
- ~vtkSLCReader() VTK_OVERRIDE;
+ ~vtkSLCReader() override;
// Reads the file name and builds a vtkStructuredPoints dataset.
- void ExecuteDataWithInformation(vtkDataObject*, vtkInformation*) VTK_OVERRIDE;
+ void ExecuteDataWithInformation(vtkDataObject*, vtkInformation*) override;
int RequestInformation(vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
// Decodes an array of eight bit run-length encoded data.
unsigned char *Decode8BitData( unsigned char *in_ptr, int size );
diff --git a/IO/Image/vtkTIFFReader.h b/IO/Image/vtkTIFFReader.h
index 32b44c3ec424487a363042c90b1448aa9e4741c4..14cad72ae9b52c14c829cc81ddf98498d216fb81 100644
--- a/IO/Image/vtkTIFFReader.h
+++ b/IO/Image/vtkTIFFReader.h
@@ -33,19 +33,19 @@ class VTKIOIMAGE_EXPORT vtkTIFFReader : public vtkImageReader2
public:
static vtkTIFFReader *New();
vtkTypeMacro(vtkTIFFReader, vtkImageReader2)
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Is the given file name a tiff file?
*/
- int CanReadFile(const char* fname) VTK_OVERRIDE;
+ int CanReadFile(const char* fname) override;
/**
* Get the file extensions for this format.
* Returns a string with a space separated list of extensions in
* the format .extension
*/
- const char* GetFileExtensions() VTK_OVERRIDE
+ const char* GetFileExtensions() override
{
return ".tif .tiff";
}
@@ -54,7 +54,7 @@ public:
* Return a descriptive name for the file format that might be useful
* in a GUI.
*/
- const char* GetDescriptiveName() VTK_OVERRIDE
+ const char* GetDescriptiveName() override
{
return "TIFF";
}
@@ -101,12 +101,12 @@ public:
protected:
vtkTIFFReader();
- ~vtkTIFFReader() VTK_OVERRIDE;
+ ~vtkTIFFReader() override;
enum { NOFORMAT, RGB, GRAYSCALE, PALETTE_RGB, PALETTE_GRAYSCALE, OTHER };
- void ExecuteInformation() VTK_OVERRIDE;
- void ExecuteDataWithInformation(vtkDataObject *out, vtkInformation *outInfo) VTK_OVERRIDE;
+ void ExecuteInformation() override;
+ void ExecuteDataWithInformation(vtkDataObject *out, vtkInformation *outInfo) override;
private:
vtkTIFFReader(const vtkTIFFReader&) VTK_DELETE_FUNCTION;
diff --git a/IO/Image/vtkTIFFWriter.h b/IO/Image/vtkTIFFWriter.h
index 08481a13357bc9995c89f0e3b4000883228c3217..4fd3afbf1febd951393b9b86639dd7ac8a5f8734 100644
--- a/IO/Image/vtkTIFFWriter.h
+++ b/IO/Image/vtkTIFFWriter.h
@@ -35,12 +35,12 @@ class VTKIOIMAGE_EXPORT vtkTIFFWriter : public vtkImageWriter
public:
static vtkTIFFWriter *New();
vtkTypeMacro(vtkTIFFWriter,vtkImageWriter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* The main interface which triggers the writer to start.
*/
- void Write() VTK_OVERRIDE;
+ void Write() override;
enum { // Compression types
NoCompression,
@@ -66,11 +66,11 @@ public:
protected:
vtkTIFFWriter();
- ~vtkTIFFWriter() VTK_OVERRIDE {}
+ ~vtkTIFFWriter() override {}
- void WriteFile(ofstream *file, vtkImageData *data, int ext[6], int wExt[6]) VTK_OVERRIDE;
- void WriteFileHeader(ofstream *, vtkImageData *, int wExt[6]) VTK_OVERRIDE;
- void WriteFileTrailer(ofstream *, vtkImageData *) VTK_OVERRIDE;
+ void WriteFile(ofstream *file, vtkImageData *data, int ext[6], int wExt[6]) override;
+ void WriteFileHeader(ofstream *, vtkImageData *, int wExt[6]) override;
+ void WriteFileTrailer(ofstream *, vtkImageData *) override;
void* TIFFPtr;
int Compression;
diff --git a/IO/Image/vtkVolume16Reader.h b/IO/Image/vtkVolume16Reader.h
index 93abc1533c5bea6a6d187e36e3f40a42a1daf34d..115284d285405cdd8f4e1ebe5a413c6e03f75e8f 100644
--- a/IO/Image/vtkVolume16Reader.h
+++ b/IO/Image/vtkVolume16Reader.h
@@ -62,7 +62,7 @@ class VTKIOIMAGE_EXPORT vtkVolume16Reader : public vtkVolumeReader
{
public:
vtkTypeMacro(vtkVolume16Reader,vtkVolumeReader);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct object with nullptr file prefix; file pattern "%s.%d"; image range
@@ -139,14 +139,14 @@ public:
/**
* Other objects make use of these methods
*/
- vtkImageData *GetImage(int ImageNumber) VTK_OVERRIDE;
+ vtkImageData *GetImage(int ImageNumber) override;
protected:
vtkVolume16Reader();
- ~vtkVolume16Reader() VTK_OVERRIDE;
+ ~vtkVolume16Reader() override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int RequestInformation(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int RequestInformation(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
int DataDimensions[2];
unsigned short DataMask;
int SwapBytes;
diff --git a/IO/Image/vtkVolumeReader.h b/IO/Image/vtkVolumeReader.h
index e7066d6c90e40cf1e9f9d5052795976d48525497..68e382bf9e234912cdb61f09fa17b730eabc2dcd 100644
--- a/IO/Image/vtkVolumeReader.h
+++ b/IO/Image/vtkVolumeReader.h
@@ -52,7 +52,7 @@ class VTKIOIMAGE_EXPORT vtkVolumeReader : public vtkImageAlgorithm
{
public:
vtkTypeMacro(vtkVolumeReader,vtkImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -101,7 +101,7 @@ public:
protected:
vtkVolumeReader();
- ~vtkVolumeReader() VTK_OVERRIDE;
+ ~vtkVolumeReader() override;
char *FilePrefix;
char *FilePattern;
diff --git a/IO/Import/vtk3DSImporter.h b/IO/Import/vtk3DSImporter.h
index 4d0c43657f0b908fbdf20b26d490d7d23d50f2e9..5155a0874b54e3ea8e71eca96d124a4839a1f269 100644
--- a/IO/Import/vtk3DSImporter.h
+++ b/IO/Import/vtk3DSImporter.h
@@ -37,7 +37,7 @@ public:
static vtk3DSImporter *New();
vtkTypeMacro(vtk3DSImporter,vtkImporter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -71,14 +71,14 @@ public:
protected:
vtk3DSImporter();
- ~vtk3DSImporter() VTK_OVERRIDE;
-
- int ImportBegin () VTK_OVERRIDE;
- void ImportEnd () VTK_OVERRIDE;
- void ImportActors (vtkRenderer *renderer) VTK_OVERRIDE;
- void ImportCameras (vtkRenderer *renderer) VTK_OVERRIDE;
- void ImportLights (vtkRenderer *renderer) VTK_OVERRIDE;
- void ImportProperties (vtkRenderer *renderer) VTK_OVERRIDE;
+ ~vtk3DSImporter() override;
+
+ int ImportBegin () override;
+ void ImportEnd () override;
+ void ImportActors (vtkRenderer *renderer) override;
+ void ImportCameras (vtkRenderer *renderer) override;
+ void ImportLights (vtkRenderer *renderer) override;
+ void ImportProperties (vtkRenderer *renderer) override;
vtkPolyData *GeneratePolyData (vtk3DSMesh *meshPtr);
int Read3DS ();
diff --git a/IO/Import/vtkImporter.h b/IO/Import/vtkImporter.h
index 6687e29294cd222297ff6dc6b3de0e08d170294c..9d4e8ad8c079b84c1260d7d4e2db893116955fe8 100644
--- a/IO/Import/vtkImporter.h
+++ b/IO/Import/vtkImporter.h
@@ -55,7 +55,7 @@ class VTKIOIMPORT_EXPORT vtkImporter : public vtkObject
{
public:
vtkTypeMacro(vtkImporter,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
@@ -91,7 +91,7 @@ public:
protected:
vtkImporter();
- ~vtkImporter() VTK_OVERRIDE;
+ ~vtkImporter() override;
virtual int ImportBegin () {return 1;};
virtual void ImportEnd () {}
diff --git a/IO/Import/vtkOBJImporter.h b/IO/Import/vtkOBJImporter.h
index 8b79f127f18747b2e29e53a607b46c34044e85b9..3493600ece055271ee1985986528d53ce995a194 100644
--- a/IO/Import/vtkOBJImporter.h
+++ b/IO/Import/vtkOBJImporter.h
@@ -62,7 +62,7 @@ public:
static vtkOBJImporter *New();
vtkTypeMacro(vtkOBJImporter,vtkImporter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -83,11 +83,11 @@ public:
protected:
vtkOBJImporter();
- ~vtkOBJImporter() VTK_OVERRIDE;
+ ~vtkOBJImporter() override;
- int ImportBegin() VTK_OVERRIDE /*override*/;
- void ImportEnd () VTK_OVERRIDE /*override*/;
- void ReadData() VTK_OVERRIDE /* override */;
+ int ImportBegin() override /*override*/;
+ void ImportEnd () override /*override*/;
+ void ReadData() override /* override */;
vtkSmartPointer<vtkOBJPolyDataProcessor> Impl;
diff --git a/IO/Import/vtkOBJImporterInternals.h b/IO/Import/vtkOBJImporterInternals.h
index e60dedf03770b46053429d25e940638855940305..b795b71016f0c9bf5a279c387ac02306dbbfdeb0 100644
--- a/IO/Import/vtkOBJImporterInternals.h
+++ b/IO/Import/vtkOBJImporterInternals.h
@@ -63,7 +63,7 @@ class vtkOBJPolyDataProcessor : public vtkPolyDataAlgorithm
public:
static vtkOBJPolyDataProcessor *New();
vtkTypeMacro(vtkOBJPolyDataProcessor,vtkPolyDataAlgorithm)
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
// Description:
// Specify file name of Wavefront .obj file.
@@ -149,9 +149,9 @@ public:
void ReadVertices(bool gotFirstUseMaterialTag, char *pLine, float xyz, int lineNr, const double v_scale, bool everything_ok, vtkPoints* points, const bool use_scale);
protected:
vtkOBJPolyDataProcessor();
- ~vtkOBJPolyDataProcessor() VTK_OVERRIDE;
+ ~vtkOBJPolyDataProcessor() override;
int RequestData(vtkInformation *,
- vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE /*override*/;
+ vtkInformationVector **, vtkInformationVector *) override /*override*/;
vtkSetMacro(SuccessParsingFiles,int)
diff --git a/IO/Import/vtkVRMLImporter.h b/IO/Import/vtkVRMLImporter.h
index 56578f635fc8ae265d694c74cd0b2b6d7bf2f6d8..bf0186a4cb9287f91eaeab4cdfe81ade66d86438 100644
--- a/IO/Import/vtkVRMLImporter.h
+++ b/IO/Import/vtkVRMLImporter.h
@@ -77,7 +77,7 @@ public:
static vtkVRMLImporter *New();
vtkTypeMacro(vtkVRMLImporter, vtkImporter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -108,15 +108,15 @@ public:
protected:
vtkVRMLImporter();
- ~vtkVRMLImporter() VTK_OVERRIDE;
+ ~vtkVRMLImporter() override;
int OpenImportFile();
- int ImportBegin() VTK_OVERRIDE;
- void ImportEnd() VTK_OVERRIDE;
- void ImportActors(vtkRenderer*) VTK_OVERRIDE {}
- void ImportCameras(vtkRenderer*) VTK_OVERRIDE {}
- void ImportLights(vtkRenderer*) VTK_OVERRIDE {}
- void ImportProperties(vtkRenderer*) VTK_OVERRIDE {}
+ int ImportBegin() override;
+ void ImportEnd() override;
+ void ImportActors(vtkRenderer*) override {}
+ void ImportCameras(vtkRenderer*) override {}
+ void ImportLights(vtkRenderer*) override {}
+ void ImportProperties(vtkRenderer*) override {}
//@{
/**
diff --git a/IO/Infovis/vtkBiomTableReader.h b/IO/Infovis/vtkBiomTableReader.h
index 5c0abe2319ced1dcb6b0c62460159b7628d707d5..eaef1b1e2561ee6265e8ef749659a50004cc3774 100644
--- a/IO/Infovis/vtkBiomTableReader.h
+++ b/IO/Infovis/vtkBiomTableReader.h
@@ -36,7 +36,7 @@ class VTKIOINFOVIS_EXPORT vtkBiomTableReader : public vtkTableReader
public:
static vtkBiomTableReader *New();
vtkTypeMacro(vtkBiomTableReader,vtkTableReader);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -49,18 +49,18 @@ public:
protected:
vtkBiomTableReader();
- ~vtkBiomTableReader() VTK_OVERRIDE;
+ ~vtkBiomTableReader() override;
int RequestData(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
// Since the Outputs[0] has the same UpdateExtent format
// as the generic DataObject we can copy the UpdateExtent
// as a default behavior.
int RequestUpdateExtent(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
- int FillOutputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
+ int FillOutputPortInformation(int, vtkInformation*) override;
void ParseShape();
void ParseDataType();
void ParseSparseness();
diff --git a/IO/Infovis/vtkChacoGraphReader.h b/IO/Infovis/vtkChacoGraphReader.h
index ec1acd2d5a492053740ff5bb117c6a688799553b..238597977a4fea922cf6258fb0cf76a4a33dee25 100644
--- a/IO/Infovis/vtkChacoGraphReader.h
+++ b/IO/Infovis/vtkChacoGraphReader.h
@@ -56,7 +56,7 @@ class VTKIOINFOVIS_EXPORT vtkChacoGraphReader : public vtkUndirectedGraphAlgorit
public:
static vtkChacoGraphReader *New();
vtkTypeMacro(vtkChacoGraphReader, vtkUndirectedGraphAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -68,12 +68,12 @@ public:
protected:
vtkChacoGraphReader();
- ~vtkChacoGraphReader() VTK_OVERRIDE;
+ ~vtkChacoGraphReader() override;
int RequestData(
vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
private:
char* FileName;
diff --git a/IO/Infovis/vtkDIMACSGraphReader.h b/IO/Infovis/vtkDIMACSGraphReader.h
index 7bac5b305c18366ed35cc48a87da7e6239c9b144..8f494ce8a09161f9087ded40f6d518e7ecfb2ee0 100644
--- a/IO/Infovis/vtkDIMACSGraphReader.h
+++ b/IO/Infovis/vtkDIMACSGraphReader.h
@@ -67,7 +67,7 @@ public:
static vtkDIMACSGraphReader *New();
vtkTypeMacro(vtkDIMACSGraphReader, vtkGraphAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -96,11 +96,11 @@ public:
protected:
vtkDIMACSGraphReader();
- ~vtkDIMACSGraphReader() VTK_OVERRIDE;
+ ~vtkDIMACSGraphReader() override;
int RequestData(vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
int buildGenericGraph(vtkGraph * output,
vtkStdString & defaultVertexAttrArrayName,
@@ -114,7 +114,7 @@ protected:
*/
int RequestDataObject(vtkInformation*,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
int ReadGraphMetaData();
diff --git a/IO/Infovis/vtkDIMACSGraphWriter.h b/IO/Infovis/vtkDIMACSGraphWriter.h
index 73df4803fef6c3a0bb15fae1e8b733022c8c941b..f991291d8bd28beba16e3dd15a8d6f839c283565 100644
--- a/IO/Infovis/vtkDIMACSGraphWriter.h
+++ b/IO/Infovis/vtkDIMACSGraphWriter.h
@@ -57,7 +57,7 @@ class VTKIOINFOVIS_EXPORT vtkDIMACSGraphWriter : public vtkDataWriter
public:
static vtkDIMACSGraphWriter *New();
vtkTypeMacro(vtkDIMACSGraphWriter,vtkDataWriter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -69,11 +69,11 @@ public:
protected:
vtkDIMACSGraphWriter() {}
- ~vtkDIMACSGraphWriter() VTK_OVERRIDE {}
+ ~vtkDIMACSGraphWriter() override {}
- void WriteData() VTK_OVERRIDE;
+ void WriteData() override;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
private:
vtkDIMACSGraphWriter(const vtkDIMACSGraphWriter&) VTK_DELETE_FUNCTION;
diff --git a/IO/Infovis/vtkDelimitedTextReader.cxx b/IO/Infovis/vtkDelimitedTextReader.cxx
index d5af196328b66ca7ff64123f9eb2a28a5f70fb64..593e80fa6d2894b6b68c238a4827ab86967cb725 100644
--- a/IO/Infovis/vtkDelimitedTextReader.cxx
+++ b/IO/Infovis/vtkDelimitedTextReader.cxx
@@ -98,7 +98,7 @@ public:
{
}
- ~DelimitedTextIterator() VTK_OVERRIDE
+ ~DelimitedTextIterator() override
{
// Ensure that all table columns have the same length ...
for(vtkIdType i = 0; i != this->OutputTable->GetNumberOfColumns(); ++i)
@@ -112,12 +112,12 @@ public:
}
}
- DelimitedTextIterator& operator++(int) VTK_OVERRIDE
+ DelimitedTextIterator& operator++(int) override
{
return *this;
}
- DelimitedTextIterator& operator*() VTK_OVERRIDE
+ DelimitedTextIterator& operator*() override
{
return *this;
}
@@ -137,7 +137,7 @@ public:
}
}
- DelimitedTextIterator& operator=(const vtkUnicodeString::value_type value) VTK_OVERRIDE
+ DelimitedTextIterator& operator=(const vtkUnicodeString::value_type value) override
{
// If we've already read our maximum number of records, we're done ...
if(this->MaxRecords && this->CurrentRecordIndex == this->MaxRecordIndex)
diff --git a/IO/Infovis/vtkDelimitedTextReader.h b/IO/Infovis/vtkDelimitedTextReader.h
index d9cfb43d45ac4055d96cbba696d1a767495d4c2f..5ae474ff45373a41f6f30cdd30146ecd68a08c6e 100644
--- a/IO/Infovis/vtkDelimitedTextReader.h
+++ b/IO/Infovis/vtkDelimitedTextReader.h
@@ -74,7 +74,7 @@ class VTKIOINFOVIS_EXPORT vtkDelimitedTextReader : public vtkTableAlgorithm
public:
static vtkDelimitedTextReader* New();
vtkTypeMacro(vtkDelimitedTextReader, vtkTableAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -319,12 +319,12 @@ public:
protected:
vtkDelimitedTextReader();
- ~vtkDelimitedTextReader() VTK_OVERRIDE;
+ ~vtkDelimitedTextReader() override;
int RequestData(
vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
char* FileName;
int ReadFromInputString;
diff --git a/IO/Infovis/vtkFixedWidthTextReader.h b/IO/Infovis/vtkFixedWidthTextReader.h
index b6b544bc89773a934d3aa8b448922069f608bf53..fcb972dd06a546175a2f1830569adcf882043f38 100644
--- a/IO/Infovis/vtkFixedWidthTextReader.h
+++ b/IO/Infovis/vtkFixedWidthTextReader.h
@@ -55,7 +55,7 @@ class VTKIOINFOVIS_EXPORT vtkFixedWidthTextReader : public vtkTableAlgorithm
public:
static vtkFixedWidthTextReader* New();
vtkTypeMacro(vtkFixedWidthTextReader,vtkTableAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
vtkGetStringMacro(FileName);
vtkSetStringMacro(FileName);
@@ -98,12 +98,12 @@ public:
protected:
vtkFixedWidthTextReader();
- ~vtkFixedWidthTextReader() VTK_OVERRIDE;
+ ~vtkFixedWidthTextReader() override;
int RequestData(
vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
void OpenFile();
diff --git a/IO/Infovis/vtkISIReader.h b/IO/Infovis/vtkISIReader.h
index dfc942ed2075fb950f24985f279a7721cc60c0ca..45583ba7e20039343d30b5728b22dfdaf9f3eabf 100644
--- a/IO/Infovis/vtkISIReader.h
+++ b/IO/Infovis/vtkISIReader.h
@@ -46,7 +46,7 @@ class VTKIOINFOVIS_EXPORT vtkISIReader : public vtkTableAlgorithm
public:
static vtkISIReader* New();
vtkTypeMacro(vtkISIReader,vtkTableAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -74,12 +74,12 @@ public:
protected:
vtkISIReader();
- ~vtkISIReader() VTK_OVERRIDE;
+ ~vtkISIReader() override;
int RequestData(
vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
char* FileName;
char* Delimiter;
diff --git a/IO/Infovis/vtkMultiNewickTreeReader.h b/IO/Infovis/vtkMultiNewickTreeReader.h
index e261fef7dea86f1233622473766c16caa9560624..466f8f29dd741bcc965be24d865f9db53e82fb91 100644
--- a/IO/Infovis/vtkMultiNewickTreeReader.h
+++ b/IO/Infovis/vtkMultiNewickTreeReader.h
@@ -39,7 +39,7 @@ class VTKIOINFOVIS_EXPORT vtkMultiNewickTreeReader : public vtkDataReader
public:
static vtkMultiNewickTreeReader *New();
vtkTypeMacro(vtkMultiNewickTreeReader,vtkDataReader);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -52,18 +52,18 @@ public:
protected:
vtkMultiNewickTreeReader();
- ~vtkMultiNewickTreeReader() VTK_OVERRIDE;
+ ~vtkMultiNewickTreeReader() override;
int RequestData(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
// Since the Outputs[0] has the same UpdateExtent format
// as the generic DataObject we can copy the UpdateExtent
// as a default behavior.
int RequestUpdateExtent(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
- int FillOutputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
+ int FillOutputPortInformation(int, vtkInformation*) override;
private:
vtkMultiNewickTreeReader(const vtkMultiNewickTreeReader&) VTK_DELETE_FUNCTION;
void operator=(const vtkMultiNewickTreeReader&) VTK_DELETE_FUNCTION;
diff --git a/IO/Infovis/vtkNewickTreeReader.h b/IO/Infovis/vtkNewickTreeReader.h
index 36cd0e6763f97230b4b122aa562f6a456e35a422..b882221fc994d1a6d1f9a4c14e4bccdf856fdb7d 100644
--- a/IO/Infovis/vtkNewickTreeReader.h
+++ b/IO/Infovis/vtkNewickTreeReader.h
@@ -44,7 +44,7 @@ class VTKIOINFOVIS_EXPORT vtkNewickTreeReader : public vtkDataReader
public:
static vtkNewickTreeReader *New();
vtkTypeMacro(vtkNewickTreeReader,vtkDataReader);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -58,18 +58,18 @@ public:
protected:
vtkNewickTreeReader();
- ~vtkNewickTreeReader() VTK_OVERRIDE;
+ ~vtkNewickTreeReader() override;
int RequestData(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
// Since the Outputs[0] has the same UpdateExtent format
// as the generic DataObject we can copy the UpdateExtent
// as a default behavior.
int RequestUpdateExtent(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
- int FillOutputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
+ int FillOutputPortInformation(int, vtkInformation*) override;
void CountNodes(const char * buffer, vtkIdType *numNodes);
vtkIdType BuildTree(char *buffer, vtkMutableDirectedGraph *g,
vtkDoubleArray *weights, vtkStringArray *names, vtkIdType parent);
diff --git a/IO/Infovis/vtkNewickTreeWriter.h b/IO/Infovis/vtkNewickTreeWriter.h
index 13888cbdecae68fbee4f6f0484d3a5321c7f907d..9cfdffba42d7b9ae34570fa88ae1c6ec1548f84b 100644
--- a/IO/Infovis/vtkNewickTreeWriter.h
+++ b/IO/Infovis/vtkNewickTreeWriter.h
@@ -34,7 +34,7 @@ class VTKIOINFOVIS_EXPORT vtkNewickTreeWriter : public vtkDataWriter
public:
static vtkNewickTreeWriter *New();
vtkTypeMacro(vtkNewickTreeWriter,vtkDataWriter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -70,9 +70,9 @@ public:
protected:
vtkNewickTreeWriter();
- ~vtkNewickTreeWriter() VTK_OVERRIDE {}
+ ~vtkNewickTreeWriter() override {}
- void WriteData() VTK_OVERRIDE;
+ void WriteData() override;
/**
* Write one vertex. This function calls itself recursively for
@@ -80,7 +80,7 @@ protected:
*/
void WriteVertex(ostream *fp, vtkTree* const input, vtkIdType vertex);
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
vtkStdString EdgeWeightArrayName;
vtkStdString NodeNameArrayName;
diff --git a/IO/Infovis/vtkPhyloXMLTreeReader.h b/IO/Infovis/vtkPhyloXMLTreeReader.h
index 71e38845b065aef0d90090f75554bfea3cdc2ade..f0ea387de4776ea6a3053ad2e36694e33764f31f 100644
--- a/IO/Infovis/vtkPhyloXMLTreeReader.h
+++ b/IO/Infovis/vtkPhyloXMLTreeReader.h
@@ -49,7 +49,7 @@ class VTKIOINFOVIS_EXPORT vtkPhyloXMLTreeReader : public vtkXMLReader
public:
static vtkPhyloXMLTreeReader *New();
vtkTypeMacro(vtkPhyloXMLTreeReader,vtkXMLReader);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -61,12 +61,12 @@ public:
protected:
vtkPhyloXMLTreeReader();
- ~vtkPhyloXMLTreeReader() VTK_OVERRIDE;
+ ~vtkPhyloXMLTreeReader() override;
/**
* Read the input PhyloXML and populate our output vtkTree.
*/
- void ReadXMLData() VTK_OVERRIDE;
+ void ReadXMLData() override;
/**
* Read one particular XML element. This method calls the more specific
@@ -157,10 +157,10 @@ protected:
*/
std::string GetStringAfterColon(const char *input);
- int FillOutputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
- const char* GetDataSetName() VTK_OVERRIDE;
+ int FillOutputPortInformation(int, vtkInformation*) override;
+ const char* GetDataSetName() override;
void SetOutput(vtkTree *output);
- void SetupEmptyOutput() VTK_OVERRIDE;
+ void SetupEmptyOutput() override;
private:
vtkIdType NumberOfNodes;
diff --git a/IO/Infovis/vtkPhyloXMLTreeWriter.h b/IO/Infovis/vtkPhyloXMLTreeWriter.h
index 04b87d0d3aed70796fe923505f30325133a7cf7a..546deb32e7a5128722ef5d24fe5a1ce494769fc3 100644
--- a/IO/Infovis/vtkPhyloXMLTreeWriter.h
+++ b/IO/Infovis/vtkPhyloXMLTreeWriter.h
@@ -37,7 +37,7 @@ class VTKIOINFOVIS_EXPORT vtkPhyloXMLTreeWriter : public vtkXMLWriter
public:
static vtkPhyloXMLTreeWriter *New();
vtkTypeMacro(vtkPhyloXMLTreeWriter,vtkXMLWriter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -50,7 +50,7 @@ public:
/**
* Get the default file extension for files written by this writer.
*/
- const char* GetDefaultFileExtension() VTK_OVERRIDE;
+ const char* GetDefaultFileExtension() override;
//@{
/**
@@ -85,13 +85,13 @@ public:
protected:
vtkPhyloXMLTreeWriter();
- ~vtkPhyloXMLTreeWriter() VTK_OVERRIDE {}
+ ~vtkPhyloXMLTreeWriter() override {}
- int WriteData() VTK_OVERRIDE;
+ int WriteData() override;
- const char* GetDataSetName() VTK_OVERRIDE;
- int StartFile() VTK_OVERRIDE;
- int EndFile() VTK_OVERRIDE;
+ const char* GetDataSetName() override;
+ int StartFile() override;
+ int EndFile() override;
/**
* Check for an optional, tree-level element and write it out if it is
@@ -151,7 +151,7 @@ protected:
const char* GetArrayAttribute(vtkAbstractArray *array,
const char *attributeName);
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
vtkInformation* InputInformation;
diff --git a/IO/Infovis/vtkRISReader.h b/IO/Infovis/vtkRISReader.h
index 973abc1d23bfe05d3d5c46f3c57712b069c7658e..cb49b5f33ead49b54a960a1a2b090702170efd90 100644
--- a/IO/Infovis/vtkRISReader.h
+++ b/IO/Infovis/vtkRISReader.h
@@ -48,7 +48,7 @@ class VTKIOINFOVIS_EXPORT vtkRISReader : public vtkTableAlgorithm
public:
static vtkRISReader* New();
vtkTypeMacro(vtkRISReader,vtkTableAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -76,12 +76,12 @@ public:
protected:
vtkRISReader();
- ~vtkRISReader() VTK_OVERRIDE;
+ ~vtkRISReader() override;
int RequestData(
vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
char* FileName;
char* Delimiter;
diff --git a/IO/Infovis/vtkTulipReader.h b/IO/Infovis/vtkTulipReader.h
index 5f107db30e7b552a45f316c2fcef4f7be29650a5..ccfa40f291ca00316176de2823d45da8398bd4ba 100644
--- a/IO/Infovis/vtkTulipReader.h
+++ b/IO/Infovis/vtkTulipReader.h
@@ -73,7 +73,7 @@ class VTKIOINFOVIS_EXPORT vtkTulipReader : public vtkUndirectedGraphAlgorithm
public:
static vtkTulipReader *New();
vtkTypeMacro(vtkTulipReader, vtkUndirectedGraphAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -85,17 +85,17 @@ public:
protected:
vtkTulipReader();
- ~vtkTulipReader() VTK_OVERRIDE;
+ ~vtkTulipReader() override;
int RequestData(
vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
/**
* Set the outputs to vtkUndirectedGraph and vtkAnnotationLayers.
*/
- int FillOutputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillOutputPortInformation(int port, vtkInformation* info) override;
private:
char* FileName;
diff --git a/IO/Infovis/vtkXGMLReader.h b/IO/Infovis/vtkXGMLReader.h
index 81246f1dbd1831f16d64e3aa92c07e4d2d410e3a..6cd5e471e839ba4f754bfe08a2ce4f431b7cb343 100644
--- a/IO/Infovis/vtkXGMLReader.h
+++ b/IO/Infovis/vtkXGMLReader.h
@@ -42,7 +42,7 @@ class VTKIOINFOVIS_EXPORT vtkXGMLReader : public vtkUndirectedGraphAlgorithm
public:
static vtkXGMLReader *New();
vtkTypeMacro(vtkXGMLReader, vtkUndirectedGraphAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -54,12 +54,12 @@ public:
protected:
vtkXGMLReader();
- ~vtkXGMLReader() VTK_OVERRIDE;
+ ~vtkXGMLReader() override;
int RequestData(
vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
private:
char* FileName;
diff --git a/IO/Infovis/vtkXMLTreeReader.h b/IO/Infovis/vtkXMLTreeReader.h
index 280c7bde03ccd13a8419ddd2b83dca04a7ad747c..dec566575bcfd3bffa62cdeb96ebf9fb47a0b4d5 100644
--- a/IO/Infovis/vtkXMLTreeReader.h
+++ b/IO/Infovis/vtkXMLTreeReader.h
@@ -96,7 +96,7 @@ class VTKIOINFOVIS_EXPORT vtkXMLTreeReader : public vtkTreeAlgorithm
public:
static vtkXMLTreeReader* New();
vtkTypeMacro(vtkXMLTreeReader,vtkTreeAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -182,7 +182,7 @@ public:
protected:
vtkXMLTreeReader();
- ~vtkXMLTreeReader() VTK_OVERRIDE;
+ ~vtkXMLTreeReader() override;
char* FileName;
char* XMLString;
bool ReadCharData;
@@ -196,7 +196,7 @@ protected:
int RequestData(
vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
private:
vtkXMLTreeReader(const vtkXMLTreeReader&) VTK_DELETE_FUNCTION;
diff --git a/IO/LSDyna/vtkLSDynaPart.cxx b/IO/LSDyna/vtkLSDynaPart.cxx
index 75f767d58ca1975d7fec80830cd3a8762724ea92..d070dbffff69d8a16df960898d51d35fa2be64ef 100644
--- a/IO/LSDyna/vtkLSDynaPart.cxx
+++ b/IO/LSDyna/vtkLSDynaPart.cxx
@@ -258,7 +258,7 @@ public:
{
}
- bool isUsed(const vtkIdType &index) const VTK_OVERRIDE {return UsedPoints[index];}
+ bool isUsed(const vtkIdType &index) const override {return UsedPoints[index];}
protected:
BitVector UsedPoints;
@@ -284,7 +284,7 @@ public:
}
}
}
- bool isUsed(const vtkIdType &index) const VTK_OVERRIDE
+ bool isUsed(const vtkIdType &index) const override
{
return this->UsedPoints.find(index) != this->UsedPoints.end();
}
diff --git a/IO/LSDyna/vtkLSDynaPart.h b/IO/LSDyna/vtkLSDynaPart.h
index 57c3f3e9e4464b98766c70d5eba102cd6324321c..19a22f85ef7bea8538834eb971cc539a7021014a 100644
--- a/IO/LSDyna/vtkLSDynaPart.h
+++ b/IO/LSDyna/vtkLSDynaPart.h
@@ -29,7 +29,7 @@ public:
static vtkLSDynaPart *New();
vtkTypeMacro(vtkLSDynaPart,vtkObject);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
//Description: Set the type of the part
void SetPartType(int type);
@@ -137,7 +137,7 @@ public:
protected:
vtkLSDynaPart();
- ~vtkLSDynaPart() VTK_OVERRIDE;
+ ~vtkLSDynaPart() override;
vtkUnstructuredGrid* RemoveDeletedCells();
diff --git a/IO/LSDyna/vtkLSDynaPartCollection.h b/IO/LSDyna/vtkLSDynaPartCollection.h
index c29dbb18376e28ca8bd6981f26abb64907dea7fa..01bb0de1adde99d72a95c34697ff9be615b6ead3 100644
--- a/IO/LSDyna/vtkLSDynaPartCollection.h
+++ b/IO/LSDyna/vtkLSDynaPartCollection.h
@@ -32,7 +32,7 @@ public:
static vtkLSDynaPartCollection *New();
vtkTypeMacro(vtkLSDynaPartCollection,vtkObject);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
//Description:
//Pass in the metadata to setup this collection.
@@ -129,7 +129,7 @@ public:
protected:
vtkLSDynaPartCollection();
- ~vtkLSDynaPartCollection() VTK_OVERRIDE;
+ ~vtkLSDynaPartCollection() override;
vtkIdType* MinIds;
vtkIdType* MaxIds;
diff --git a/IO/LSDyna/vtkLSDynaReader.h b/IO/LSDyna/vtkLSDynaReader.h
index a2a79ea4d189f5383984e455d0b6615d343a3cb9..7b2895b0326cad30d93e0377b730665014e197eb 100644
--- a/IO/LSDyna/vtkLSDynaReader.h
+++ b/IO/LSDyna/vtkLSDynaReader.h
@@ -165,7 +165,7 @@ class VTKIOLSDYNA_EXPORT vtkLSDynaReader : public vtkMultiBlockDataSetAlgorithm
{
public:
vtkTypeMacro(vtkLSDynaReader,vtkMultiBlockDataSetAlgorithm);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
static vtkLSDynaReader *New();
/**
@@ -558,7 +558,7 @@ protected:
char* InputDeck;
vtkLSDynaReader();
- ~vtkLSDynaReader() VTK_OVERRIDE;
+ ~vtkLSDynaReader() override;
/**
* This function populates the reader's private dictionary with
@@ -581,8 +581,8 @@ protected:
*/
int ScanDatabaseTimeSteps();
- int RequestInformation( vtkInformation*, vtkInformationVector**, vtkInformationVector* ) VTK_OVERRIDE;
- int RequestData( vtkInformation*, vtkInformationVector**, vtkInformationVector* ) VTK_OVERRIDE;
+ int RequestInformation( vtkInformation*, vtkInformationVector**, vtkInformationVector* ) override;
+ int RequestData( vtkInformation*, vtkInformationVector**, vtkInformationVector* ) override;
//@{
/**
diff --git a/IO/LSDyna/vtkLSDynaSummaryParser.h b/IO/LSDyna/vtkLSDynaSummaryParser.h
index 855cad67f5612b75a402646998fbab9811db67c5..5a393bc57c20cd42eb839479a958be75d3546abc 100644
--- a/IO/LSDyna/vtkLSDynaSummaryParser.h
+++ b/IO/LSDyna/vtkLSDynaSummaryParser.h
@@ -33,7 +33,7 @@ class VTKIOLSDYNA_EXPORT vtkLSDynaSummaryParser : public vtkXMLParser
public:
vtkTypeMacro(vtkLSDynaSummaryParser,vtkXMLParser);
static vtkLSDynaSummaryParser* New();
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
@@ -42,11 +42,11 @@ public:
protected:
vtkLSDynaSummaryParser();
- ~vtkLSDynaSummaryParser() VTK_OVERRIDE { };
+ ~vtkLSDynaSummaryParser() override { };
- void StartElement(const char* name, const char** atts) VTK_OVERRIDE;
- void EndElement(const char* name) VTK_OVERRIDE;
- void CharacterDataHandler(const char* data, int length) VTK_OVERRIDE;
+ void StartElement(const char* name, const char** atts) override;
+ void EndElement(const char* name) override;
+ void CharacterDataHandler(const char* data, int length) override;
vtkStdString PartName;
int PartId;
diff --git a/IO/Legacy/vtkCompositeDataReader.h b/IO/Legacy/vtkCompositeDataReader.h
index 67a941f4bfea9873d87d1a57ee25e24cd0ce45de..ca54c0b98c9000612d3490ede699ceb79d1ca647 100644
--- a/IO/Legacy/vtkCompositeDataReader.h
+++ b/IO/Legacy/vtkCompositeDataReader.h
@@ -40,7 +40,7 @@ class VTKIOLEGACY_EXPORT vtkCompositeDataReader : public vtkDataReader
public:
static vtkCompositeDataReader* New();
vtkTypeMacro(vtkCompositeDataReader, vtkDataReader);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -53,26 +53,26 @@ public:
protected:
vtkCompositeDataReader();
- ~vtkCompositeDataReader() VTK_OVERRIDE;
+ ~vtkCompositeDataReader() override;
int RequestData(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
// Override ProcessRequest to handle request data object event
int ProcessRequest(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
// Since the Outputs[0] has the same UpdateExtent format
// as the generic DataObject we can copy the UpdateExtent
// as a default behavior.
int RequestUpdateExtent(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
// Create output (a directed or undirected graph).
virtual int RequestDataObject(vtkInformation *, vtkInformationVector **,
vtkInformationVector *);
- int FillOutputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
+ int FillOutputPortInformation(int, vtkInformation*) override;
/**
* Read the output type information.
diff --git a/IO/Legacy/vtkCompositeDataWriter.h b/IO/Legacy/vtkCompositeDataWriter.h
index e2147d3950c1505fb8492cd670d7a12c5819f310..725520d3588e11f49b3033443527210bab0b4a05 100644
--- a/IO/Legacy/vtkCompositeDataWriter.h
+++ b/IO/Legacy/vtkCompositeDataWriter.h
@@ -43,7 +43,7 @@ class VTKIOLEGACY_EXPORT vtkCompositeDataWriter : public vtkDataWriter
public:
static vtkCompositeDataWriter* New();
vtkTypeMacro(vtkCompositeDataWriter, vtkDataWriter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -55,14 +55,14 @@ public:
protected:
vtkCompositeDataWriter();
- ~vtkCompositeDataWriter() VTK_OVERRIDE;
+ ~vtkCompositeDataWriter() override;
//@{
/**
* Performs the actual writing.
*/
- void WriteData() VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ void WriteData() override;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
//@}
bool WriteCompositeData(ostream*, vtkMultiBlockDataSet*);
diff --git a/IO/Legacy/vtkDataObjectReader.h b/IO/Legacy/vtkDataObjectReader.h
index 715f3ac871238ee410d846853b1d1dea8e10bd2c..adb659d02d58fa3024803d63bbee39a74ae79b22 100644
--- a/IO/Legacy/vtkDataObjectReader.h
+++ b/IO/Legacy/vtkDataObjectReader.h
@@ -41,7 +41,7 @@ class VTKIOLEGACY_EXPORT vtkDataObjectReader : public vtkDataReader
public:
static vtkDataObjectReader *New();
vtkTypeMacro(vtkDataObjectReader,vtkDataReader);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -54,11 +54,11 @@ public:
protected:
vtkDataObjectReader();
- ~vtkDataObjectReader() VTK_OVERRIDE;
+ ~vtkDataObjectReader() override;
int RequestData(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
- int FillOutputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
+ vtkInformationVector *) override;
+ int FillOutputPortInformation(int, vtkInformation*) override;
private:
vtkDataObjectReader(const vtkDataObjectReader&) VTK_DELETE_FUNCTION;
void operator=(const vtkDataObjectReader&) VTK_DELETE_FUNCTION;
diff --git a/IO/Legacy/vtkDataObjectWriter.h b/IO/Legacy/vtkDataObjectWriter.h
index cad483f8a9fa5359617808b97d45bd404345ba19..ae0c070c026370615415d5d22702e2d371771e43 100644
--- a/IO/Legacy/vtkDataObjectWriter.h
+++ b/IO/Legacy/vtkDataObjectWriter.h
@@ -40,7 +40,7 @@ class VTKIOLEGACY_EXPORT vtkDataObjectWriter : public vtkWriter
public:
static vtkDataObjectWriter *New();
vtkTypeMacro(vtkDataObjectWriter,vtkWriter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -68,12 +68,12 @@ public:
protected:
vtkDataObjectWriter();
- ~vtkDataObjectWriter() VTK_OVERRIDE;
+ ~vtkDataObjectWriter() override;
- void WriteData() VTK_OVERRIDE;
+ void WriteData() override;
vtkDataWriter *Writer;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
private:
vtkDataObjectWriter(const vtkDataObjectWriter&) VTK_DELETE_FUNCTION;
diff --git a/IO/Legacy/vtkDataReader.h b/IO/Legacy/vtkDataReader.h
index e90901724005baa0750071c210461ed8156a4e4b..4dadbc2bf921170b69018ab0647cd74e1345ad14 100644
--- a/IO/Legacy/vtkDataReader.h
+++ b/IO/Legacy/vtkDataReader.h
@@ -58,7 +58,7 @@ public:
static vtkDataReader *New();
vtkTypeMacro(vtkDataReader,vtkAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -447,7 +447,7 @@ public:
protected:
vtkDataReader();
- ~vtkDataReader() VTK_OVERRIDE;
+ ~vtkDataReader() override;
char *FileName;
int FileType;
@@ -536,7 +536,7 @@ protected:
int DecodeString(char *resname, const char* name);
int ProcessRequest(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
virtual int RequestData(vtkInformation *, vtkInformationVector **,
vtkInformationVector *)
{ return 1; }
diff --git a/IO/Legacy/vtkDataSetReader.h b/IO/Legacy/vtkDataSetReader.h
index e539b414979029fc6f96bbfca3a62086d5e9ab79..f1870564e39ec63e9c402a7ef30be6bdfd652e3a 100644
--- a/IO/Legacy/vtkDataSetReader.h
+++ b/IO/Legacy/vtkDataSetReader.h
@@ -49,7 +49,7 @@ class VTKIOLEGACY_EXPORT vtkDataSetReader : public vtkDataReader
public:
static vtkDataSetReader *New();
vtkTypeMacro(vtkDataSetReader,vtkDataReader);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -82,17 +82,17 @@ public:
protected:
vtkDataSetReader();
- ~vtkDataSetReader() VTK_OVERRIDE;
+ ~vtkDataSetReader() override;
int ProcessRequest(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
int RequestData(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
virtual int RequestDataObject(vtkInformation *, vtkInformationVector **,
vtkInformationVector *);
- int FillOutputPortInformation(int, vtkInformation *) VTK_OVERRIDE;
+ int FillOutputPortInformation(int, vtkInformation *) override;
int RequestInformation(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
private:
vtkDataSetReader(const vtkDataSetReader&) VTK_DELETE_FUNCTION;
diff --git a/IO/Legacy/vtkDataSetWriter.h b/IO/Legacy/vtkDataSetWriter.h
index 67c3dd5ba5fa4306b9bd5d9bfeddde54c1670689..ab1aa4be6f615b4be07ab6c68cc36bc560428373 100644
--- a/IO/Legacy/vtkDataSetWriter.h
+++ b/IO/Legacy/vtkDataSetWriter.h
@@ -32,7 +32,7 @@ class VTKIOLEGACY_EXPORT vtkDataSetWriter : public vtkDataWriter
public:
static vtkDataSetWriter *New();
vtkTypeMacro(vtkDataSetWriter,vtkDataWriter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -44,11 +44,11 @@ public:
protected:
vtkDataSetWriter() {}
- ~vtkDataSetWriter() VTK_OVERRIDE {}
+ ~vtkDataSetWriter() override {}
- void WriteData() VTK_OVERRIDE;
+ void WriteData() override;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
private:
vtkDataSetWriter(const vtkDataSetWriter&) VTK_DELETE_FUNCTION;
diff --git a/IO/Legacy/vtkDataWriter.h b/IO/Legacy/vtkDataWriter.h
index 441895d8ba2d37187504cca437e50b3c28385a70..470fc812e284786fcbf2085f9dda1bbcc7414248 100644
--- a/IO/Legacy/vtkDataWriter.h
+++ b/IO/Legacy/vtkDataWriter.h
@@ -46,7 +46,7 @@ class VTKIOLEGACY_EXPORT vtkDataWriter : public vtkWriter
{
public:
vtkTypeMacro(vtkDataWriter,vtkWriter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Created object with default header, ASCII format, and default names for
@@ -290,13 +290,13 @@ public:
protected:
vtkDataWriter();
- ~vtkDataWriter() VTK_OVERRIDE;
+ ~vtkDataWriter() override;
int WriteToOutputString;
char *OutputString;
int OutputStringLength;
- void WriteData() VTK_OVERRIDE; //dummy method to allow this class to be instantiated and delegated to
+ void WriteData() override; //dummy method to allow this class to be instantiated and delegated to
char *FileName;
char *Header;
diff --git a/IO/Legacy/vtkGenericDataObjectReader.h b/IO/Legacy/vtkGenericDataObjectReader.h
index 4c721dadeb735d3d36b9a2fd4f626690792a54ba..c451e9814234dbe689e1f07db19b05731594fe4f 100644
--- a/IO/Legacy/vtkGenericDataObjectReader.h
+++ b/IO/Legacy/vtkGenericDataObjectReader.h
@@ -54,7 +54,7 @@ class VTKIOLEGACY_EXPORT vtkGenericDataObjectReader : public vtkDataReader
public:
static vtkGenericDataObjectReader *New();
vtkTypeMacro(vtkGenericDataObjectReader,vtkDataReader);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -93,19 +93,19 @@ public:
* See vtkAlgorithm for information.
*/
int ProcessRequest(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
protected:
vtkGenericDataObjectReader();
- ~vtkGenericDataObjectReader() VTK_OVERRIDE;
+ ~vtkGenericDataObjectReader() override;
int RequestData(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
virtual int RequestDataObject(vtkInformation *, vtkInformationVector **,
vtkInformationVector *);
- int FillOutputPortInformation(int, vtkInformation *) VTK_OVERRIDE;
+ int FillOutputPortInformation(int, vtkInformation *) override;
int RequestInformation(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
private:
vtkGenericDataObjectReader(const vtkGenericDataObjectReader&) VTK_DELETE_FUNCTION;
diff --git a/IO/Legacy/vtkGenericDataObjectWriter.h b/IO/Legacy/vtkGenericDataObjectWriter.h
index 732b22d34e0edfba9e64fea582b6b4493ab6ff35..7ff0bda6f758269326011437092a5a9aac44e008 100644
--- a/IO/Legacy/vtkGenericDataObjectWriter.h
+++ b/IO/Legacy/vtkGenericDataObjectWriter.h
@@ -31,14 +31,14 @@ class VTKIOLEGACY_EXPORT vtkGenericDataObjectWriter : public vtkDataWriter
public:
static vtkGenericDataObjectWriter *New();
vtkTypeMacro(vtkGenericDataObjectWriter,vtkDataWriter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkGenericDataObjectWriter();
- ~vtkGenericDataObjectWriter() VTK_OVERRIDE;
+ ~vtkGenericDataObjectWriter() override;
- void WriteData() VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ void WriteData() override;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
private:
vtkGenericDataObjectWriter(const vtkGenericDataObjectWriter&) VTK_DELETE_FUNCTION;
diff --git a/IO/Legacy/vtkGraphReader.h b/IO/Legacy/vtkGraphReader.h
index d579ec5259a17297372edb389bc71c8dd465f46d..a5cad94441081b261ec89c811b311efdc07eb231 100644
--- a/IO/Legacy/vtkGraphReader.h
+++ b/IO/Legacy/vtkGraphReader.h
@@ -41,7 +41,7 @@ class VTKIOLEGACY_EXPORT vtkGraphReader : public vtkDataReader
public:
static vtkGraphReader *New();
vtkTypeMacro(vtkGraphReader,vtkDataReader);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -54,7 +54,7 @@ public:
protected:
vtkGraphReader();
- ~vtkGraphReader() VTK_OVERRIDE;
+ ~vtkGraphReader() override;
enum GraphType
{
@@ -65,17 +65,17 @@ protected:
};
int RequestData(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
// Override ProcessRequest to handle request data object event
int ProcessRequest(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
// Since the Outputs[0] has the same UpdateExtent format
// as the generic DataObject we can copy the UpdateExtent
// as a default behavior.
int RequestUpdateExtent(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
// Create output (a directed or undirected graph).
virtual int RequestDataObject(vtkInformation *, vtkInformationVector **,
@@ -85,7 +85,7 @@ protected:
virtual int ReadGraphType(GraphType &type);
- int FillOutputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
+ int FillOutputPortInformation(int, vtkInformation*) override;
private:
vtkGraphReader(const vtkGraphReader&) VTK_DELETE_FUNCTION;
void operator=(const vtkGraphReader&) VTK_DELETE_FUNCTION;
diff --git a/IO/Legacy/vtkGraphWriter.h b/IO/Legacy/vtkGraphWriter.h
index 1803821b38c137c598d67a9e1b1d118afa6271de..0ce60c5f6e9f82370e199395cd5d97988e855860 100644
--- a/IO/Legacy/vtkGraphWriter.h
+++ b/IO/Legacy/vtkGraphWriter.h
@@ -36,7 +36,7 @@ class VTKIOLEGACY_EXPORT vtkGraphWriter : public vtkDataWriter
public:
static vtkGraphWriter *New();
vtkTypeMacro(vtkGraphWriter,vtkDataWriter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -48,13 +48,13 @@ public:
protected:
vtkGraphWriter() {}
- ~vtkGraphWriter() VTK_OVERRIDE {}
+ ~vtkGraphWriter() override {}
- void WriteData() VTK_OVERRIDE;
+ void WriteData() override;
void WriteMoleculeData(ostream *fp, vtkMolecule *m);
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
private:
vtkGraphWriter(const vtkGraphWriter&) VTK_DELETE_FUNCTION;
diff --git a/IO/Legacy/vtkPolyDataReader.h b/IO/Legacy/vtkPolyDataReader.h
index bc56b23af34c58bd6a4ca6c885c99cc86dc9e3a2..7439007a0734133b91d3c3b59820c85094476f2b 100644
--- a/IO/Legacy/vtkPolyDataReader.h
+++ b/IO/Legacy/vtkPolyDataReader.h
@@ -41,7 +41,7 @@ class VTKIOLEGACY_EXPORT vtkPolyDataReader : public vtkDataReader
public:
static vtkPolyDataReader *New();
vtkTypeMacro(vtkPolyDataReader,vtkDataReader);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -54,18 +54,18 @@ public:
protected:
vtkPolyDataReader();
- ~vtkPolyDataReader() VTK_OVERRIDE;
+ ~vtkPolyDataReader() override;
int RequestData(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
// Update extent of PolyData is specified in pieces.
// Since all DataObjects should be able to set UpdateExent as pieces,
// just copy output->UpdateExtent all Inputs.
int RequestUpdateExtent(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
- int FillOutputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
+ int FillOutputPortInformation(int, vtkInformation*) override;
private:
vtkPolyDataReader(const vtkPolyDataReader&) VTK_DELETE_FUNCTION;
diff --git a/IO/Legacy/vtkPolyDataWriter.h b/IO/Legacy/vtkPolyDataWriter.h
index 98ecc49c0cf3329ccf29736adf2dfa09b319f663..182676e390ca8fbf5ca47e4a04cc5fcc17c90930 100644
--- a/IO/Legacy/vtkPolyDataWriter.h
+++ b/IO/Legacy/vtkPolyDataWriter.h
@@ -35,7 +35,7 @@ class VTKIOLEGACY_EXPORT vtkPolyDataWriter : public vtkDataWriter
public:
static vtkPolyDataWriter *New();
vtkTypeMacro(vtkPolyDataWriter,vtkDataWriter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -47,11 +47,11 @@ public:
protected:
vtkPolyDataWriter() {}
- ~vtkPolyDataWriter() VTK_OVERRIDE {}
+ ~vtkPolyDataWriter() override {}
- void WriteData() VTK_OVERRIDE;
+ void WriteData() override;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
private:
vtkPolyDataWriter(const vtkPolyDataWriter&) VTK_DELETE_FUNCTION;
diff --git a/IO/Legacy/vtkRectilinearGridReader.h b/IO/Legacy/vtkRectilinearGridReader.h
index 2ac7d9a6d8311ac281fa7fc6f4fea6d6cb1d7e69..732969affb740801bc4777940996baf8f2a4edcd 100644
--- a/IO/Legacy/vtkRectilinearGridReader.h
+++ b/IO/Legacy/vtkRectilinearGridReader.h
@@ -41,7 +41,7 @@ class VTKIOLEGACY_EXPORT vtkRectilinearGridReader : public vtkDataReader
public:
static vtkRectilinearGridReader *New();
vtkTypeMacro(vtkRectilinearGridReader,vtkDataReader);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -56,18 +56,18 @@ public:
* Read the meta information from the file. This needs to be public to it
* can be accessed by vtkDataSetReader.
*/
- int ReadMetaData(vtkInformation *outInfo) VTK_OVERRIDE;
+ int ReadMetaData(vtkInformation *outInfo) override;
protected:
vtkRectilinearGridReader();
- ~vtkRectilinearGridReader() VTK_OVERRIDE;
+ ~vtkRectilinearGridReader() override;
int RequestData(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
int RequestInformation(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
- int FillOutputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
+ int FillOutputPortInformation(int, vtkInformation*) override;
private:
vtkRectilinearGridReader(const vtkRectilinearGridReader&) VTK_DELETE_FUNCTION;
void operator=(const vtkRectilinearGridReader&) VTK_DELETE_FUNCTION;
diff --git a/IO/Legacy/vtkRectilinearGridWriter.h b/IO/Legacy/vtkRectilinearGridWriter.h
index b372e34e510fb8a712570ab81880f827acab2e10..39d79a4f349e9fe1aa4d3f6a66ca569cb5579c8b 100644
--- a/IO/Legacy/vtkRectilinearGridWriter.h
+++ b/IO/Legacy/vtkRectilinearGridWriter.h
@@ -36,7 +36,7 @@ class VTKIOLEGACY_EXPORT vtkRectilinearGridWriter : public vtkDataWriter
public:
static vtkRectilinearGridWriter *New();
vtkTypeMacro(vtkRectilinearGridWriter,vtkDataWriter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -61,11 +61,11 @@ public:
protected:
vtkRectilinearGridWriter() : WriteExtent(false) {}
- ~vtkRectilinearGridWriter() VTK_OVERRIDE {}
+ ~vtkRectilinearGridWriter() override {}
- void WriteData() VTK_OVERRIDE;
+ void WriteData() override;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
bool WriteExtent;
diff --git a/IO/Legacy/vtkSimplePointsReader.h b/IO/Legacy/vtkSimplePointsReader.h
index 6fb0f0bfdff5065b4d27522e2c01e3f335836b26..82069ed86bd3c4520ca9f516a70af10eb3c6c67c 100644
--- a/IO/Legacy/vtkSimplePointsReader.h
+++ b/IO/Legacy/vtkSimplePointsReader.h
@@ -35,7 +35,7 @@ class VTKIOLEGACY_EXPORT vtkSimplePointsReader : public vtkPolyDataAlgorithm
public:
static vtkSimplePointsReader* New();
vtkTypeMacro(vtkSimplePointsReader,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -47,13 +47,13 @@ public:
protected:
vtkSimplePointsReader();
- ~vtkSimplePointsReader() VTK_OVERRIDE;
+ ~vtkSimplePointsReader() override;
char* FileName;
int RequestData(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
private:
vtkSimplePointsReader(const vtkSimplePointsReader&) VTK_DELETE_FUNCTION;
void operator=(const vtkSimplePointsReader&) VTK_DELETE_FUNCTION;
diff --git a/IO/Legacy/vtkSimplePointsWriter.h b/IO/Legacy/vtkSimplePointsWriter.h
index a166d671bf368ba2bc0be778f133dae5b0c582a6..32ad844c1448986dd2661a2dfbbce270d3ca4438 100644
--- a/IO/Legacy/vtkSimplePointsWriter.h
+++ b/IO/Legacy/vtkSimplePointsWriter.h
@@ -33,16 +33,16 @@ class VTKIOLEGACY_EXPORT vtkSimplePointsWriter : public vtkDataSetWriter
public:
static vtkSimplePointsWriter *New();
vtkTypeMacro(vtkSimplePointsWriter,vtkDataSetWriter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
vtkGetMacro(DecimalPrecision, int);
vtkSetMacro(DecimalPrecision, int);
protected:
vtkSimplePointsWriter();
- ~vtkSimplePointsWriter() VTK_OVERRIDE{}
+ ~vtkSimplePointsWriter() override{}
- void WriteData() VTK_OVERRIDE;
+ void WriteData() override;
int DecimalPrecision;
diff --git a/IO/Legacy/vtkStructuredGridReader.h b/IO/Legacy/vtkStructuredGridReader.h
index 33007c6e112cdbb0af55038361d83f7f293141b8..6ed811c90be19d2bb620ead91ae3e62735e3d722 100644
--- a/IO/Legacy/vtkStructuredGridReader.h
+++ b/IO/Legacy/vtkStructuredGridReader.h
@@ -41,7 +41,7 @@ class VTKIOLEGACY_EXPORT vtkStructuredGridReader : public vtkDataReader
public:
static vtkStructuredGridReader *New();
vtkTypeMacro(vtkStructuredGridReader,vtkDataReader);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -56,18 +56,18 @@ public:
* Read the meta information from the file. This needs to be public to it
* can be accessed by vtkDataSetReader.
*/
- int ReadMetaData(vtkInformation *outInfo) VTK_OVERRIDE;
+ int ReadMetaData(vtkInformation *outInfo) override;
protected:
vtkStructuredGridReader();
- ~vtkStructuredGridReader() VTK_OVERRIDE;
+ ~vtkStructuredGridReader() override;
int RequestInformation(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
int RequestData(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
- int FillOutputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
+ int FillOutputPortInformation(int, vtkInformation*) override;
private:
vtkStructuredGridReader(const vtkStructuredGridReader&) VTK_DELETE_FUNCTION;
void operator=(const vtkStructuredGridReader&) VTK_DELETE_FUNCTION;
diff --git a/IO/Legacy/vtkStructuredGridWriter.h b/IO/Legacy/vtkStructuredGridWriter.h
index c3154f9df14f81339e4b1db314258cd3d2bb4d9c..ea22e4d228e25e17a09c7fa1abbb137607315a3c 100644
--- a/IO/Legacy/vtkStructuredGridWriter.h
+++ b/IO/Legacy/vtkStructuredGridWriter.h
@@ -36,7 +36,7 @@ class VTKIOLEGACY_EXPORT vtkStructuredGridWriter : public vtkDataWriter
public:
static vtkStructuredGridWriter *New();
vtkTypeMacro(vtkStructuredGridWriter,vtkDataWriter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -61,11 +61,11 @@ public:
protected:
vtkStructuredGridWriter() : WriteExtent(false) {}
- ~vtkStructuredGridWriter() VTK_OVERRIDE {}
+ ~vtkStructuredGridWriter() override {}
- void WriteData() VTK_OVERRIDE;
+ void WriteData() override;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
bool WriteExtent;
diff --git a/IO/Legacy/vtkStructuredPointsReader.h b/IO/Legacy/vtkStructuredPointsReader.h
index f05b40c5971e97c22f6fda42dccb9ea366d04558..e6119092c2ebd27cef56a7dbdc50dcbae067f1fa 100644
--- a/IO/Legacy/vtkStructuredPointsReader.h
+++ b/IO/Legacy/vtkStructuredPointsReader.h
@@ -41,7 +41,7 @@ class VTKIOLEGACY_EXPORT vtkStructuredPointsReader : public vtkDataReader
public:
static vtkStructuredPointsReader *New();
vtkTypeMacro(vtkStructuredPointsReader,vtkDataReader);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -56,21 +56,21 @@ public:
* Read the meta information from the file. This needs to be public to it
* can be accessed by vtkDataSetReader.
*/
- int ReadMetaData(vtkInformation *outInfo) VTK_OVERRIDE;
+ int ReadMetaData(vtkInformation *outInfo) override;
protected:
vtkStructuredPointsReader();
- ~vtkStructuredPointsReader() VTK_OVERRIDE;
+ ~vtkStructuredPointsReader() override;
int RequestData(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
// Default method performs Update to get information. Not all the old
// structured points sources compute information
int RequestInformation(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
- int FillOutputPortInformation(int, vtkInformation *) VTK_OVERRIDE;
+ int FillOutputPortInformation(int, vtkInformation *) override;
private:
vtkStructuredPointsReader(const vtkStructuredPointsReader&) VTK_DELETE_FUNCTION;
void operator=(const vtkStructuredPointsReader&) VTK_DELETE_FUNCTION;
diff --git a/IO/Legacy/vtkStructuredPointsWriter.h b/IO/Legacy/vtkStructuredPointsWriter.h
index fd7ec8aebf722bf6f55b4184b6b639d3e220eb67..8f7b55d7bf0fbe33515d32be7a058d2b85e327bb 100644
--- a/IO/Legacy/vtkStructuredPointsWriter.h
+++ b/IO/Legacy/vtkStructuredPointsWriter.h
@@ -35,7 +35,7 @@ class VTKIOLEGACY_EXPORT vtkStructuredPointsWriter : public vtkDataWriter
public:
static vtkStructuredPointsWriter *New();
vtkTypeMacro(vtkStructuredPointsWriter,vtkDataWriter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -60,11 +60,11 @@ public:
protected:
vtkStructuredPointsWriter() : WriteExtent(false) {}
- ~vtkStructuredPointsWriter() VTK_OVERRIDE {}
+ ~vtkStructuredPointsWriter() override {}
- void WriteData() VTK_OVERRIDE;
+ void WriteData() override;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
bool WriteExtent;
diff --git a/IO/Legacy/vtkTableReader.h b/IO/Legacy/vtkTableReader.h
index 8972f13c249cd93f590d27919869819edba8abad..32c99a2a51a6040e853656dee3ad7143d2f97096 100644
--- a/IO/Legacy/vtkTableReader.h
+++ b/IO/Legacy/vtkTableReader.h
@@ -41,7 +41,7 @@ class VTKIOLEGACY_EXPORT vtkTableReader : public vtkDataReader
public:
static vtkTableReader *New();
vtkTypeMacro(vtkTableReader,vtkDataReader);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -54,18 +54,18 @@ public:
protected:
vtkTableReader();
- ~vtkTableReader() VTK_OVERRIDE;
+ ~vtkTableReader() override;
int RequestData(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
// Since the Outputs[0] has the same UpdateExtent format
// as the generic DataObject we can copy the UpdateExtent
// as a default behavior.
int RequestUpdateExtent(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
- int FillOutputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
+ int FillOutputPortInformation(int, vtkInformation*) override;
private:
vtkTableReader(const vtkTableReader&) VTK_DELETE_FUNCTION;
void operator=(const vtkTableReader&) VTK_DELETE_FUNCTION;
diff --git a/IO/Legacy/vtkTableWriter.h b/IO/Legacy/vtkTableWriter.h
index 6b9b727978aaafe0ae8f1c90d723e1ae05750c01..1a81396d10348082a33ac8259df5a4e63091153a 100644
--- a/IO/Legacy/vtkTableWriter.h
+++ b/IO/Legacy/vtkTableWriter.h
@@ -34,7 +34,7 @@ class VTKIOLEGACY_EXPORT vtkTableWriter : public vtkDataWriter
public:
static vtkTableWriter *New();
vtkTypeMacro(vtkTableWriter,vtkDataWriter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -46,11 +46,11 @@ public:
protected:
vtkTableWriter() {}
- ~vtkTableWriter() VTK_OVERRIDE {}
+ ~vtkTableWriter() override {}
- void WriteData() VTK_OVERRIDE;
+ void WriteData() override;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
private:
vtkTableWriter(const vtkTableWriter&) VTK_DELETE_FUNCTION;
diff --git a/IO/Legacy/vtkTreeReader.h b/IO/Legacy/vtkTreeReader.h
index e8130be56aba5a746d354cfb53ef48bdffb7df54..95e9aa77ad96d1d736b9b3344f1d75e0db329975 100644
--- a/IO/Legacy/vtkTreeReader.h
+++ b/IO/Legacy/vtkTreeReader.h
@@ -41,7 +41,7 @@ class VTKIOLEGACY_EXPORT vtkTreeReader : public vtkDataReader
public:
static vtkTreeReader *New();
vtkTypeMacro(vtkTreeReader,vtkDataReader);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -54,18 +54,18 @@ public:
protected:
vtkTreeReader();
- ~vtkTreeReader() VTK_OVERRIDE;
+ ~vtkTreeReader() override;
int RequestData(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
// Since the Outputs[0] has the same UpdateExtent format
// as the generic DataObject we can copy the UpdateExtent
// as a default behavior.
int RequestUpdateExtent(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
- int FillOutputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
+ int FillOutputPortInformation(int, vtkInformation*) override;
private:
vtkTreeReader(const vtkTreeReader&) VTK_DELETE_FUNCTION;
void operator=(const vtkTreeReader&) VTK_DELETE_FUNCTION;
diff --git a/IO/Legacy/vtkTreeWriter.h b/IO/Legacy/vtkTreeWriter.h
index acf0cb9b13a7346f0fd6495bb265af5c1d121c8f..201bcb6ecce64136120d741a67ab13b64332c186 100644
--- a/IO/Legacy/vtkTreeWriter.h
+++ b/IO/Legacy/vtkTreeWriter.h
@@ -35,7 +35,7 @@ class VTKIOLEGACY_EXPORT vtkTreeWriter : public vtkDataWriter
public:
static vtkTreeWriter *New();
vtkTypeMacro(vtkTreeWriter,vtkDataWriter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -47,11 +47,11 @@ public:
protected:
vtkTreeWriter() {}
- ~vtkTreeWriter() VTK_OVERRIDE {}
+ ~vtkTreeWriter() override {}
- void WriteData() VTK_OVERRIDE;
+ void WriteData() override;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
private:
vtkTreeWriter(const vtkTreeWriter&) VTK_DELETE_FUNCTION;
diff --git a/IO/Legacy/vtkUnstructuredGridReader.h b/IO/Legacy/vtkUnstructuredGridReader.h
index 43d69a0a8d8fbf536ce20cd1c7d2d797d60096d8..472e4373df42f124b94e69ad400856169bbd1400 100644
--- a/IO/Legacy/vtkUnstructuredGridReader.h
+++ b/IO/Legacy/vtkUnstructuredGridReader.h
@@ -41,7 +41,7 @@ class VTKIOLEGACY_EXPORT vtkUnstructuredGridReader : public vtkDataReader
public:
static vtkUnstructuredGridReader *New();
vtkTypeMacro(vtkUnstructuredGridReader,vtkDataReader);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -54,18 +54,18 @@ public:
protected:
vtkUnstructuredGridReader();
- ~vtkUnstructuredGridReader() VTK_OVERRIDE;
+ ~vtkUnstructuredGridReader() override;
int RequestData(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
// Since the Outputs[0] has the same UpdateExtent format
// as the generic DataObject we can copy the UpdateExtent
// as a default behavior.
int RequestUpdateExtent(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
- int FillOutputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
+ int FillOutputPortInformation(int, vtkInformation*) override;
private:
vtkUnstructuredGridReader(const vtkUnstructuredGridReader&) VTK_DELETE_FUNCTION;
void operator=(const vtkUnstructuredGridReader&) VTK_DELETE_FUNCTION;
diff --git a/IO/Legacy/vtkUnstructuredGridWriter.h b/IO/Legacy/vtkUnstructuredGridWriter.h
index d7f33de45788943216d787b3b7396139eec7e9b0..5115aa7c25a2a8d81cce361ab302806068e5c3e0 100644
--- a/IO/Legacy/vtkUnstructuredGridWriter.h
+++ b/IO/Legacy/vtkUnstructuredGridWriter.h
@@ -34,7 +34,7 @@ class VTKIOLEGACY_EXPORT vtkUnstructuredGridWriter : public vtkDataWriter
public:
static vtkUnstructuredGridWriter *New();
vtkTypeMacro(vtkUnstructuredGridWriter,vtkDataWriter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -46,14 +46,14 @@ public:
protected:
vtkUnstructuredGridWriter() {}
- ~vtkUnstructuredGridWriter() VTK_OVERRIDE {}
+ ~vtkUnstructuredGridWriter() override {}
- void WriteData() VTK_OVERRIDE;
+ void WriteData() override;
int WriteCellsAndFaces(ostream *fp, vtkUnstructuredGrid *grid,
const char *label);
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
private:
vtkUnstructuredGridWriter(const vtkUnstructuredGridWriter&) VTK_DELETE_FUNCTION;
diff --git a/IO/MINC/vtkMINCImageAttributes.h b/IO/MINC/vtkMINCImageAttributes.h
index 8984e4817544d78460b68be1324839be0a1d6c1f..0858aa352ff9a3f875c73f097cbe51381f06a959 100644
--- a/IO/MINC/vtkMINCImageAttributes.h
+++ b/IO/MINC/vtkMINCImageAttributes.h
@@ -86,7 +86,7 @@ public:
vtkTypeMacro(vtkMINCImageAttributes,vtkObject);
static vtkMINCImageAttributes *New();
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Reset all the attributes in preparation for loading
@@ -293,7 +293,7 @@ public:
protected:
vtkMINCImageAttributes();
- ~vtkMINCImageAttributes() VTK_OVERRIDE;
+ ~vtkMINCImageAttributes() override;
const char *ConvertDataArrayToString(vtkDataArray *array);
diff --git a/IO/MINC/vtkMINCImageReader.h b/IO/MINC/vtkMINCImageReader.h
index acd78caf30aebefff3e665b1e1c74e941841d42b..aa70a8cef4c70b8fdb9c89c030bf66162ede3eee 100644
--- a/IO/MINC/vtkMINCImageReader.h
+++ b/IO/MINC/vtkMINCImageReader.h
@@ -88,29 +88,29 @@ public:
vtkTypeMacro(vtkMINCImageReader,vtkImageReader2);
static vtkMINCImageReader *New();
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Set the file name.
*/
- void SetFileName(const char *name) VTK_OVERRIDE;
+ void SetFileName(const char *name) override;
/**
* Get the entension for this file format.
*/
- const char* GetFileExtensions() VTK_OVERRIDE {
+ const char* GetFileExtensions() override {
return ".mnc"; }
/**
* Get the name of this file format.
*/
- const char* GetDescriptiveName() VTK_OVERRIDE {
+ const char* GetDescriptiveName() override {
return "MINC"; }
/**
* Test whether the specified file can be read.
*/
- int CanReadFile(const char* name) VTK_OVERRIDE;
+ int CanReadFile(const char* name) override;
/**
* Get a matrix that describes the orientation of the data.
@@ -174,7 +174,7 @@ public:
protected:
vtkMINCImageReader();
- ~vtkMINCImageReader() VTK_OVERRIDE;
+ ~vtkMINCImageReader() override;
int MINCImageType;
int MINCImageTypeSigned;
@@ -200,8 +200,8 @@ protected:
virtual void FindRangeAndRescaleValues();
static int ConvertMINCTypeToVTKType(int minctype, int mincsigned);
- void ExecuteInformation() VTK_OVERRIDE;
- void ExecuteDataWithInformation(vtkDataObject *out, vtkInformation *outInfo) VTK_OVERRIDE;
+ void ExecuteInformation() override;
+ void ExecuteDataWithInformation(vtkDataObject *out, vtkInformation *outInfo) override;
private:
vtkMINCImageReader(const vtkMINCImageReader&) VTK_DELETE_FUNCTION;
diff --git a/IO/MINC/vtkMINCImageWriter.h b/IO/MINC/vtkMINCImageWriter.h
index 5091a9e3b13b2686b7408474453d8d5800089c2d..9d5bee503f17abb0871100e502c08f9b1d1dd201 100644
--- a/IO/MINC/vtkMINCImageWriter.h
+++ b/IO/MINC/vtkMINCImageWriter.h
@@ -85,7 +85,7 @@ public:
vtkTypeMacro(vtkMINCImageWriter,vtkImageWriter);
static vtkMINCImageWriter *New();
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Get the entension for this file format.
@@ -102,7 +102,7 @@ public:
/**
* Set the file name.
*/
- void SetFileName(const char *name) VTK_OVERRIDE;
+ void SetFileName(const char *name) override;
/**
* Write the data. This will attempt to stream the data
@@ -110,7 +110,7 @@ public:
* unless the whole extent of the input has already been
* updated.
*/
- void Write() VTK_OVERRIDE;
+ void Write() override;
//@{
/**
@@ -171,7 +171,7 @@ public:
protected:
vtkMINCImageWriter();
- ~vtkMINCImageWriter() VTK_OVERRIDE;
+ ~vtkMINCImageWriter() override;
int MINCImageType;
int MINCImageTypeSigned;
@@ -220,19 +220,19 @@ protected:
virtual void FindRescale(double &rescaleSlope, double &rescaleIntercept);
virtual void FindMINCValidRange(double range[2]);
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
int RequestInformation(vtkInformation *request,
vtkInformationVector **inputVector,
- vtkInformationVector *outputVector) VTK_OVERRIDE;
+ vtkInformationVector *outputVector) override;
int RequestUpdateExtent(vtkInformation *request,
vtkInformationVector **inputVector,
- vtkInformationVector *outputVector) VTK_OVERRIDE;
+ vtkInformationVector *outputVector) override;
int RequestData(vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
private:
vtkMINCImageWriter(const vtkMINCImageWriter&) VTK_DELETE_FUNCTION;
diff --git a/IO/MINC/vtkMNIObjectReader.h b/IO/MINC/vtkMNIObjectReader.h
index fba48d288fd7628ff7ab8e52dbdece7f7ad2f197..b84b4fca9728e1437b4abb7c501ad4acdc01fd32 100644
--- a/IO/MINC/vtkMNIObjectReader.h
+++ b/IO/MINC/vtkMNIObjectReader.h
@@ -81,7 +81,7 @@ public:
vtkTypeMacro(vtkMNIObjectReader,vtkPolyDataAlgorithm);
static vtkMNIObjectReader *New();
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -115,7 +115,7 @@ public:
protected:
vtkMNIObjectReader();
- ~vtkMNIObjectReader() VTK_OVERRIDE;
+ ~vtkMNIObjectReader() override;
char *FileName;
vtkProperty *Property;
@@ -148,7 +148,7 @@ protected:
int RequestData(vtkInformation* request,
vtkInformationVector** inInfo,
- vtkInformationVector* outInfo) VTK_OVERRIDE;
+ vtkInformationVector* outInfo) override;
private:
vtkMNIObjectReader(const vtkMNIObjectReader&) VTK_DELETE_FUNCTION;
diff --git a/IO/MINC/vtkMNIObjectWriter.h b/IO/MINC/vtkMNIObjectWriter.h
index 2e52faf330fdc50986832744f03585c7651139dd..b802e7422a7b1aa28c2085376d0d151223fb8275 100644
--- a/IO/MINC/vtkMNIObjectWriter.h
+++ b/IO/MINC/vtkMNIObjectWriter.h
@@ -82,7 +82,7 @@ public:
vtkTypeMacro(vtkMNIObjectWriter,vtkWriter);
static vtkMNIObjectWriter *New();
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Get the entension for this file format.
@@ -152,7 +152,7 @@ public:
protected:
vtkMNIObjectWriter();
- ~vtkMNIObjectWriter() VTK_OVERRIDE;
+ ~vtkMNIObjectWriter() override;
vtkProperty *Property;
vtkMapper *Mapper;
@@ -175,13 +175,13 @@ protected:
int WritePolygonObject(vtkPolyData *output);
int WriteLineObject(vtkPolyData *output);
- void WriteData() VTK_OVERRIDE;
+ void WriteData() override;
char* FileName;
int FileType;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
ostream *OpenFile();
void CloseFile(ostream *fp);
diff --git a/IO/MINC/vtkMNITagPointReader.h b/IO/MINC/vtkMNITagPointReader.h
index af698ec7b5bb78751f290fdfee7a83c476f72006..0148eb2b7ec0703a3dbd5e2a29bb55de87f08f0b 100644
--- a/IO/MINC/vtkMNITagPointReader.h
+++ b/IO/MINC/vtkMNITagPointReader.h
@@ -81,7 +81,7 @@ public:
vtkTypeMacro(vtkMNITagPointReader,vtkPolyDataAlgorithm);
static vtkMNITagPointReader *New();
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -159,7 +159,7 @@ public:
protected:
vtkMNITagPointReader();
- ~vtkMNITagPointReader() VTK_OVERRIDE;
+ ~vtkMNITagPointReader() override;
char *FileName;
int NumberOfVolumes;
@@ -190,7 +190,7 @@ protected:
int RequestData(vtkInformation* request,
vtkInformationVector** inInfo,
- vtkInformationVector* outInfo) VTK_OVERRIDE;
+ vtkInformationVector* outInfo) override;
private:
vtkMNITagPointReader(const vtkMNITagPointReader&) VTK_DELETE_FUNCTION;
diff --git a/IO/MINC/vtkMNITagPointWriter.h b/IO/MINC/vtkMNITagPointWriter.h
index 1cd2d743214faaa794cab2998e9549e2646b6e92..847eb3db6966a1ed71a607f3983563c34f042ac4 100644
--- a/IO/MINC/vtkMNITagPointWriter.h
+++ b/IO/MINC/vtkMNITagPointWriter.h
@@ -81,7 +81,7 @@ public:
vtkTypeMacro(vtkMNITagPointWriter,vtkWriter);
static vtkMNITagPointWriter *New();
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Get the entension for this file format.
@@ -154,12 +154,12 @@ public:
/**
* Write the file.
*/
- int Write() VTK_OVERRIDE;
+ int Write() override;
/**
* Get the MTime.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
//@{
/**
@@ -171,7 +171,7 @@ public:
protected:
vtkMNITagPointWriter();
- ~vtkMNITagPointWriter() VTK_OVERRIDE;
+ ~vtkMNITagPointWriter() override;
vtkPoints *Points[2];
vtkStringArray *LabelText;
@@ -180,13 +180,13 @@ protected:
vtkIntArray *PatientIds;
char *Comments;
- void WriteData() VTK_OVERRIDE {}
+ void WriteData() override {}
virtual void WriteData(vtkPointSet *inputs[2]);
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
int RequestData(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
char* FileName;
diff --git a/IO/MINC/vtkMNITransformReader.h b/IO/MINC/vtkMNITransformReader.h
index 5eb85c78ea82110e9e045bb01eaf18553d3d7321..5ed4cc92fba9da0f177dc9261e146737270504c7 100644
--- a/IO/MINC/vtkMNITransformReader.h
+++ b/IO/MINC/vtkMNITransformReader.h
@@ -77,7 +77,7 @@ public:
vtkTypeMacro(vtkMNITransformReader,vtkAlgorithm);
static vtkMNITransformReader *New();
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -128,7 +128,7 @@ public:
protected:
vtkMNITransformReader();
- ~vtkMNITransformReader() VTK_OVERRIDE;
+ ~vtkMNITransformReader() override;
char *FileName;
vtkAbstractTransform *Transform;
@@ -161,7 +161,7 @@ protected:
int ProcessRequest(vtkInformation* request,
vtkInformationVector** inInfo,
- vtkInformationVector* outInfo) VTK_OVERRIDE;
+ vtkInformationVector* outInfo) override;
private:
vtkMNITransformReader(const vtkMNITransformReader&) VTK_DELETE_FUNCTION;
diff --git a/IO/MINC/vtkMNITransformWriter.h b/IO/MINC/vtkMNITransformWriter.h
index 1118d4cbb5d34dd2e7f49dbd55166b3009fda55c..c8b5460ca8da5a8cf4d046441d511bcf317d0617 100644
--- a/IO/MINC/vtkMNITransformWriter.h
+++ b/IO/MINC/vtkMNITransformWriter.h
@@ -79,7 +79,7 @@ public:
vtkTypeMacro(vtkMNITransformWriter,vtkAlgorithm);
static vtkMNITransformWriter *New();
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -137,7 +137,7 @@ public:
protected:
vtkMNITransformWriter();
- ~vtkMNITransformWriter() VTK_OVERRIDE;
+ ~vtkMNITransformWriter() override;
char *FileName;
vtkAbstractTransform *Transform;
@@ -158,7 +158,7 @@ protected:
int ProcessRequest(vtkInformation* request,
vtkInformationVector** inInfo,
- vtkInformationVector* outInfo) VTK_OVERRIDE;
+ vtkInformationVector* outInfo) override;
private:
vtkMNITransformWriter(const vtkMNITransformWriter&) VTK_DELETE_FUNCTION;
diff --git a/IO/MPIImage/vtkMPIImageReader.h b/IO/MPIImage/vtkMPIImageReader.h
index 84a22d955bc68f1686bd082675fb0517592747b1..55e2dd6b55d5cd4610658a571cf41d375d21c513 100644
--- a/IO/MPIImage/vtkMPIImageReader.h
+++ b/IO/MPIImage/vtkMPIImageReader.h
@@ -59,7 +59,7 @@ class VTKIOMPIIMAGE_EXPORT vtkMPIImageReader : public vtkImageReader
public:
vtkTypeMacro(vtkMPIImageReader, vtkImageReader);
static vtkMPIImageReader *New();
- virtual void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ virtual void PrintSelf(ostream &os, vtkIndent indent) override;
//@{
/**
@@ -126,7 +126,7 @@ protected:
//@}
virtual void ExecuteDataWithInformation(vtkDataObject *data,
- vtkInformation *outInfo) VTK_OVERRIDE;
+ vtkInformation *outInfo) override;
private:
vtkMPIImageReader(const vtkMPIImageReader &) VTK_DELETE_FUNCTION;
diff --git a/IO/MPIImage/vtkPNrrdReader.h b/IO/MPIImage/vtkPNrrdReader.h
index 6760b237e83649a22db2a5e42d9ebdc73fa1206e..74a13dbf1545825c59df38ba80b39780488c897e 100644
--- a/IO/MPIImage/vtkPNrrdReader.h
+++ b/IO/MPIImage/vtkPNrrdReader.h
@@ -52,7 +52,7 @@ class VTKIOMPIIMAGE_EXPORT vtkPNrrdReader : public vtkNrrdReader
public:
vtkTypeMacro(vtkPNrrdReader, vtkNrrdReader);
static vtkPNrrdReader *New();
- virtual void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ virtual void PrintSelf(ostream &os, vtkIndent indent) override;
//@{
/**
@@ -67,8 +67,8 @@ protected:
vtkPNrrdReader();
~vtkPNrrdReader();
- virtual int ReadHeader() VTK_OVERRIDE;
- virtual int ReadHeader(vtkCharArray *headerBuffer) VTK_OVERRIDE;
+ virtual int ReadHeader() override;
+ virtual int ReadHeader(vtkCharArray *headerBuffer) override;
/**
* Returns the size, in bytes of the scalar data type (GetDataScalarType).
@@ -120,7 +120,7 @@ protected:
//@}
virtual void ExecuteDataWithInformation(vtkDataObject *data,
- vtkInformation *outInfo) VTK_OVERRIDE;
+ vtkInformation *outInfo) override;
vtkMultiProcessController *Controller;
diff --git a/IO/MPIParallel/vtkMPIMultiBlockPLOT3DReader.h b/IO/MPIParallel/vtkMPIMultiBlockPLOT3DReader.h
index a4448c5b5845881d12d7cea985ca87f94d7b2991..f94d3f606a3179cd66aa8e8d028c19abde22e15f 100644
--- a/IO/MPIParallel/vtkMPIMultiBlockPLOT3DReader.h
+++ b/IO/MPIParallel/vtkMPIMultiBlockPLOT3DReader.h
@@ -33,7 +33,7 @@ class VTKIOMPIPARALLEL_EXPORT vtkMPIMultiBlockPLOT3DReader : public vtkMultiBloc
public:
static vtkMPIMultiBlockPLOT3DReader* New();
vtkTypeMacro(vtkMPIMultiBlockPLOT3DReader, vtkMultiBlockPLOT3DReader);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -55,24 +55,24 @@ protected:
*/
bool CanUseMPIIO();
- virtual int OpenFileForDataRead(void*& fp, const char* fname) VTK_OVERRIDE;
- virtual void CloseFile(void* fp) VTK_OVERRIDE;
+ virtual int OpenFileForDataRead(void*& fp, const char* fname) override;
+ virtual void CloseFile(void* fp) override;
virtual int ReadIntScalar(
void* vfp,
int extent[6], int wextent[6],
vtkDataArray* scalar, vtkTypeUInt64 offset,
- const vtkMultiBlockPLOT3DReaderRecord& currentRecord) VTK_OVERRIDE;
+ const vtkMultiBlockPLOT3DReaderRecord& currentRecord) override;
virtual int ReadScalar(
void* vfp,
int extent[6], int wextent[6],
vtkDataArray* scalar, vtkTypeUInt64 offset,
- const vtkMultiBlockPLOT3DReaderRecord& currentRecord) VTK_OVERRIDE;
+ const vtkMultiBlockPLOT3DReaderRecord& currentRecord) override;
virtual int ReadVector(
void* vfp,
int extent[6], int wextent[6],
int numDims, vtkDataArray* vector, vtkTypeUInt64 offset,
- const vtkMultiBlockPLOT3DReaderRecord& currentRecord) VTK_OVERRIDE;
+ const vtkMultiBlockPLOT3DReaderRecord& currentRecord) override;
bool UseMPIIO;
private:
vtkMPIMultiBlockPLOT3DReader(const vtkMPIMultiBlockPLOT3DReader&) VTK_DELETE_FUNCTION;
diff --git a/IO/MPIParallel/vtkPWindBladeReader.h b/IO/MPIParallel/vtkPWindBladeReader.h
index b0a3082e5d974282bf44fa48eaa9d1a4a9973005..d6e56ccbff3f10a60b88ee62a8112418f704056d 100644
--- a/IO/MPIParallel/vtkPWindBladeReader.h
+++ b/IO/MPIParallel/vtkPWindBladeReader.h
@@ -42,24 +42,24 @@ public:
static vtkPWindBladeReader *New();
vtkTypeMacro(vtkPWindBladeReader, vtkWindBladeReader);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
protected:
vtkPWindBladeReader();
~vtkPWindBladeReader();
virtual int RequestData(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
virtual void CalculatePressure(int pressure, int prespre,
- int tempg, int density) VTK_OVERRIDE;
- virtual void CalculateVorticity(int vort, int uvw, int density) VTK_OVERRIDE;
- virtual void LoadVariableData(int var) VTK_OVERRIDE;
- virtual bool ReadGlobalData() VTK_OVERRIDE;
- virtual bool FindVariableOffsets() VTK_OVERRIDE;
- virtual void CreateZTopography(float* zValues) VTK_OVERRIDE;
- virtual void SetupBladeData() VTK_OVERRIDE;
- virtual void LoadBladeData(int timeStep) VTK_OVERRIDE;
+ int tempg, int density) override;
+ virtual void CalculateVorticity(int vort, int uvw, int density) override;
+ virtual void LoadVariableData(int var) override;
+ virtual bool ReadGlobalData() override;
+ virtual bool FindVariableOffsets() override;
+ virtual void CreateZTopography(float* zValues) override;
+ virtual void SetupBladeData() override;
+ virtual void LoadBladeData(int timeStep) override;
private:
PWindBladeReaderInternal * PInternal;
diff --git a/IO/Movie/vtkGenericMovieWriter.h b/IO/Movie/vtkGenericMovieWriter.h
index 728b65c5aa6fa23303cb1193615d5cb445e5c118..ca3d05e9418d2f3fe649a18c782133e351bf857a 100644
--- a/IO/Movie/vtkGenericMovieWriter.h
+++ b/IO/Movie/vtkGenericMovieWriter.h
@@ -37,7 +37,7 @@ class VTKIOMOVIE_EXPORT vtkGenericMovieWriter : public vtkImageAlgorithm
{
public:
vtkTypeMacro(vtkGenericMovieWriter,vtkImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -80,7 +80,7 @@ public:
protected:
vtkGenericMovieWriter();
- ~vtkGenericMovieWriter() VTK_OVERRIDE;
+ ~vtkGenericMovieWriter() override;
char *FileName;
int Error;
diff --git a/IO/Movie/vtkOggTheoraWriter.h b/IO/Movie/vtkOggTheoraWriter.h
index aa0adbf40aadb953583e83ab321b7d43a5284a45..d782c3b8b25868dd34c7869a5b0b414ec9a6f75e 100644
--- a/IO/Movie/vtkOggTheoraWriter.h
+++ b/IO/Movie/vtkOggTheoraWriter.h
@@ -39,16 +39,16 @@ class VTKIOMOVIE_EXPORT vtkOggTheoraWriter : public vtkGenericMovieWriter
public:
static vtkOggTheoraWriter *New();
vtkTypeMacro(vtkOggTheoraWriter,vtkGenericMovieWriter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
* These methods start writing an Movie file, write a frame to the file
* and then end the writing process.
*/
- void Start() VTK_OVERRIDE;
- void Write() VTK_OVERRIDE;
- void End() VTK_OVERRIDE;
+ void Start() override;
+ void Write() override;
+ void End() override;
//@}
//@{
@@ -80,7 +80,7 @@ public:
protected:
vtkOggTheoraWriter();
- ~vtkOggTheoraWriter() VTK_OVERRIDE;
+ ~vtkOggTheoraWriter() override;
vtkOggTheoraWriterInternal *Internals;
diff --git a/IO/MySQL/vtkMySQLDatabase.h b/IO/MySQL/vtkMySQLDatabase.h
index a8df8f5db6491bcb26bd339962bef201709e4392..e4d04b2e905ab58b6229af75860db78805bd2356 100644
--- a/IO/MySQL/vtkMySQLDatabase.h
+++ b/IO/MySQL/vtkMySQLDatabase.h
@@ -105,7 +105,7 @@ public:
/**
* String representing database type (e.g. "mysql").
*/
- const char* GetDatabaseType() VTK_OVERRIDE
+ const char* GetDatabaseType() override
{
return this->DatabaseType;
}
diff --git a/IO/NetCDF/vtkMPASReader.h b/IO/NetCDF/vtkMPASReader.h
index 8845b4fc55213ac03294ac4c793e94f4dd04de12..27c494597a30a0e05f10ad1443e31afeb38cf952 100644
--- a/IO/NetCDF/vtkMPASReader.h
+++ b/IO/NetCDF/vtkMPASReader.h
@@ -95,7 +95,7 @@ class VTKIONETCDF_EXPORT vtkMPASReader : public vtkUnstructuredGridAlgorithm
public:
static vtkMPASReader *New();
vtkTypeMacro(vtkMPASReader,vtkUnstructuredGridAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -229,11 +229,11 @@ class VTKIONETCDF_EXPORT vtkMPASReader : public vtkUnstructuredGridAlgorithm
*/
static int CanReadFile(const char *filename);
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
protected:
vtkMPASReader();
- ~vtkMPASReader() VTK_OVERRIDE;
+ ~vtkMPASReader() override;
void ReleaseNcData();
void DestroyData();
@@ -246,9 +246,9 @@ class VTKIONETCDF_EXPORT vtkMPASReader : public vtkUnstructuredGridAlgorithm
vtkCallbackCommand* SelectionObserver;
int RequestData(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
int RequestInformation(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
static void SelectionCallback(vtkObject* caller, unsigned long eid,
diff --git a/IO/NetCDF/vtkNetCDFCAMReader.h b/IO/NetCDF/vtkNetCDFCAMReader.h
index 44bb870379f10d8d0a354f648868358355e87f9a..77a3d9c8a9657e7579df825c53d5bd6ab45212bd 100644
--- a/IO/NetCDF/vtkNetCDFCAMReader.h
+++ b/IO/NetCDF/vtkNetCDFCAMReader.h
@@ -41,7 +41,7 @@ class VTKIONETCDF_EXPORT vtkNetCDFCAMReader : public vtkUnstructuredGridAlgorith
public:
static vtkNetCDFCAMReader *New();
vtkTypeMacro(vtkNetCDFCAMReader,vtkUnstructuredGridAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Returns 1 if this file can be read and 0 if the file cannot be read.
@@ -118,16 +118,16 @@ public:
protected:
vtkNetCDFCAMReader();
- ~vtkNetCDFCAMReader() VTK_OVERRIDE;
+ ~vtkNetCDFCAMReader() override;
int RequestInformation(vtkInformation*, vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
int RequestData(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
int RequestUpdateExtent(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
/**
* Returns true for success. Based on the piece, number of pieces,
diff --git a/IO/NetCDF/vtkNetCDFCFReader.h b/IO/NetCDF/vtkNetCDFCFReader.h
index 926e503a0f09a542900cc343455c92822ccb7b1c..057f8f436c9f1c04ee740815f39303131bae208f 100644
--- a/IO/NetCDF/vtkNetCDFCFReader.h
+++ b/IO/NetCDF/vtkNetCDFCFReader.h
@@ -49,7 +49,7 @@ class VTKIONETCDF_EXPORT vtkNetCDFCFReader : public vtkNetCDFReader
public:
vtkTypeMacro(vtkNetCDFCFReader, vtkNetCDFReader);
static vtkNetCDFCFReader *New();
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
//@{
/**
@@ -106,7 +106,7 @@ public:
protected:
vtkNetCDFCFReader();
- ~vtkNetCDFCFReader() VTK_OVERRIDE;
+ ~vtkNetCDFCFReader() override;
int SphericalCoordinates;
@@ -117,23 +117,23 @@ protected:
int RequestDataObject(vtkInformation *request,
vtkInformationVector **inputVector,
- vtkInformationVector *outputVector) VTK_OVERRIDE;
+ vtkInformationVector *outputVector) override;
int RequestInformation(vtkInformation *request,
vtkInformationVector **inputVector,
- vtkInformationVector *outputVector) VTK_OVERRIDE;
+ vtkInformationVector *outputVector) override;
int RequestData(vtkInformation *request,
vtkInformationVector **inputVector,
- vtkInformationVector *outputVector) VTK_OVERRIDE;
+ vtkInformationVector *outputVector) override;
//@{
/**
* Interprets the special conventions of COARDS.
*/
- int ReadMetaData(int ncFD) VTK_OVERRIDE;
- int IsTimeDimension(int ncFD, int dimId) VTK_OVERRIDE;
- vtkSmartPointer<vtkDoubleArray> GetTimeValues(int ncFD, int dimId) VTK_OVERRIDE;
+ int ReadMetaData(int ncFD) override;
+ int IsTimeDimension(int ncFD, int dimId) override;
+ vtkSmartPointer<vtkDoubleArray> GetTimeValues(int ncFD, int dimId) override;
//@}
class vtkDimensionInfo {
@@ -247,7 +247,7 @@ protected:
/**
* Returns false for spherical dimensions, which should use cell data.
*/
- bool DimensionsAreForPointData(vtkIntArray *dimensions) VTK_OVERRIDE;
+ bool DimensionsAreForPointData(vtkIntArray *dimensions) override;
/**
* Convenience function that takes piece information and then returns a set of
@@ -262,7 +262,7 @@ protected:
/**
* Overridden to retrieve stored extent for unstructured data.
*/
- void GetUpdateExtentForOutput(vtkDataSet *output, int extent[6]) VTK_OVERRIDE;
+ void GetUpdateExtentForOutput(vtkDataSet *output, int extent[6]) override;
//@{
/**
diff --git a/IO/NetCDF/vtkNetCDFPOPReader.h b/IO/NetCDF/vtkNetCDFPOPReader.h
index 62e2084a676d15267b0170556a096fb1da3ad45d..016f2a1afa28becf051b8993663abceab6abbd1f 100644
--- a/IO/NetCDF/vtkNetCDFPOPReader.h
+++ b/IO/NetCDF/vtkNetCDFPOPReader.h
@@ -43,7 +43,7 @@ class VTKIONETCDF_EXPORT vtkNetCDFPOPReader : public vtkRectilinearGridAlgorithm
public:
vtkTypeMacro(vtkNetCDFPOPReader,vtkRectilinearGridAlgorithm);
static vtkNetCDFPOPReader *New();
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -73,13 +73,13 @@ public:
protected:
vtkNetCDFPOPReader();
- ~vtkNetCDFPOPReader() VTK_OVERRIDE;
+ ~vtkNetCDFPOPReader() override;
int RequestData(vtkInformation*,vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
int RequestInformation(vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
static void SelectionModifiedCallback(vtkObject *caller, unsigned long eid,
void *clientdata, void *calldata);
diff --git a/IO/NetCDF/vtkNetCDFReader.h b/IO/NetCDF/vtkNetCDFReader.h
index ce37d508d76b2e1459ee265539d37b90d3283c08..a6361555f7ba44e88dc8edcfbe5376438e6251b7 100644
--- a/IO/NetCDF/vtkNetCDFReader.h
+++ b/IO/NetCDF/vtkNetCDFReader.h
@@ -53,7 +53,7 @@ class VTKIONETCDF_EXPORT vtkNetCDFReader : public vtkDataObjectAlgorithm
public:
vtkTypeMacro(vtkNetCDFReader, vtkDataObjectAlgorithm);
static vtkNetCDFReader *New();
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
virtual void SetFileName(const char *filename);
vtkGetStringMacro(FileName);
@@ -148,7 +148,7 @@ public:
protected:
vtkNetCDFReader();
- ~vtkNetCDFReader() VTK_OVERRIDE;
+ ~vtkNetCDFReader() override;
char *FileName;
vtkTimeStamp FileNameMTime;
@@ -179,15 +179,15 @@ protected:
int RequestDataObject(vtkInformation *request,
vtkInformationVector **inputVector,
- vtkInformationVector *outputVector) VTK_OVERRIDE;
+ vtkInformationVector *outputVector) override;
int RequestInformation(vtkInformation *request,
vtkInformationVector **inputVector,
- vtkInformationVector *outputVector) VTK_OVERRIDE;
+ vtkInformationVector *outputVector) override;
int RequestData(vtkInformation *request,
vtkInformationVector **inputVector,
- vtkInformationVector *outputVector) VTK_OVERRIDE;
+ vtkInformationVector *outputVector) override;
/**
* Callback registered with the VariableArraySelection.
diff --git a/IO/NetCDF/vtkSLACParticleReader.h b/IO/NetCDF/vtkSLACParticleReader.h
index d06304a9d63ebc2e542ee6246d91b25af8ea1087..8de643cb3223377609747b120c8c6fad29af29b9 100644
--- a/IO/NetCDF/vtkSLACParticleReader.h
+++ b/IO/NetCDF/vtkSLACParticleReader.h
@@ -51,7 +51,7 @@ class VTKIONETCDF_EXPORT vtkSLACParticleReader : public vtkPolyDataAlgorithm
public:
vtkTypeMacro(vtkSLACParticleReader, vtkPolyDataAlgorithm);
static vtkSLACParticleReader *New();
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
vtkGetStringMacro(FileName);
vtkSetStringMacro(FileName);
@@ -63,17 +63,17 @@ public:
protected:
vtkSLACParticleReader();
- ~vtkSLACParticleReader() VTK_OVERRIDE;
+ ~vtkSLACParticleReader() override;
char *FileName;
int RequestInformation(vtkInformation *request,
vtkInformationVector **inputVector,
- vtkInformationVector *outputVector) VTK_OVERRIDE;
+ vtkInformationVector *outputVector) override;
int RequestData(vtkInformation *request,
vtkInformationVector **inputVector,
- vtkInformationVector *outputVector) VTK_OVERRIDE;
+ vtkInformationVector *outputVector) override;
/**
* Convenience function that checks the dimensions of a 2D netCDF array that
diff --git a/IO/NetCDF/vtkSLACReader.h b/IO/NetCDF/vtkSLACReader.h
index d1f8ce0de87efc8d282a1cb9aebeba1f58b1047d..92fd1f5dbfb1c0b0d3a71e2fcc230ddb018844ed 100644
--- a/IO/NetCDF/vtkSLACReader.h
+++ b/IO/NetCDF/vtkSLACReader.h
@@ -51,7 +51,7 @@ class VTKIONETCDF_EXPORT vtkSLACReader : public vtkMultiBlockDataSetAlgorithm
public:
vtkTypeMacro(vtkSLACReader, vtkMultiBlockDataSetAlgorithm);
static vtkSLACReader *New();
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
vtkGetStringMacro(MeshFileName);
vtkSetStringMacro(MeshFileName);
@@ -216,7 +216,7 @@ public:
protected:
vtkSLACReader();
- ~vtkSLACReader() VTK_OVERRIDE;
+ ~vtkSLACReader() override;
class vtkInternal;
vtkInternal *Internal;
@@ -248,11 +248,11 @@ protected:
int RequestInformation(vtkInformation *request,
vtkInformationVector **inputVector,
- vtkInformationVector *outputVector) VTK_OVERRIDE;
+ vtkInformationVector *outputVector) override;
int RequestData(vtkInformation *request,
vtkInformationVector **inputVector,
- vtkInformationVector *outputVector) VTK_OVERRIDE;
+ vtkInformationVector *outputVector) override;
/**
* Callback registered with the VariableArraySelection.
diff --git a/IO/ODBC/vtkODBCDatabase.h b/IO/ODBC/vtkODBCDatabase.h
index ea602ca4d059a318dad75a3793ee0c1aa1d3b6b0..96a91f78bcfa348e12b91a046f7869d0ebccaa69 100644
--- a/IO/ODBC/vtkODBCDatabase.h
+++ b/IO/ODBC/vtkODBCDatabase.h
@@ -155,7 +155,7 @@ public:
/**
* String representing database type (e.g. "ODBC").
*/
- const char* GetDatabaseType() VTK_OVERRIDE
+ const char* GetDatabaseType() override
{
return this->DatabaseType;
}
diff --git a/IO/PLY/vtkPLYReader.h b/IO/PLY/vtkPLYReader.h
index 507e515db5d285b37b66bc3da479e878ace8bd7f..0ff40ab3eb18529a66dd8848760bfb7ade97cca3 100644
--- a/IO/PLY/vtkPLYReader.h
+++ b/IO/PLY/vtkPLYReader.h
@@ -40,7 +40,7 @@ class VTKIOPLY_EXPORT vtkPLYReader : public vtkAbstractPolyDataReader
{
public:
vtkTypeMacro(vtkPLYReader,vtkAbstractPolyDataReader);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct object with merging set to true.
@@ -54,9 +54,9 @@ public:
protected:
vtkPLYReader();
- ~vtkPLYReader() VTK_OVERRIDE;
+ ~vtkPLYReader() override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
private:
vtkPLYReader(const vtkPLYReader&) VTK_DELETE_FUNCTION;
void operator=(const vtkPLYReader&) VTK_DELETE_FUNCTION;
diff --git a/IO/PLY/vtkPLYWriter.h b/IO/PLY/vtkPLYWriter.h
index 2a33d15c5ba4216bf334b8d3d72c909074f2d0e9..0077b791cefdd9cafa8248c7f9d68cfeca54a895 100644
--- a/IO/PLY/vtkPLYWriter.h
+++ b/IO/PLY/vtkPLYWriter.h
@@ -67,7 +67,7 @@ class VTKIOPLY_EXPORT vtkPLYWriter : public vtkWriter
public:
static vtkPLYWriter *New();
vtkTypeMacro(vtkPLYWriter,vtkWriter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -214,9 +214,9 @@ public:
protected:
vtkPLYWriter();
- ~vtkPLYWriter() VTK_OVERRIDE;
+ ~vtkPLYWriter() override;
- void WriteData() VTK_OVERRIDE;
+ void WriteData() override;
vtkSmartPointer<vtkUnsignedCharArray> GetColors(vtkIdType num, vtkDataSetAttributes* dsa);
const float *GetTextureCoordinates(vtkIdType num, vtkDataSetAttributes *dsa);
@@ -237,7 +237,7 @@ protected:
vtkSmartPointer<vtkStringArray> HeaderComments;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
private:
vtkPLYWriter(const vtkPLYWriter&) VTK_DELETE_FUNCTION;
diff --git a/IO/Parallel/vtkEnSightWriter.h b/IO/Parallel/vtkEnSightWriter.h
index bdbf19e8bd07784cadc39c6a722f96fdbad0369b..14d76c86d03f864aacb5789f3ae0ef1cddc1b3e7 100644
--- a/IO/Parallel/vtkEnSightWriter.h
+++ b/IO/Parallel/vtkEnSightWriter.h
@@ -43,7 +43,7 @@ class VTKIOPARALLEL_EXPORT vtkEnSightWriter : public vtkWriter
public:
vtkTypeMacro(vtkEnSightWriter,vtkWriter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
@@ -152,11 +152,11 @@ public:
protected:
vtkEnSightWriter();
- ~vtkEnSightWriter() VTK_OVERRIDE;
+ ~vtkEnSightWriter() override;
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
- void WriteData() VTK_OVERRIDE; // method to allow this class to be instantiated and delegated to
+ void WriteData() override; // method to allow this class to be instantiated and delegated to
virtual void WriteStringToFile(const char* string, FILE* file);
virtual void WriteTerminatedStringToFile(const char* string, FILE* file);
diff --git a/IO/Parallel/vtkMultiBlockPLOT3DReader.h b/IO/Parallel/vtkMultiBlockPLOT3DReader.h
index 6b5102ac665bc38d061e6ec3a957e7c39a6b2ab0..e5a8bfce9c786502a3833d20dff09d0239904915 100644
--- a/IO/Parallel/vtkMultiBlockPLOT3DReader.h
+++ b/IO/Parallel/vtkMultiBlockPLOT3DReader.h
@@ -141,7 +141,7 @@ friend class Functors::ComputeStrainRateFunctor;
public:
static vtkMultiBlockPLOT3DReader *New();
vtkTypeMacro(vtkMultiBlockPLOT3DReader,vtkMultiBlockDataSetAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -359,7 +359,7 @@ public:
protected:
vtkMultiBlockPLOT3DReader();
- ~vtkMultiBlockPLOT3DReader() VTK_OVERRIDE;
+ ~vtkMultiBlockPLOT3DReader() override;
vtkDataArray* CreateFloatArray();
@@ -476,14 +476,14 @@ protected:
int ScalarFunctionNumber;
int VectorFunctionNumber;
- int FillOutputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillOutputPortInformation(int port, vtkInformation* info) override;
int RequestData(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
int RequestInformation(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
vtkMultiBlockPLOT3DReaderInternals* Internal;
diff --git a/IO/Parallel/vtkPChacoReader.h b/IO/Parallel/vtkPChacoReader.h
index 2460b3cde0685c44b66659932c0c5b380c6a113a..f55a4ce92463bcda82e7adbb15ce8cddb1b23138 100644
--- a/IO/Parallel/vtkPChacoReader.h
+++ b/IO/Parallel/vtkPChacoReader.h
@@ -41,7 +41,7 @@ class VTKIOPARALLEL_EXPORT vtkPChacoReader : public vtkChacoReader
public:
static vtkPChacoReader *New();
vtkTypeMacro(vtkPChacoReader,vtkChacoReader);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Set/Get the communicator object (we'll use global World controller
@@ -53,12 +53,12 @@ public:
protected:
vtkPChacoReader();
- ~vtkPChacoReader() VTK_OVERRIDE;
+ ~vtkPChacoReader() override;
int RequestInformation(
- vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
int RequestData(
- vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
private:
vtkPChacoReader(const vtkPChacoReader&) VTK_DELETE_FUNCTION;
diff --git a/IO/Parallel/vtkPDataSetReader.h b/IO/Parallel/vtkPDataSetReader.h
index 5ce0dce3d06782ac098531c488258e63c4485def..9805d735ab584521dc5a376bb494d199e65402fa 100644
--- a/IO/Parallel/vtkPDataSetReader.h
+++ b/IO/Parallel/vtkPDataSetReader.h
@@ -31,7 +31,7 @@ class vtkDataSet;
class VTKIOPARALLEL_EXPORT vtkPDataSetReader : public vtkDataSetAlgorithm
{
public:
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
vtkTypeMacro(vtkPDataSetReader,vtkDataSetAlgorithm);
static vtkPDataSetReader *New();
@@ -58,11 +58,11 @@ public:
protected:
vtkPDataSetReader();
- ~vtkPDataSetReader() VTK_OVERRIDE;
+ ~vtkPDataSetReader() override;
int RequestDataObject(vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
void ReadPVTKFileInformation(ifstream *fp,
vtkInformation* request,
vtkInformationVector** inputVector,
@@ -74,11 +74,11 @@ protected:
int RequestInformation(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
int RequestData(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
int PolyDataExecute(vtkInformation*,
vtkInformationVector**,
vtkInformationVector*);
diff --git a/IO/Parallel/vtkPDataSetWriter.h b/IO/Parallel/vtkPDataSetWriter.h
index 640a1e8237ca9793e2fd33edcd9523727db708a9..d94fb3887e00dcbf4c24bf96a4a5f1c05f003cb7 100644
--- a/IO/Parallel/vtkPDataSetWriter.h
+++ b/IO/Parallel/vtkPDataSetWriter.h
@@ -37,14 +37,14 @@ class vtkMultiProcessController;
class VTKIOPARALLEL_EXPORT vtkPDataSetWriter : public vtkDataSetWriter
{
public:
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
vtkTypeMacro(vtkPDataSetWriter,vtkDataSetWriter);
static vtkPDataSetWriter *New();
/**
* Write the pvtk file and cooresponding vtk files.
*/
- int Write() VTK_OVERRIDE;
+ int Write() override;
//@{
/**
@@ -109,7 +109,7 @@ public:
protected:
vtkPDataSetWriter();
- ~vtkPDataSetWriter() VTK_OVERRIDE;
+ ~vtkPDataSetWriter() override;
ostream *OpenFile();
int WriteUnstructuredMetaData(vtkDataSet *input,
diff --git a/IO/Parallel/vtkPImageWriter.h b/IO/Parallel/vtkPImageWriter.h
index 2de132d289b271a44ce11dc5fbb2abedd6cf394a..23f1a9df1944d96b0de66a9fd93ad282a3f638bf 100644
--- a/IO/Parallel/vtkPImageWriter.h
+++ b/IO/Parallel/vtkPImageWriter.h
@@ -35,7 +35,7 @@ class VTKIOPARALLEL_EXPORT vtkPImageWriter : public vtkImageWriter
public:
static vtkPImageWriter *New();
vtkTypeMacro(vtkPImageWriter,vtkImageWriter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -48,13 +48,13 @@ public:
protected:
vtkPImageWriter();
- ~vtkPImageWriter() VTK_OVERRIDE;
+ ~vtkPImageWriter() override;
unsigned long MemoryLimit;
- void RecursiveWrite(int dim, vtkImageData *region, vtkInformation* inInfo, ofstream *file) VTK_OVERRIDE;
+ void RecursiveWrite(int dim, vtkImageData *region, vtkInformation* inInfo, ofstream *file) override;
void RecursiveWrite(int dim, vtkImageData *cache,
- vtkImageData *data, vtkInformation* inInfo, ofstream *file) VTK_OVERRIDE
+ vtkImageData *data, vtkInformation* inInfo, ofstream *file) override
{this->vtkImageWriter::RecursiveWrite(dim,cache,data,inInfo,file);};
vtkPipelineSize *SizeEstimator;
diff --git a/IO/Parallel/vtkPOpenFOAMReader.h b/IO/Parallel/vtkPOpenFOAMReader.h
index 4a66bfb6143f6e0ee0bcee10d1546ce017bb7875..eaf89dc006d73b48abf24cfce1943aa8bdd1819a 100644
--- a/IO/Parallel/vtkPOpenFOAMReader.h
+++ b/IO/Parallel/vtkPOpenFOAMReader.h
@@ -45,7 +45,7 @@ public:
static vtkPOpenFOAMReader *New();
vtkTypeMacro(vtkPOpenFOAMReader, vtkOpenFOAMReader);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
//@{
/**
@@ -64,12 +64,12 @@ public:
protected:
vtkPOpenFOAMReader();
- ~vtkPOpenFOAMReader() VTK_OVERRIDE;
+ ~vtkPOpenFOAMReader() override;
int RequestInformation(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
int RequestData(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
private:
vtkMultiProcessController *Controller;
diff --git a/IO/Parallel/vtkPSLACReader.h b/IO/Parallel/vtkPSLACReader.h
index eff2e1f1990041b6d4e0018f102fe0e22353f64c..f9108c699f08b5e89dfe39c014a0773040ab27ef 100644
--- a/IO/Parallel/vtkPSLACReader.h
+++ b/IO/Parallel/vtkPSLACReader.h
@@ -45,7 +45,7 @@ class VTKIOPARALLEL_EXPORT vtkPSLACReader : public vtkSLACReader
public:
vtkTypeMacro(vtkPSLACReader, vtkSLACReader);
static vtkPSLACReader *New();
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
//@{
/**
@@ -60,44 +60,44 @@ public:
protected:
vtkPSLACReader();
- ~vtkPSLACReader() VTK_OVERRIDE;
+ ~vtkPSLACReader() override;
vtkMultiProcessController *Controller;
int RequestInformation(vtkInformation *request,
vtkInformationVector **inputVector,
- vtkInformationVector *outputVector) VTK_OVERRIDE;
+ vtkInformationVector *outputVector) override;
int RequestData(vtkInformation *request,
vtkInformationVector **inputVector,
- vtkInformationVector *outputVector) VTK_OVERRIDE;
+ vtkInformationVector *outputVector) override;
- int CheckTetrahedraWinding(int meshFD) VTK_OVERRIDE;
+ int CheckTetrahedraWinding(int meshFD) override;
int ReadConnectivity(int meshFD, vtkMultiBlockDataSet *surfaceOutput,
- vtkMultiBlockDataSet *volumeOutput) VTK_OVERRIDE;
- int ReadCoordinates(int meshFD, vtkMultiBlockDataSet *output) VTK_OVERRIDE;
+ vtkMultiBlockDataSet *volumeOutput) override;
+ int ReadCoordinates(int meshFD, vtkMultiBlockDataSet *output) override;
int ReadMidpointCoordinates(int meshFD, vtkMultiBlockDataSet *output,
- MidpointCoordinateMap &map) VTK_OVERRIDE;
+ MidpointCoordinateMap &map) override;
int ReadMidpointData(int meshFD, vtkMultiBlockDataSet *output,
- MidpointIdMap &map) VTK_OVERRIDE;
+ MidpointIdMap &map) override;
int RestoreMeshCache(vtkMultiBlockDataSet *surfaceOutput,
vtkMultiBlockDataSet *volumeOutput,
- vtkMultiBlockDataSet *compositeOutput) VTK_OVERRIDE;
+ vtkMultiBlockDataSet *compositeOutput) override;
int ReadFieldData(const int *modeFDArray,
int numModeFDs,
- vtkMultiBlockDataSet *output) VTK_OVERRIDE;
+ vtkMultiBlockDataSet *output) override;
int ReadTetrahedronInteriorArray(int meshFD,
- vtkIdTypeArray *connectivity) VTK_OVERRIDE;
+ vtkIdTypeArray *connectivity) override;
int ReadTetrahedronExteriorArray(int meshFD,
- vtkIdTypeArray *connectivity) VTK_OVERRIDE;
+ vtkIdTypeArray *connectivity) override;
- int MeshUpToDate() VTK_OVERRIDE;
+ int MeshUpToDate() override;
/**
* Reads point data arrays. Called by ReadCoordinates and ReadFieldData.
*/
- vtkSmartPointer<vtkDataArray> ReadPointDataArray(int ncFD, int varId) VTK_OVERRIDE;
+ vtkSmartPointer<vtkDataArray> ReadPointDataArray(int ncFD, int varId) override;
class vtkInternal;
vtkInternal *PInternal;
diff --git a/IO/Parallel/vtkPlot3DMetaReader.h b/IO/Parallel/vtkPlot3DMetaReader.h
index 0bdfad494f9d8c64dcb1495a1e6911933c5b69b6..18b709ade2ac3b00090bddd2ce933435b78731b5 100644
--- a/IO/Parallel/vtkPlot3DMetaReader.h
+++ b/IO/Parallel/vtkPlot3DMetaReader.h
@@ -92,7 +92,7 @@ class VTKIOPARALLEL_EXPORT vtkPlot3DMetaReader : public vtkMultiBlockDataSetAlgo
public:
static vtkPlot3DMetaReader* New();
vtkTypeMacro(vtkPlot3DMetaReader, vtkMultiBlockDataSetAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -105,14 +105,14 @@ public:
protected:
vtkPlot3DMetaReader();
- ~vtkPlot3DMetaReader() VTK_OVERRIDE;
+ ~vtkPlot3DMetaReader() override;
int RequestInformation(vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
int RequestData(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
char* FileName;
diff --git a/IO/ParallelExodus/vtkPExodusIIReader.cxx b/IO/ParallelExodus/vtkPExodusIIReader.cxx
index e36917ec372e46934b951e3561a7f29f9635ccff..48bce6346753916bbe9a0a16770e916001b6d627 100644
--- a/IO/ParallelExodus/vtkPExodusIIReader.cxx
+++ b/IO/ParallelExodus/vtkPExodusIIReader.cxx
@@ -114,9 +114,9 @@ protected:
Reader = nullptr;
Index = 0;
}
- ~vtkPExodusIIReaderUpdateProgress() VTK_OVERRIDE{}
+ ~vtkPExodusIIReaderUpdateProgress() override{}
- void Execute(vtkObject*, unsigned long event, void* callData) VTK_OVERRIDE
+ void Execute(vtkObject*, unsigned long event, void* callData) override
{
if(event == vtkCommand::ProgressEvent)
{
diff --git a/IO/ParallelExodus/vtkPExodusIIReader.h b/IO/ParallelExodus/vtkPExodusIIReader.h
index fa1723885352093cc5fb7ca26b9a18dd44bec1cb..2fed3df5bfcd3d4627f0448e5dad2d7f22502425 100644
--- a/IO/ParallelExodus/vtkPExodusIIReader.h
+++ b/IO/ParallelExodus/vtkPExodusIIReader.h
@@ -52,7 +52,7 @@ class VTKIOPARALLELEXODUS_EXPORT vtkPExodusIIReader : public vtkExodusIIReader
public:
static vtkPExodusIIReader* New();
vtkTypeMacro(vtkPExodusIIReader,vtkExodusIIReader);
- void PrintSelf( ostream& os, vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf( ostream& os, vtkIndent indent ) override;
//@{
/**
@@ -98,7 +98,7 @@ public:
*/
void SetFileNames( int nfiles, const char** names );
- void SetFileName( const char* name ) VTK_OVERRIDE;
+ void SetFileName( const char* name ) override;
/**
* Return pointer to list of file names set in SetFileNames
@@ -117,8 +117,8 @@ public:
vtkGetMacro(NumberOfFiles,int);
//@}
- vtkIdType GetTotalNumberOfElements() VTK_OVERRIDE;
- vtkIdType GetTotalNumberOfNodes() VTK_OVERRIDE;
+ vtkIdType GetTotalNumberOfElements() override;
+ vtkIdType GetTotalNumberOfNodes() override;
/**
* Sends metadata (that read from the input file, not settings modified
@@ -143,7 +143,7 @@ public:
protected:
vtkPExodusIIReader();
- ~vtkPExodusIIReader() VTK_OVERRIDE;
+ ~vtkPExodusIIReader() override;
//@{
/**
@@ -182,8 +182,8 @@ protected:
int Timing;
vtkTimerLog *TimerLog;
- int RequestInformation( vtkInformation*, vtkInformationVector**, vtkInformationVector* ) VTK_OVERRIDE;
- int RequestData( vtkInformation*, vtkInformationVector**, vtkInformationVector* ) VTK_OVERRIDE;
+ int RequestInformation( vtkInformation*, vtkInformationVector**, vtkInformationVector* ) override;
+ int RequestData( vtkInformation*, vtkInformationVector**, vtkInformationVector* ) override;
private:
vtkPExodusIIReader( const vtkPExodusIIReader& ) VTK_DELETE_FUNCTION;
diff --git a/IO/ParallelExodus/vtkPExodusIIWriter.h b/IO/ParallelExodus/vtkPExodusIIWriter.h
index 05e9fb0710b19a8a89de8b803b8618dd80b11cec..88fd13eba5726dff837a834a444d2bbd27707037 100644
--- a/IO/ParallelExodus/vtkPExodusIIWriter.h
+++ b/IO/ParallelExodus/vtkPExodusIIWriter.h
@@ -86,24 +86,24 @@ class VTKIOPARALLELEXODUS_EXPORT vtkPExodusIIWriter : public vtkExodusIIWriter
public:
static vtkPExodusIIWriter *New ();
vtkTypeMacro(vtkPExodusIIWriter,vtkExodusIIWriter);
- void PrintSelf (ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf (ostream& os, vtkIndent indent) override;
protected:
vtkPExodusIIWriter ();
- ~vtkPExodusIIWriter () VTK_OVERRIDE;
- int CheckParameters () VTK_OVERRIDE;
- void CheckBlockInfoMap() VTK_OVERRIDE;
+ ~vtkPExodusIIWriter () override;
+ int CheckParameters () override;
+ void CheckBlockInfoMap() override;
int RequestUpdateExtent (vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
- int GlobalContinueExecuting(int localContinue) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
+ int GlobalContinueExecuting(int localContinue) override;
/**
* Get the maximum length name in the input data set. If it is smaller
* than 32 characters long we just return the ExodusII default of 32.
*/
- virtual unsigned int GetMaxNameLength() VTK_OVERRIDE;
+ virtual unsigned int GetMaxNameLength() override;
private:
vtkPExodusIIWriter (const vtkPExodusIIWriter&) VTK_DELETE_FUNCTION;
diff --git a/IO/ParallelLSDyna/vtkPLSDynaReader.h b/IO/ParallelLSDyna/vtkPLSDynaReader.h
index 5398dafb25f5af8d0f7c9930bc755134a3619233..b18b0c7508c4fd15458def3cf1c90dd5e30243e7 100644
--- a/IO/ParallelLSDyna/vtkPLSDynaReader.h
+++ b/IO/ParallelLSDyna/vtkPLSDynaReader.h
@@ -131,13 +131,13 @@ class VTKIOPARALLELLSDYNA_EXPORT vtkPLSDynaReader : public vtkLSDynaReader
{
public:
vtkTypeMacro(vtkPLSDynaReader,vtkLSDynaReader);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
static vtkPLSDynaReader *New();
/**
* Determine if the file can be readed with this reader.
*/
- int CanReadFile( const char* fname ) VTK_OVERRIDE;
+ int CanReadFile( const char* fname ) override;
//@{
/**
@@ -149,12 +149,12 @@ public:
protected:
vtkPLSDynaReader();
- ~vtkPLSDynaReader() VTK_OVERRIDE;
+ ~vtkPLSDynaReader() override;
- int RequestInformation( vtkInformation*, vtkInformationVector**, vtkInformationVector* ) VTK_OVERRIDE;
- int RequestData( vtkInformation*, vtkInformationVector**, vtkInformationVector* ) VTK_OVERRIDE;
+ int RequestInformation( vtkInformation*, vtkInformationVector**, vtkInformationVector* ) override;
+ int RequestData( vtkInformation*, vtkInformationVector**, vtkInformationVector* ) override;
- int ReadTopology() VTK_OVERRIDE;
+ int ReadTopology() override;
private:
diff --git a/IO/ParallelNetCDF/vtkPNetCDFPOPReader.h b/IO/ParallelNetCDF/vtkPNetCDFPOPReader.h
index ebfd88574974d83b41fa7bf7b79dafcd12e2067c..d02d108f5ef9e1dcd7ac25a1915c27ad924ece94 100644
--- a/IO/ParallelNetCDF/vtkPNetCDFPOPReader.h
+++ b/IO/ParallelNetCDF/vtkPNetCDFPOPReader.h
@@ -44,7 +44,7 @@ class VTKIOPARALLELNETCDF_EXPORT vtkPNetCDFPOPReader : public vtkRectilinearGrid
public:
vtkTypeMacro(vtkPNetCDFPOPReader,vtkRectilinearGridAlgorithm);
static vtkPNetCDFPOPReader *New();
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -88,10 +88,10 @@ protected:
~vtkPNetCDFPOPReader();
int RequestData(vtkInformation*,vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
virtual int RequestInformation(vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
// Helper function for RequestData: Reads part of the netCDF
// file and sends sub-arrays to all ranks that need that data
diff --git a/IO/ParallelXML/vtkXMLPDataObjectWriter.h b/IO/ParallelXML/vtkXMLPDataObjectWriter.h
index e2518b828dc38f026dc868414412aa75432cfb48..3b3c3766299acb1c5af19ef8e096c792c62e16a3 100644
--- a/IO/ParallelXML/vtkXMLPDataObjectWriter.h
+++ b/IO/ParallelXML/vtkXMLPDataObjectWriter.h
@@ -38,7 +38,7 @@ class VTKIOPARALLELXML_EXPORT vtkXMLPDataObjectWriter : public vtkXMLWriter
{
public:
vtkTypeMacro(vtkXMLPDataObjectWriter, vtkXMLWriter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -101,21 +101,21 @@ public:
* executive.
*/
int ProcessRequest(vtkInformation* request, vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
protected:
vtkXMLPDataObjectWriter();
- ~vtkXMLPDataObjectWriter() VTK_OVERRIDE;
+ ~vtkXMLPDataObjectWriter() override;
/**
* Override writing method from superclass.
*/
- int WriteInternal() VTK_OVERRIDE;
+ int WriteInternal() override;
/**
* Write data from the input dataset. Call WritePData(vtkIndent indent)
*/
- int WriteData() VTK_OVERRIDE;
+ int WriteData() override;
/**
* Write Data associated with the input dataset. It needs to be overriden by subclass
diff --git a/IO/ParallelXML/vtkXMLPDataSetWriter.h b/IO/ParallelXML/vtkXMLPDataSetWriter.h
index bfde0bab2d8ce9f2b6e5157da1a2f97ccc395007..b6bb1e54978d8ccbcab391da7b51f9a0a817a142 100644
--- a/IO/ParallelXML/vtkXMLPDataSetWriter.h
+++ b/IO/ParallelXML/vtkXMLPDataSetWriter.h
@@ -36,7 +36,7 @@ class VTKIOPARALLELXML_EXPORT vtkXMLPDataSetWriter : public vtkXMLPDataWriter
{
public:
vtkTypeMacro(vtkXMLPDataSetWriter,vtkXMLPDataWriter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkXMLPDataSetWriter* New();
/**
@@ -46,18 +46,18 @@ public:
protected:
vtkXMLPDataSetWriter();
- ~vtkXMLPDataSetWriter() VTK_OVERRIDE;
+ ~vtkXMLPDataSetWriter() override;
// see algorithm for more info
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
// Override writing method from superclass.
- int WriteInternal() VTK_OVERRIDE;
+ int WriteInternal() override;
// Dummies to satisfy pure virtuals from superclass.
- const char* GetDataSetName() VTK_OVERRIDE;
- const char* GetDefaultFileExtension() VTK_OVERRIDE;
- vtkXMLWriter* CreatePieceWriter(int index) VTK_OVERRIDE;
+ const char* GetDataSetName() override;
+ const char* GetDefaultFileExtension() override;
+ vtkXMLWriter* CreatePieceWriter(int index) override;
private:
vtkXMLPDataSetWriter(const vtkXMLPDataSetWriter&) VTK_DELETE_FUNCTION;
diff --git a/IO/ParallelXML/vtkXMLPDataWriter.h b/IO/ParallelXML/vtkXMLPDataWriter.h
index 606f9d17ff99a45b83a03bf4aafa8af89f8495e5..7dae7ba1d64c2944d192d2fde23a67e28d4e5577 100644
--- a/IO/ParallelXML/vtkXMLPDataWriter.h
+++ b/IO/ParallelXML/vtkXMLPDataWriter.h
@@ -35,21 +35,21 @@ class VTKIOPARALLELXML_EXPORT vtkXMLPDataWriter : public vtkXMLPDataObjectWriter
{
public:
vtkTypeMacro(vtkXMLPDataWriter, vtkXMLPDataObjectWriter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkXMLPDataWriter();
- ~vtkXMLPDataWriter() VTK_OVERRIDE;
+ ~vtkXMLPDataWriter() override;
virtual vtkXMLWriter* CreatePieceWriter(int index) = 0;
- void WritePData(vtkIndent indent) VTK_OVERRIDE;
+ void WritePData(vtkIndent indent) override;
- int WritePieceInternal() VTK_OVERRIDE;
+ int WritePieceInternal() override;
- int WritePiece(int index) VTK_OVERRIDE;
+ int WritePiece(int index) override;
- void WritePrimaryElementAttributes(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void WritePrimaryElementAttributes(ostream& os, vtkIndent indent) override;
private:
vtkXMLPDataWriter(const vtkXMLPDataWriter&) VTK_DELETE_FUNCTION;
@@ -58,7 +58,7 @@ private:
/**
* Initializes PieceFileNameExtension.
*/
- void SetupPieceFileNameExtension() VTK_OVERRIDE;
+ void SetupPieceFileNameExtension() override;
};
#endif
diff --git a/IO/ParallelXML/vtkXMLPHierarchicalBoxDataWriter.h b/IO/ParallelXML/vtkXMLPHierarchicalBoxDataWriter.h
index f3cda8e90adb37c233a201d04b3a6d392be7238f..ca771157161aebb7bfffbf031232122b6cbf3ac4 100644
--- a/IO/ParallelXML/vtkXMLPHierarchicalBoxDataWriter.h
+++ b/IO/ParallelXML/vtkXMLPHierarchicalBoxDataWriter.h
@@ -33,11 +33,11 @@ class VTKIOPARALLELXML_EXPORT vtkXMLPHierarchicalBoxDataWriter :
public:
static vtkXMLPHierarchicalBoxDataWriter* New();
vtkTypeMacro(vtkXMLPHierarchicalBoxDataWriter, vtkXMLPUniformGridAMRWriter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkXMLPHierarchicalBoxDataWriter();
- ~vtkXMLPHierarchicalBoxDataWriter() VTK_OVERRIDE;
+ ~vtkXMLPHierarchicalBoxDataWriter() override;
private:
vtkXMLPHierarchicalBoxDataWriter(const vtkXMLPHierarchicalBoxDataWriter&) VTK_DELETE_FUNCTION;
diff --git a/IO/ParallelXML/vtkXMLPImageDataWriter.h b/IO/ParallelXML/vtkXMLPImageDataWriter.h
index 7444c7a9b63c3684fda4b54298705ac777a8d29b..596db7b9401a9dc29a3f1c00bcee18ca420b9f80 100644
--- a/IO/ParallelXML/vtkXMLPImageDataWriter.h
+++ b/IO/ParallelXML/vtkXMLPImageDataWriter.h
@@ -39,7 +39,7 @@ class VTKIOPARALLELXML_EXPORT vtkXMLPImageDataWriter : public vtkXMLPStructuredD
public:
static vtkXMLPImageDataWriter* New();
vtkTypeMacro(vtkXMLPImageDataWriter,vtkXMLPStructuredDataWriter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Get/Set the writer's input.
@@ -49,18 +49,18 @@ public:
/**
* Get the default file extension for files written by this writer.
*/
- const char* GetDefaultFileExtension() VTK_OVERRIDE;
+ const char* GetDefaultFileExtension() override;
protected:
vtkXMLPImageDataWriter();
- ~vtkXMLPImageDataWriter() VTK_OVERRIDE;
+ ~vtkXMLPImageDataWriter() override;
- const char* GetDataSetName() VTK_OVERRIDE;
- void WritePrimaryElementAttributes(ostream &os, vtkIndent indent) VTK_OVERRIDE;
- vtkXMLStructuredDataWriter* CreateStructuredPieceWriter() VTK_OVERRIDE;
+ const char* GetDataSetName() override;
+ void WritePrimaryElementAttributes(ostream &os, vtkIndent indent) override;
+ vtkXMLStructuredDataWriter* CreateStructuredPieceWriter() override;
// see algorithm for more info
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
private:
vtkXMLPImageDataWriter(const vtkXMLPImageDataWriter&) VTK_DELETE_FUNCTION;
diff --git a/IO/ParallelXML/vtkXMLPMultiBlockDataWriter.h b/IO/ParallelXML/vtkXMLPMultiBlockDataWriter.h
index 13d1493c6fa7ba33004f9d2b0499f62c818d55d0..b39370169bf79f3bab9f9b5464173e4ada15f953 100644
--- a/IO/ParallelXML/vtkXMLPMultiBlockDataWriter.h
+++ b/IO/ParallelXML/vtkXMLPMultiBlockDataWriter.h
@@ -37,7 +37,7 @@ class VTKIOPARALLELXML_EXPORT vtkXMLPMultiBlockDataWriter : public vtkXMLMultiBl
public:
static vtkXMLPMultiBlockDataWriter* New();
vtkTypeMacro(vtkXMLPMultiBlockDataWriter, vtkXMLMultiBlockDataWriter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -72,16 +72,16 @@ public:
* is set to flag only on process 0 and all other processes have
* WriteMetaFile set to 0 by default.
*/
- void SetWriteMetaFile(int flag) VTK_OVERRIDE;
+ void SetWriteMetaFile(int flag) override;
// See the vtkAlgorithm for a desciption of what these do
int ProcessRequest(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
protected:
vtkXMLPMultiBlockDataWriter();
- ~vtkXMLPMultiBlockDataWriter() VTK_OVERRIDE;
+ ~vtkXMLPMultiBlockDataWriter() override;
/**
* Determine the data types for each of the leaf nodes.
@@ -91,7 +91,7 @@ protected:
* that a piece of a dataset may be distributed in multiple pieces
* over multiple processes.
*/
- void FillDataTypes(vtkCompositeDataSet*) VTK_OVERRIDE;
+ void FillDataTypes(vtkCompositeDataSet*) override;
vtkMultiProcessController* Controller;
@@ -105,7 +105,7 @@ protected:
* the metadata for all of the processes/files.
*/
int WriteComposite(vtkCompositeDataSet* compositeData,
- vtkXMLDataElement* parent, int ¤tFileIndex) VTK_OVERRIDE;
+ vtkXMLDataElement* parent, int ¤tFileIndex) override;
/**
* Internal method to write a non vtkCompositeDataSet subclass as
@@ -134,7 +134,7 @@ protected:
* Utility function to remove any already written files
* in case writer failed.
*/
- void RemoveWrittenFiles(const char* subDirectory) VTK_OVERRIDE;
+ void RemoveWrittenFiles(const char* subDirectory) override;
//@{
/**
diff --git a/IO/ParallelXML/vtkXMLPPolyDataWriter.h b/IO/ParallelXML/vtkXMLPPolyDataWriter.h
index bdf3ff9b7ddabc89f5bddd33cbec9cb579ade7fb..d3cfc76be1d5a5276d57368845df032e32c853d6 100644
--- a/IO/ParallelXML/vtkXMLPPolyDataWriter.h
+++ b/IO/ParallelXML/vtkXMLPPolyDataWriter.h
@@ -39,7 +39,7 @@ class VTKIOPARALLELXML_EXPORT vtkXMLPPolyDataWriter : public vtkXMLPUnstructured
public:
static vtkXMLPPolyDataWriter* New();
vtkTypeMacro(vtkXMLPPolyDataWriter,vtkXMLPUnstructuredDataWriter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Get/Set the writer's input.
@@ -49,17 +49,17 @@ public:
/**
* Get the default file extension for files written by this writer.
*/
- const char* GetDefaultFileExtension() VTK_OVERRIDE;
+ const char* GetDefaultFileExtension() override;
protected:
vtkXMLPPolyDataWriter();
- ~vtkXMLPPolyDataWriter() VTK_OVERRIDE;
+ ~vtkXMLPPolyDataWriter() override;
// see algorithm for more info
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
- const char* GetDataSetName() VTK_OVERRIDE;
- vtkXMLUnstructuredDataWriter* CreateUnstructuredPieceWriter() VTK_OVERRIDE;
+ const char* GetDataSetName() override;
+ vtkXMLUnstructuredDataWriter* CreateUnstructuredPieceWriter() override;
private:
vtkXMLPPolyDataWriter(const vtkXMLPPolyDataWriter&) VTK_DELETE_FUNCTION;
diff --git a/IO/ParallelXML/vtkXMLPRectilinearGridWriter.h b/IO/ParallelXML/vtkXMLPRectilinearGridWriter.h
index a4afbeeb592dcd87a02e7d67cfe8b68226b216cb..c50eb5176682a2a1d6f6923006b37b684ec30e1b 100644
--- a/IO/ParallelXML/vtkXMLPRectilinearGridWriter.h
+++ b/IO/ParallelXML/vtkXMLPRectilinearGridWriter.h
@@ -40,7 +40,7 @@ class VTKIOPARALLELXML_EXPORT vtkXMLPRectilinearGridWriter : public vtkXMLPStruc
public:
static vtkXMLPRectilinearGridWriter* New();
vtkTypeMacro(vtkXMLPRectilinearGridWriter,vtkXMLPStructuredDataWriter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Get/Set the writer's input.
@@ -50,18 +50,18 @@ public:
/**
* Get the default file extension for files written by this writer.
*/
- const char* GetDefaultFileExtension() VTK_OVERRIDE;
+ const char* GetDefaultFileExtension() override;
protected:
vtkXMLPRectilinearGridWriter();
- ~vtkXMLPRectilinearGridWriter() VTK_OVERRIDE;
+ ~vtkXMLPRectilinearGridWriter() override;
// see algorithm for more info
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
- const char* GetDataSetName() VTK_OVERRIDE;
- vtkXMLStructuredDataWriter* CreateStructuredPieceWriter() VTK_OVERRIDE;
- void WritePData(vtkIndent indent) VTK_OVERRIDE;
+ const char* GetDataSetName() override;
+ vtkXMLStructuredDataWriter* CreateStructuredPieceWriter() override;
+ void WritePData(vtkIndent indent) override;
private:
vtkXMLPRectilinearGridWriter(const vtkXMLPRectilinearGridWriter&) VTK_DELETE_FUNCTION;
diff --git a/IO/ParallelXML/vtkXMLPStructuredDataWriter.h b/IO/ParallelXML/vtkXMLPStructuredDataWriter.h
index 65afe2e77afbddb748006e5ca9b7b01455d28abe..360c5f7c829ef085ded2e597b4eacee0e5805d03 100644
--- a/IO/ParallelXML/vtkXMLPStructuredDataWriter.h
+++ b/IO/ParallelXML/vtkXMLPStructuredDataWriter.h
@@ -35,21 +35,21 @@ class VTKIOPARALLELXML_EXPORT vtkXMLPStructuredDataWriter : public vtkXMLPDataWr
{
public:
vtkTypeMacro(vtkXMLPStructuredDataWriter,vtkXMLPDataWriter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkXMLPStructuredDataWriter();
- ~vtkXMLPStructuredDataWriter() VTK_OVERRIDE;
+ ~vtkXMLPStructuredDataWriter() override;
virtual vtkXMLStructuredDataWriter* CreateStructuredPieceWriter()=0;
- void WritePrimaryElementAttributes(ostream &os, vtkIndent indent) VTK_OVERRIDE;
- void WritePPieceAttributes(int index) VTK_OVERRIDE;
- vtkXMLWriter* CreatePieceWriter(int index) VTK_OVERRIDE;
+ void WritePrimaryElementAttributes(ostream &os, vtkIndent indent) override;
+ void WritePPieceAttributes(int index) override;
+ vtkXMLWriter* CreatePieceWriter(int index) override;
- int WriteInternal() VTK_OVERRIDE;
+ int WriteInternal() override;
- void PrepareSummaryFile() VTK_OVERRIDE;
- int WritePiece(int index) VTK_OVERRIDE;
+ void PrepareSummaryFile() override;
+ int WritePiece(int index) override;
private:
vtkXMLPStructuredDataWriter(const vtkXMLPStructuredDataWriter&) VTK_DELETE_FUNCTION;
diff --git a/IO/ParallelXML/vtkXMLPStructuredGridWriter.h b/IO/ParallelXML/vtkXMLPStructuredGridWriter.h
index bbf74b0888e79a9875fbc9552ee8251106e4ba6b..86828769be03666e0b357b8881983065611a0fe6 100644
--- a/IO/ParallelXML/vtkXMLPStructuredGridWriter.h
+++ b/IO/ParallelXML/vtkXMLPStructuredGridWriter.h
@@ -40,7 +40,7 @@ class VTKIOPARALLELXML_EXPORT vtkXMLPStructuredGridWriter : public vtkXMLPStruct
public:
static vtkXMLPStructuredGridWriter* New();
vtkTypeMacro(vtkXMLPStructuredGridWriter,vtkXMLPStructuredDataWriter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Get/Set the writer's input.
@@ -50,18 +50,18 @@ public:
/**
* Get the default file extension for files written by this writer.
*/
- const char* GetDefaultFileExtension() VTK_OVERRIDE;
+ const char* GetDefaultFileExtension() override;
protected:
vtkXMLPStructuredGridWriter();
- ~vtkXMLPStructuredGridWriter() VTK_OVERRIDE;
+ ~vtkXMLPStructuredGridWriter() override;
// see algorithm for more info
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
- const char* GetDataSetName() VTK_OVERRIDE;
- vtkXMLStructuredDataWriter* CreateStructuredPieceWriter() VTK_OVERRIDE;
- void WritePData(vtkIndent indent) VTK_OVERRIDE;
+ const char* GetDataSetName() override;
+ vtkXMLStructuredDataWriter* CreateStructuredPieceWriter() override;
+ void WritePData(vtkIndent indent) override;
private:
vtkXMLPStructuredGridWriter(const vtkXMLPStructuredGridWriter&) VTK_DELETE_FUNCTION;
diff --git a/IO/ParallelXML/vtkXMLPTableWriter.h b/IO/ParallelXML/vtkXMLPTableWriter.h
index f4ad149cb5c6abaa9249d480443802622ebc8dd6..a8b69515ed981d9993cbc15b94fc86417369d6f6 100644
--- a/IO/ParallelXML/vtkXMLPTableWriter.h
+++ b/IO/ParallelXML/vtkXMLPTableWriter.h
@@ -44,7 +44,7 @@ class VTKIOPARALLELXML_EXPORT vtkXMLPTableWriter : public vtkXMLPDataObjectWrite
public:
static vtkXMLPTableWriter* New();
vtkTypeMacro(vtkXMLPTableWriter, vtkXMLPDataObjectWriter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Get/Set the writer's input.
@@ -54,21 +54,21 @@ public:
/**
* Get the default file extension for files written by this writer.
*/
- const char* GetDefaultFileExtension() VTK_OVERRIDE;
+ const char* GetDefaultFileExtension() override;
protected:
vtkXMLPTableWriter();
- ~vtkXMLPTableWriter() VTK_OVERRIDE;
+ ~vtkXMLPTableWriter() override;
/**
* see algorithm for more info
*/
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
/**
* Return the type of data being actually written
*/
- const char* GetDataSetName() VTK_OVERRIDE;
+ const char* GetDataSetName() override;
/**
* Create a writer for the piece at a given index
@@ -84,18 +84,18 @@ protected:
/**
* Write a piece of the dataset on disk. Called by WritePieceInternal()
*/
- int WritePiece(int index) VTK_OVERRIDE;
+ int WritePiece(int index) override;
/**
* Method called by the superclass::WriteInternal(). Write a piece using
* WritePiece(int index).
*/
- int WritePieceInternal() VTK_OVERRIDE;
+ int WritePieceInternal() override;
/**
* Write Data associated with the input dataset
*/
- void WritePData(vtkIndent indent) VTK_OVERRIDE;
+ void WritePData(vtkIndent indent) override;
/**
* Write RowData. Called by WritePData(vtkIndent indent)
@@ -109,7 +109,7 @@ private:
/**
* Initializes PieceFileNameExtension.
*/
- void SetupPieceFileNameExtension() VTK_OVERRIDE;
+ void SetupPieceFileNameExtension() override;
};
#endif
diff --git a/IO/ParallelXML/vtkXMLPUniformGridAMRWriter.h b/IO/ParallelXML/vtkXMLPUniformGridAMRWriter.h
index 1512311369495fccd4163a3e6443a12524e8d33e..7eb58cc715ab79b672c62018dc64c7de4701ec74 100644
--- a/IO/ParallelXML/vtkXMLPUniformGridAMRWriter.h
+++ b/IO/ParallelXML/vtkXMLPUniformGridAMRWriter.h
@@ -39,7 +39,7 @@ class VTKIOPARALLELXML_EXPORT vtkXMLPUniformGridAMRWriter : public vtkXMLUniform
public:
static vtkXMLPUniformGridAMRWriter* New();
vtkTypeMacro(vtkXMLPUniformGridAMRWriter, vtkXMLUniformGridAMRWriter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -58,16 +58,16 @@ public:
* is set to flag only on process 0 and all other processes have
* WriteMetaFile set to 0 by default.
*/
- void SetWriteMetaFile(int flag) VTK_OVERRIDE;
+ void SetWriteMetaFile(int flag) override;
protected:
vtkXMLPUniformGridAMRWriter();
- ~vtkXMLPUniformGridAMRWriter() VTK_OVERRIDE;
+ ~vtkXMLPUniformGridAMRWriter() override;
/**
* Overridden to reduce information about data-types across all processes.
*/
- void FillDataTypes(vtkCompositeDataSet*) VTK_OVERRIDE;
+ void FillDataTypes(vtkCompositeDataSet*) override;
vtkMultiProcessController* Controller;
private:
diff --git a/IO/ParallelXML/vtkXMLPUnstructuredDataWriter.h b/IO/ParallelXML/vtkXMLPUnstructuredDataWriter.h
index 7feb4cf7b8911d2a0327116804f4b84d6af8c024..c5a99c9b8de0e51b212f913ff22e0366f86da73f 100644
--- a/IO/ParallelXML/vtkXMLPUnstructuredDataWriter.h
+++ b/IO/ParallelXML/vtkXMLPUnstructuredDataWriter.h
@@ -34,16 +34,16 @@ class VTKIOPARALLELXML_EXPORT vtkXMLPUnstructuredDataWriter : public vtkXMLPData
{
public:
vtkTypeMacro(vtkXMLPUnstructuredDataWriter,vtkXMLPDataWriter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkXMLPUnstructuredDataWriter();
- ~vtkXMLPUnstructuredDataWriter() VTK_OVERRIDE;
+ ~vtkXMLPUnstructuredDataWriter() override;
vtkPointSet* GetInputAsPointSet();
virtual vtkXMLUnstructuredDataWriter* CreateUnstructuredPieceWriter()=0;
- vtkXMLWriter* CreatePieceWriter(int index) VTK_OVERRIDE;
- void WritePData(vtkIndent indent) VTK_OVERRIDE;
+ vtkXMLWriter* CreatePieceWriter(int index) override;
+ void WritePData(vtkIndent indent) override;
private:
vtkXMLPUnstructuredDataWriter(const vtkXMLPUnstructuredDataWriter&) VTK_DELETE_FUNCTION;
void operator=(const vtkXMLPUnstructuredDataWriter&) VTK_DELETE_FUNCTION;
diff --git a/IO/ParallelXML/vtkXMLPUnstructuredGridWriter.h b/IO/ParallelXML/vtkXMLPUnstructuredGridWriter.h
index 3cb138ed10e6ad97123cfac372a4763aaf03c7fc..6b93d7caf850158533becc5e2b1bea695d1c1797 100644
--- a/IO/ParallelXML/vtkXMLPUnstructuredGridWriter.h
+++ b/IO/ParallelXML/vtkXMLPUnstructuredGridWriter.h
@@ -40,7 +40,7 @@ class VTKIOPARALLELXML_EXPORT vtkXMLPUnstructuredGridWriter : public vtkXMLPUnst
public:
static vtkXMLPUnstructuredGridWriter* New();
vtkTypeMacro(vtkXMLPUnstructuredGridWriter,vtkXMLPUnstructuredDataWriter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Get/Set the writer's input.
@@ -50,17 +50,17 @@ public:
/**
* Get the default file extension for files written by this writer.
*/
- const char* GetDefaultFileExtension() VTK_OVERRIDE;
+ const char* GetDefaultFileExtension() override;
protected:
vtkXMLPUnstructuredGridWriter();
- ~vtkXMLPUnstructuredGridWriter() VTK_OVERRIDE;
+ ~vtkXMLPUnstructuredGridWriter() override;
// see algorithm for more info
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
- const char* GetDataSetName() VTK_OVERRIDE;
- vtkXMLUnstructuredDataWriter* CreateUnstructuredPieceWriter() VTK_OVERRIDE;
+ const char* GetDataSetName() override;
+ vtkXMLUnstructuredDataWriter* CreateUnstructuredPieceWriter() override;
private:
vtkXMLPUnstructuredGridWriter(const vtkXMLPUnstructuredGridWriter&) VTK_DELETE_FUNCTION;
diff --git a/IO/ParallelXdmf3/Testing/Cxx/TestXdmf3Parallel.cxx b/IO/ParallelXdmf3/Testing/Cxx/TestXdmf3Parallel.cxx
index 7f6657f5e092fe765425d326dc19bcd626765a87..8f48fb50a5b82bfcd8621f5e364c74c11f09564f 100644
--- a/IO/ParallelXdmf3/Testing/Cxx/TestXdmf3Parallel.cxx
+++ b/IO/ParallelXdmf3/Testing/Cxx/TestXdmf3Parallel.cxx
@@ -35,7 +35,7 @@ public:
static MyProcess *New();
vtkTypeMacro(MyProcess, vtkProcess);
- virtual void Execute() VTK_OVERRIDE;
+ virtual void Execute() override;
void SetArgs(int argc, char *argv[],
const std::string& ifname,
diff --git a/IO/ParallelXdmf3/vtkPXdmf3Writer.h b/IO/ParallelXdmf3/vtkPXdmf3Writer.h
index ba6fa66371c9ba4a42633e72fd9899249a177723..4c9c24f77537e5e34644f844e456c6f2fa8d66d1 100644
--- a/IO/ParallelXdmf3/vtkPXdmf3Writer.h
+++ b/IO/ParallelXdmf3/vtkPXdmf3Writer.h
@@ -48,17 +48,17 @@ class VTKIOPARALLELXDMF3_EXPORT vtkPXdmf3Writer : public vtkXdmf3Writer
public:
static vtkPXdmf3Writer *New ();
vtkTypeMacro(vtkPXdmf3Writer,vtkXdmf3Writer);
- void PrintSelf (ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf (ostream& os, vtkIndent indent) override;
protected:
vtkPXdmf3Writer ();
~vtkPXdmf3Writer ();
- int CheckParameters () VTK_OVERRIDE;
+ int CheckParameters () override;
int RequestUpdateExtent (vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
- int GlobalContinueExecuting(int localContinue) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
+ int GlobalContinueExecuting(int localContinue) override;
private:
vtkPXdmf3Writer (const vtkPXdmf3Writer&) VTK_DELETE_FUNCTION;
diff --git a/IO/PostgreSQL/vtkPostgreSQLDatabase.h b/IO/PostgreSQL/vtkPostgreSQLDatabase.h
index 373c5389df27d51ab0c92dfbdb4a70ef2ac7d8b3..8f96c8cf160b44c400c49df15c05e4ce5334beee 100644
--- a/IO/PostgreSQL/vtkPostgreSQLDatabase.h
+++ b/IO/PostgreSQL/vtkPostgreSQLDatabase.h
@@ -101,7 +101,7 @@ public:
/**
* String representing database type (e.g. "psql").
*/
- const char* GetDatabaseType() VTK_OVERRIDE
+ const char* GetDatabaseType() override
{
return this->DatabaseType;
}
diff --git a/IO/SQL/vtkDatabaseToTableReader.h b/IO/SQL/vtkDatabaseToTableReader.h
index fe64f623c89b530f6084d79cb2d33e3771204ffa..e84b6b18b01e10a2cea3a23b9c646f263a355627 100644
--- a/IO/SQL/vtkDatabaseToTableReader.h
+++ b/IO/SQL/vtkDatabaseToTableReader.h
@@ -34,7 +34,7 @@ class VTKIOSQL_EXPORT vtkDatabaseToTableReader : public vtkTableAlgorithm
{
public:
vtkTypeMacro(vtkDatabaseToTableReader,vtkTableAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Set the database associated with this reader
@@ -56,9 +56,9 @@ public:
protected:
vtkDatabaseToTableReader();
- ~vtkDatabaseToTableReader() VTK_OVERRIDE;
+ ~vtkDatabaseToTableReader() override;
int RequestData(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE = 0;
+ vtkInformationVector *) override = 0;
vtkSQLDatabase *Database;
std::string TableName;
diff --git a/IO/SQL/vtkRowQuery.h b/IO/SQL/vtkRowQuery.h
index 64dce0ee34421a78cb336128ec35ac5ca85ba9bb..49c8165994acf1e80a7fca39b532fc7ddac5b4a6 100644
--- a/IO/SQL/vtkRowQuery.h
+++ b/IO/SQL/vtkRowQuery.h
@@ -63,7 +63,7 @@ class VTKIOSQL_EXPORT vtkRowQuery : public vtkObject
{
public:
vtkTypeMacro(vtkRowQuery, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Execute the query. This must be performed
@@ -143,7 +143,7 @@ public:
protected:
vtkRowQuery();
- ~vtkRowQuery() VTK_OVERRIDE;
+ ~vtkRowQuery() override;
bool CaseSensitiveFieldNames;
private:
vtkRowQuery(const vtkRowQuery &) VTK_DELETE_FUNCTION;
diff --git a/IO/SQL/vtkRowQueryToTable.h b/IO/SQL/vtkRowQueryToTable.h
index 680f4ee192d55c7362c92ef16bffb899bcfaa6b2..20c878e7929a273edc2328cca8e294b282effac5 100644
--- a/IO/SQL/vtkRowQueryToTable.h
+++ b/IO/SQL/vtkRowQueryToTable.h
@@ -48,7 +48,7 @@ class VTKIOSQL_EXPORT vtkRowQueryToTable : public vtkTableAlgorithm
public:
static vtkRowQueryToTable* New();
vtkTypeMacro(vtkRowQueryToTable, vtkTableAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -61,18 +61,18 @@ public:
/**
* Update the modified time based on the query.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
protected:
vtkRowQueryToTable();
- ~vtkRowQueryToTable() VTK_OVERRIDE;
+ ~vtkRowQueryToTable() override;
vtkRowQuery* Query;
int RequestData(
vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
private:
vtkRowQueryToTable(const vtkRowQueryToTable&) VTK_DELETE_FUNCTION;
diff --git a/IO/SQL/vtkSQLDatabase.h b/IO/SQL/vtkSQLDatabase.h
index 0509cab2b4cd82a8aaeb06dde5456775b8576144..8b148730a421b9dd0566a1d4b6352bb677678e1a 100644
--- a/IO/SQL/vtkSQLDatabase.h
+++ b/IO/SQL/vtkSQLDatabase.h
@@ -85,7 +85,7 @@ class VTKIOSQL_EXPORT vtkSQLDatabase : public vtkObject
{
public:
vtkTypeMacro(vtkSQLDatabase, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Open a new connection to the database.
@@ -241,7 +241,7 @@ public:
protected:
vtkSQLDatabase();
- ~vtkSQLDatabase() VTK_OVERRIDE;
+ ~vtkSQLDatabase() override;
/**
* Subclasses should override this method to determine connection parameters
diff --git a/IO/SQL/vtkSQLDatabaseSchema.h b/IO/SQL/vtkSQLDatabaseSchema.h
index 723037560298dd7da73856973851e64c681d41e6..f762c7ad1294b506e0d2a31db3160685e7e8042c 100644
--- a/IO/SQL/vtkSQLDatabaseSchema.h
+++ b/IO/SQL/vtkSQLDatabaseSchema.h
@@ -62,7 +62,7 @@ class VTKIOSQL_EXPORT vtkSQLDatabaseSchema : public vtkObject
{
public:
vtkTypeMacro(vtkSQLDatabaseSchema, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkSQLDatabaseSchema* New();
/**
@@ -431,7 +431,7 @@ class VTKIOSQL_EXPORT vtkSQLDatabaseSchema : public vtkObject
protected:
vtkSQLDatabaseSchema();
- ~vtkSQLDatabaseSchema() VTK_OVERRIDE;
+ ~vtkSQLDatabaseSchema() override;
char* Name;
diff --git a/IO/SQL/vtkSQLDatabaseTableSource.h b/IO/SQL/vtkSQLDatabaseTableSource.h
index 92c6640d038732cb48c79b526ea637833f28ed8a..5d8736fcf3a9be761da96f97ddc849361f22e6ff 100644
--- a/IO/SQL/vtkSQLDatabaseTableSource.h
+++ b/IO/SQL/vtkSQLDatabaseTableSource.h
@@ -41,7 +41,7 @@ class VTKIOSQL_EXPORT vtkSQLDatabaseTableSource : public vtkTableAlgorithm
public:
static vtkSQLDatabaseTableSource* New();
vtkTypeMacro(vtkSQLDatabaseTableSource, vtkTableAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
vtkStdString GetURL();
void SetURL(const vtkStdString& url);
@@ -72,12 +72,12 @@ public:
protected:
vtkSQLDatabaseTableSource();
- ~vtkSQLDatabaseTableSource() VTK_OVERRIDE;
+ ~vtkSQLDatabaseTableSource() override;
int RequestData(
vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
private:
vtkSQLDatabaseTableSource(const vtkSQLDatabaseTableSource&) VTK_DELETE_FUNCTION;
diff --git a/IO/SQL/vtkSQLQuery.h b/IO/SQL/vtkSQLQuery.h
index 7a9670b63160d84f369334870532d0445017e3fa..efae384ff929749e0b536b52b4ae6437609bdf34 100644
--- a/IO/SQL/vtkSQLQuery.h
+++ b/IO/SQL/vtkSQLQuery.h
@@ -69,7 +69,7 @@ class VTKIOSQL_EXPORT vtkSQLQuery : public vtkRowQuery
{
public:
vtkTypeMacro(vtkSQLQuery, vtkRowQuery);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -86,14 +86,14 @@ public:
* and results are ready to be fetched). Returns false on error or
* inactive query.
*/
- bool IsActive() VTK_OVERRIDE { return this->Active; }
+ bool IsActive() override { return this->Active; }
/**
* Execute the query. This must be performed
* before any field name or data access functions
* are used.
*/
- bool Execute() VTK_OVERRIDE = 0;
+ bool Execute() override = 0;
/**
* Begin, commit, or roll back a transaction. If the underlying
@@ -206,7 +206,7 @@ public:
protected:
vtkSQLQuery();
- ~vtkSQLQuery() VTK_OVERRIDE;
+ ~vtkSQLQuery() override;
/**
* Set the database associated with the query.
diff --git a/IO/SQL/vtkSQLiteDatabase.h b/IO/SQL/vtkSQLiteDatabase.h
index 4a714db608b0e6cb4322d86702a1da96087d713d..6f16402d54faa7948a3484a1539826900c6456d3 100644
--- a/IO/SQL/vtkSQLiteDatabase.h
+++ b/IO/SQL/vtkSQLiteDatabase.h
@@ -61,7 +61,7 @@ class VTKIOSQL_EXPORT vtkSQLiteDatabase : public vtkSQLDatabase
public:
vtkTypeMacro(vtkSQLiteDatabase, vtkSQLDatabase);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkSQLiteDatabase *New();
enum {
@@ -81,55 +81,55 @@ public:
* - CREATE_OR_CLEAR - Create new or clear existing file.
* - CREATE - Create new, fail if file exists.
*/
- bool Open(const char* password) VTK_OVERRIDE;
+ bool Open(const char* password) override;
bool Open(const char* password, int mode);
//@}
/**
* Close the connection to the database.
*/
- void Close() VTK_OVERRIDE;
+ void Close() override;
/**
* Return whether the database has an open connection
*/
- bool IsOpen() VTK_OVERRIDE;
+ bool IsOpen() override;
/**
* Return an empty query on this database.
*/
- vtkSQLQuery* GetQueryInstance() VTK_OVERRIDE;
+ vtkSQLQuery* GetQueryInstance() override;
/**
* Get the list of tables from the database
*/
- vtkStringArray* GetTables() VTK_OVERRIDE;
+ vtkStringArray* GetTables() override;
/**
* Get the list of fields for a particular table
*/
- vtkStringArray* GetRecord(const char *table) VTK_OVERRIDE;
+ vtkStringArray* GetRecord(const char *table) override;
/**
* Return whether a feature is supported by the database.
*/
- bool IsSupported(int feature) VTK_OVERRIDE;
+ bool IsSupported(int feature) override;
/**
* Did the last operation generate an error
*/
- bool HasError() VTK_OVERRIDE;
+ bool HasError() override;
/**
* Get the last error text from the database
*/
- const char* GetLastErrorText() VTK_OVERRIDE;
+ const char* GetLastErrorText() override;
//@{
/**
* String representing database type (e.g. "sqlite").
*/
- const char* GetDatabaseType() VTK_OVERRIDE
+ const char* GetDatabaseType() override
{
return this->DatabaseType;
}
@@ -146,7 +146,7 @@ public:
/**
* Get the URL of the database.
*/
- vtkStdString GetURL() VTK_OVERRIDE;
+ vtkStdString GetURL() override;
/**
* Return the SQL string with the syntax to create a column inside a
@@ -156,18 +156,18 @@ public:
*/
vtkStdString GetColumnSpecification( vtkSQLDatabaseSchema* schema,
int tblHandle,
- int colHandle ) VTK_OVERRIDE;
+ int colHandle ) override;
protected:
vtkSQLiteDatabase();
- ~vtkSQLiteDatabase() VTK_OVERRIDE;
+ ~vtkSQLiteDatabase() override;
/**
* Overridden to determine connection parameters given the URL.
* This is called by CreateFromURL() to initialize the instance.
* Look at CreateFromURL() for details about the URL format.
*/
- bool ParseURL(const char* url) VTK_OVERRIDE;
+ bool ParseURL(const char* url) override;
private:
vtk_sqlite3 *SQLiteInstance;
diff --git a/IO/SQL/vtkSQLiteQuery.h b/IO/SQL/vtkSQLiteQuery.h
index 796d595e5fd6a42eed62d34cc83c4d850fd0ea3d..22545e7b14f8f7dd30777b8feb8c83802d303aec 100644
--- a/IO/SQL/vtkSQLiteQuery.h
+++ b/IO/SQL/vtkSQLiteQuery.h
@@ -59,65 +59,65 @@ class VTKIOSQL_EXPORT vtkSQLiteQuery : public vtkSQLQuery
public:
vtkTypeMacro(vtkSQLiteQuery, vtkSQLQuery);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkSQLiteQuery *New();
/**
* Set the SQL query string. This must be performed before
* Execute() or BindParameter() can be called.
*/
- bool SetQuery(const char *query) VTK_OVERRIDE;
+ bool SetQuery(const char *query) override;
/**
* Execute the query. This must be performed
* before any field name or data access functions
* are used.
*/
- bool Execute() VTK_OVERRIDE;
+ bool Execute() override;
/**
* The number of fields in the query result.
*/
- int GetNumberOfFields() VTK_OVERRIDE;
+ int GetNumberOfFields() override;
/**
* Return the name of the specified query field.
*/
- const char* GetFieldName(int i) VTK_OVERRIDE;
+ const char* GetFieldName(int i) override;
/**
* Return the type of the field, using the constants defined in vtkType.h.
*/
- int GetFieldType(int i) VTK_OVERRIDE;
+ int GetFieldType(int i) override;
/**
* Advance row, return false if past end.
*/
- bool NextRow() VTK_OVERRIDE;
+ bool NextRow() override;
/**
* Return true if there is an error on the current query.
*/
- bool HasError() VTK_OVERRIDE;
+ bool HasError() override;
//@{
/**
* Begin, abort (roll back), or commit a transaction.
*/
- bool BeginTransaction() VTK_OVERRIDE;
- bool RollbackTransaction() VTK_OVERRIDE;
- bool CommitTransaction() VTK_OVERRIDE;
+ bool BeginTransaction() override;
+ bool RollbackTransaction() override;
+ bool CommitTransaction() override;
//@}
/**
* Return data in current row, field c
*/
- vtkVariant DataValue(vtkIdType c) VTK_OVERRIDE;
+ vtkVariant DataValue(vtkIdType c) override;
/**
* Get the last error text from the query
*/
- const char* GetLastErrorText() VTK_OVERRIDE;
+ const char* GetLastErrorText() override;
/**
* The following methods bind a parameter value to a placeholder in
@@ -128,46 +128,46 @@ public:
*/
using vtkSQLQuery::BindParameter;
- bool BindParameter(int index, unsigned char value) VTK_OVERRIDE;
- bool BindParameter(int index, signed char value) VTK_OVERRIDE;
- bool BindParameter(int index, unsigned short value) VTK_OVERRIDE;
- bool BindParameter(int index, short value) VTK_OVERRIDE;
- bool BindParameter(int index, unsigned int value) VTK_OVERRIDE;
+ bool BindParameter(int index, unsigned char value) override;
+ bool BindParameter(int index, signed char value) override;
+ bool BindParameter(int index, unsigned short value) override;
+ bool BindParameter(int index, short value) override;
+ bool BindParameter(int index, unsigned int value) override;
- bool BindParameter(int index, int value) VTK_OVERRIDE;
+ bool BindParameter(int index, int value) override;
- bool BindParameter(int index, unsigned long value) VTK_OVERRIDE;
- bool BindParameter(int index, long value) VTK_OVERRIDE;
- bool BindParameter(int index, unsigned long long value) VTK_OVERRIDE;
- bool BindParameter(int index, long long value) VTK_OVERRIDE;
+ bool BindParameter(int index, unsigned long value) override;
+ bool BindParameter(int index, long value) override;
+ bool BindParameter(int index, unsigned long long value) override;
+ bool BindParameter(int index, long long value) override;
- bool BindParameter(int index, float value) VTK_OVERRIDE;
- bool BindParameter(int index, double value) VTK_OVERRIDE;
+ bool BindParameter(int index, float value) override;
+ bool BindParameter(int index, double value) override;
/**
* Bind a string value -- string must be null-terminated
*/
- bool BindParameter(int index, const char *stringValue) VTK_OVERRIDE;
+ bool BindParameter(int index, const char *stringValue) override;
/**
* Bind a string value by specifying an array and a size
*/
- bool BindParameter(int index, const char *stringValue, size_t length) VTK_OVERRIDE;
+ bool BindParameter(int index, const char *stringValue, size_t length) override;
- bool BindParameter(int index, const vtkStdString &string) VTK_OVERRIDE;
+ bool BindParameter(int index, const vtkStdString &string) override;
- bool BindParameter(int index, vtkVariant value) VTK_OVERRIDE;
+ bool BindParameter(int index, vtkVariant value) override;
//@{
/**
* Bind a blob value. Not all databases support blobs as a data
* type. Check vtkSQLDatabase::IsSupported(VTK_SQL_FEATURE_BLOB) to
* make sure.
*/
- bool BindParameter(int index, const void *data, size_t length) VTK_OVERRIDE;
- bool ClearParameterBindings() VTK_OVERRIDE;
+ bool BindParameter(int index, const void *data, size_t length) override;
+ bool ClearParameterBindings() override;
//@}
protected:
vtkSQLiteQuery();
- ~vtkSQLiteQuery() VTK_OVERRIDE;
+ ~vtkSQLiteQuery() override;
vtkSetStringMacro(LastErrorText);
diff --git a/IO/SQL/vtkSQLiteToTableReader.h b/IO/SQL/vtkSQLiteToTableReader.h
index a708bc0e907fa5f4febcb6a5a595ac28e8a6cafd..ff3ac896257e7bc896bbb3e0ecc107c36f88c170 100644
--- a/IO/SQL/vtkSQLiteToTableReader.h
+++ b/IO/SQL/vtkSQLiteToTableReader.h
@@ -34,13 +34,13 @@ class VTKIOSQL_EXPORT vtkSQLiteToTableReader :
public:
static vtkSQLiteToTableReader *New();
vtkTypeMacro(vtkSQLiteToTableReader,vtkDatabaseToTableReader);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkSQLiteToTableReader();
- ~vtkSQLiteToTableReader() VTK_OVERRIDE;
+ ~vtkSQLiteToTableReader() override;
int RequestData(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
private:
vtkSQLiteToTableReader(const vtkSQLiteToTableReader&) VTK_DELETE_FUNCTION;
void operator=(const vtkSQLiteToTableReader&) VTK_DELETE_FUNCTION;
diff --git a/IO/SQL/vtkTableToDatabaseWriter.h b/IO/SQL/vtkTableToDatabaseWriter.h
index 73c838e94938e5a938ab09a6a63d576be1a00169..02201185367bf7edad6154a6eeeee3e0ea042468 100644
--- a/IO/SQL/vtkTableToDatabaseWriter.h
+++ b/IO/SQL/vtkTableToDatabaseWriter.h
@@ -35,7 +35,7 @@ class VTKIOSQL_EXPORT vtkTableToDatabaseWriter : public vtkWriter
{
public:
vtkTypeMacro(vtkTableToDatabaseWriter, vtkWriter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Set the database. Must already be open.
@@ -65,10 +65,10 @@ public:
protected:
vtkTableToDatabaseWriter();
- ~vtkTableToDatabaseWriter() VTK_OVERRIDE;
- void WriteData() VTK_OVERRIDE = 0;
+ ~vtkTableToDatabaseWriter() override;
+ void WriteData() override = 0;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
vtkSQLDatabase *Database;
diff --git a/IO/SQL/vtkTableToSQLiteWriter.h b/IO/SQL/vtkTableToSQLiteWriter.h
index 8f8e239510b65216020fe96ed63dc29085726ab8..a1eaa2d8c7cd1a86e3ca5ca755642911e657b6e0 100644
--- a/IO/SQL/vtkTableToSQLiteWriter.h
+++ b/IO/SQL/vtkTableToSQLiteWriter.h
@@ -33,7 +33,7 @@ class VTKIOSQL_EXPORT vtkTableToSQLiteWriter : public vtkTableToDatabaseWriter
public:
static vtkTableToSQLiteWriter *New();
vtkTypeMacro(vtkTableToSQLiteWriter,vtkTableToDatabaseWriter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -45,10 +45,10 @@ public:
protected:
vtkTableToSQLiteWriter();
- ~vtkTableToSQLiteWriter() VTK_OVERRIDE;
- void WriteData() VTK_OVERRIDE;
+ ~vtkTableToSQLiteWriter() override;
+ void WriteData() override;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
private:
vtkTableToSQLiteWriter(const vtkTableToSQLiteWriter&) VTK_DELETE_FUNCTION;
diff --git a/IO/SegY/vtkSegY2DReader.h b/IO/SegY/vtkSegY2DReader.h
index 8d05eac2e7f3599bc1bf2be280a220d48cce7621..8a5ba565c74d4e41b001968087faa52d317712f6 100644
--- a/IO/SegY/vtkSegY2DReader.h
+++ b/IO/SegY/vtkSegY2DReader.h
@@ -28,7 +28,7 @@ class VTKIOSEGY_EXPORT vtkSegY2DReader : public vtkStructuredGridAlgorithm
public:
static vtkSegY2DReader* New();
vtkTypeMacro(vtkSegY2DReader, vtkStructuredGridAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
vtkSegY2DReader();
~vtkSegY2DReader();
@@ -76,7 +76,7 @@ public:
protected:
int RequestData(vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
int XYCoordMode;
diff --git a/IO/SegY/vtkSegY3DReader.h b/IO/SegY/vtkSegY3DReader.h
index 06534530974e3bafbbc9996ef0a845280bb51710..18f436f48eab1cbc0781d22849398848e5c2128a 100644
--- a/IO/SegY/vtkSegY3DReader.h
+++ b/IO/SegY/vtkSegY3DReader.h
@@ -32,7 +32,7 @@ public:
static vtkSegY3DReader* New();
vtkTypeMacro(vtkSegY3DReader, vtkImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
vtkSetStringMacro(FileName);
vtkGetStringMacro(FileName);
diff --git a/IO/TRUCHAS/vtkTRUCHASReader.h b/IO/TRUCHAS/vtkTRUCHASReader.h
index 1171f10cfab45f0c235d1940e16677e36ad26bcc..872de9ee20440febbcee2dace6027818af914f54 100644
--- a/IO/TRUCHAS/vtkTRUCHASReader.h
+++ b/IO/TRUCHAS/vtkTRUCHASReader.h
@@ -34,7 +34,7 @@ class VTKIOTRUCHAS_EXPORT vtkTRUCHASReader
public:
static vtkTRUCHASReader *New();
vtkTypeMacro(vtkTRUCHASReader,vtkMultiBlockDataSetAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -105,18 +105,18 @@ public:
protected:
vtkTRUCHASReader();
- ~vtkTRUCHASReader() VTK_OVERRIDE;
+ ~vtkTRUCHASReader() override;
/**
* Overridden to announce timesteps we can produce
*/
int RequestInformation(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
/**
* Overridden to read the file and parse into an output
*/
int RequestData(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
char *FileName;
diff --git a/IO/TecplotTable/vtkTecplotTableReader.cxx b/IO/TecplotTable/vtkTecplotTableReader.cxx
index bfdb752ac458b57284ced07078c129f665185e94..b883c4d54ef7a44cff6b3a67bec60c5e7c790bd5 100644
--- a/IO/TecplotTable/vtkTecplotTableReader.cxx
+++ b/IO/TecplotTable/vtkTecplotTableReader.cxx
@@ -98,7 +98,7 @@ public:
Whitespace.insert('\t');
}
- ~DelimitedTextIterator() VTK_OVERRIDE
+ ~DelimitedTextIterator() override
{
// Ensure that all table columns have the same length ...
for(vtkIdType i = 0; i != this->OutputTable->GetNumberOfColumns(); ++i)
@@ -112,12 +112,12 @@ public:
}
}
- DelimitedTextIterator& operator++(int) VTK_OVERRIDE
+ DelimitedTextIterator& operator++(int) override
{
return *this;
}
- DelimitedTextIterator& operator*() VTK_OVERRIDE
+ DelimitedTextIterator& operator*() override
{
return *this;
}
@@ -137,7 +137,7 @@ public:
}
}
- DelimitedTextIterator& operator=(const vtkUnicodeString::value_type value) VTK_OVERRIDE
+ DelimitedTextIterator& operator=(const vtkUnicodeString::value_type value) override
{
// If we've already read our maximum number of records, we're done ...
if(this->MaxRecords && this->CurrentRecordIndex == this->MaxRecordIndex)
diff --git a/IO/TecplotTable/vtkTecplotTableReader.h b/IO/TecplotTable/vtkTecplotTableReader.h
index 1a8defd8ffd999770719679c2904c51095fd565c..5c5729c0022e186b4b9e977abaa72a80dd93c6ff 100644
--- a/IO/TecplotTable/vtkTecplotTableReader.h
+++ b/IO/TecplotTable/vtkTecplotTableReader.h
@@ -44,7 +44,7 @@ class VTKIOTECPLOTTABLE_EXPORT vtkTecplotTableReader : public vtkTableAlgorithm
public:
static vtkTecplotTableReader* New();
vtkTypeMacro(vtkTecplotTableReader, vtkTableAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -126,12 +126,12 @@ public:
protected:
vtkTecplotTableReader();
- ~vtkTecplotTableReader() VTK_OVERRIDE;
+ ~vtkTecplotTableReader() override;
int RequestData(
vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
char* FileName;
vtkIdType MaxRecords;
diff --git a/IO/VPIC/vtkVPICReader.h b/IO/VPIC/vtkVPICReader.h
index 5cc6d12a062828795b2cebfa6d984d8051f171c0..479c4a9a11c61f4aa7c85d3c180aa6a44d19caf0 100644
--- a/IO/VPIC/vtkVPICReader.h
+++ b/IO/VPIC/vtkVPICReader.h
@@ -48,7 +48,7 @@ class VTKIOVPIC_EXPORT vtkVPICReader : public vtkImageAlgorithm
public:
static vtkVPICReader *New();
vtkTypeMacro(vtkVPICReader,vtkImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -104,7 +104,7 @@ public:
protected:
vtkVPICReader();
- ~vtkVPICReader() VTK_OVERRIDE;
+ ~vtkVPICReader() override;
char *FileName; // First field part file giving path
@@ -159,9 +159,9 @@ protected:
vtkCallbackCommand* SelectionObserver;
int RequestData(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
int RequestInformation(vtkInformation *, vtkInformationVector **inVector,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
void LoadVariableData(int var, int timeStep);
void LoadComponent(
diff --git a/IO/Video/vtkVideoSource.h b/IO/Video/vtkVideoSource.h
index fd3645bbb5b1973ea744bfff278e0004c1bbf798..ea41a992c2ed024e26e4db35aba70b108e2d8784 100644
--- a/IO/Video/vtkVideoSource.h
+++ b/IO/Video/vtkVideoSource.h
@@ -45,7 +45,7 @@ class VTKIOVIDEO_EXPORT vtkVideoSource : public vtkImageAlgorithm
public:
static vtkVideoSource *New();
vtkTypeMacro(vtkVideoSource,vtkImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Record incoming video at the specified FrameRate. The recording
@@ -290,8 +290,8 @@ public:
protected:
vtkVideoSource();
- ~vtkVideoSource() VTK_OVERRIDE;
- int RequestInformation(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ ~vtkVideoSource() override;
+ int RequestInformation(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
int Initialized;
@@ -359,7 +359,7 @@ protected:
*/
virtual void UpdateFrameBuffer();
virtual void AdvanceFrameBuffer(int n);
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
// if some component conversion is required, it is done here:
virtual void UnpackRasterLine(char *outPtr, char *rowPtr,
int start, int count);
diff --git a/IO/XML/Testing/Cxx/TestXML.cxx b/IO/XML/Testing/Cxx/TestXML.cxx
index 9b12a7a389b02fe4378b3c9cacd23957469cbaa4..da7cbac898c3b35912669f85f3edb92fb8ec659e 100644
--- a/IO/XML/Testing/Cxx/TestXML.cxx
+++ b/IO/XML/Testing/Cxx/TestXML.cxx
@@ -29,8 +29,8 @@ public:
protected:
vtkMyXML() {}
- void StartElement(const char*, const char**) VTK_OVERRIDE {}
- void EndElement(const char*) VTK_OVERRIDE {}
+ void StartElement(const char*, const char**) override {}
+ void EndElement(const char*) override {}
private:
vtkMyXML(const vtkMyXML&) VTK_DELETE_FUNCTION;
diff --git a/IO/XML/vtkRTXMLPolyDataReader.h b/IO/XML/vtkRTXMLPolyDataReader.h
index 60c738b12323ca852db969ce093f43dcaf9c12c5..db993e2648341350285868e633dadd479489a963 100644
--- a/IO/XML/vtkRTXMLPolyDataReader.h
+++ b/IO/XML/vtkRTXMLPolyDataReader.h
@@ -32,7 +32,7 @@ class VTKIOXML_EXPORT vtkRTXMLPolyDataReader : public vtkXMLPolyDataReader
{
public:
vtkTypeMacro(vtkRTXMLPolyDataReader,vtkXMLPolyDataReader);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkRTXMLPolyDataReader* New();
// This sets the DataLocation and also
@@ -70,7 +70,7 @@ public:
protected:
vtkRTXMLPolyDataReader();
- ~vtkRTXMLPolyDataReader() VTK_OVERRIDE;
+ ~vtkRTXMLPolyDataReader() override;
//@{
/**
diff --git a/IO/XML/vtkXMLCompositeDataReader.h b/IO/XML/vtkXMLCompositeDataReader.h
index 825b45e1a88a27d633f57e503695e1693b4723b8..dc3372d2240bae3fc667dc7380bfdd1bfae0d4de 100644
--- a/IO/XML/vtkXMLCompositeDataReader.h
+++ b/IO/XML/vtkXMLCompositeDataReader.h
@@ -42,7 +42,7 @@ class VTKIOXML_EXPORT vtkXMLCompositeDataReader : public vtkXMLReader
{
public:
vtkTypeMacro(vtkXMLCompositeDataReader,vtkXMLReader);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -54,30 +54,30 @@ public:
protected:
vtkXMLCompositeDataReader();
- ~vtkXMLCompositeDataReader() VTK_OVERRIDE;
+ ~vtkXMLCompositeDataReader() override;
// Get the name of the data set being read.
- const char* GetDataSetName() VTK_OVERRIDE;
+ const char* GetDataSetName() override;
// Returns the primary element pass to ReadPrimaryElement().
vtkXMLDataElement* GetPrimaryElement();
- void ReadXMLData() VTK_OVERRIDE;
- int ReadPrimaryElement(vtkXMLDataElement* ePrimary) VTK_OVERRIDE;
+ void ReadXMLData() override;
+ int ReadPrimaryElement(vtkXMLDataElement* ePrimary) override;
// Setup the output with no data available. Used in error cases.
- void SetupEmptyOutput() VTK_OVERRIDE;
+ void SetupEmptyOutput() override;
- int FillOutputPortInformation(int, vtkInformation* info) VTK_OVERRIDE;
+ int FillOutputPortInformation(int, vtkInformation* info) override;
// Create a default executive.
- vtkExecutive* CreateDefaultExecutive() VTK_OVERRIDE;
+ vtkExecutive* CreateDefaultExecutive() override;
vtkXMLReader* GetReaderOfType(const char* type);
int RequestInformation(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
diff --git a/IO/XML/vtkXMLCompositeDataWriter.h b/IO/XML/vtkXMLCompositeDataWriter.h
index 321cc52dd4500e9cd8d59951014a709b40b12dde..3a36daba97c57be55448d01de8cbe62334953b92 100644
--- a/IO/XML/vtkXMLCompositeDataWriter.h
+++ b/IO/XML/vtkXMLCompositeDataWriter.h
@@ -39,12 +39,12 @@ class VTKIOXML_EXPORT vtkXMLCompositeDataWriter : public vtkXMLWriter
{
public:
vtkTypeMacro(vtkXMLCompositeDataWriter,vtkXMLWriter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Get the default file extension for files written by this writer.
*/
- const char* GetDefaultFileExtension() VTK_OVERRIDE;
+ const char* GetDefaultFileExtension() override;
/**
* Get/Set the number of pieces into which the inputs are split.
@@ -71,19 +71,19 @@ public:
*/
int ProcessRequest(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
protected:
vtkXMLCompositeDataWriter();
- ~vtkXMLCompositeDataWriter() VTK_OVERRIDE;
+ ~vtkXMLCompositeDataWriter() override;
/**
* Methods to define the file's major and minor version numbers.
* Major version incremented since v0.1 composite data readers cannot read
* the files written by this new reader.
*/
- int GetDataSetMajorVersion() VTK_OVERRIDE { return 1; }
- int GetDataSetMinorVersion() VTK_OVERRIDE { return 0; }
+ int GetDataSetMajorVersion() override { return 1; }
+ int GetDataSetMinorVersion() override { return 0; }
/**
* Create a filename for the given index.
@@ -91,18 +91,18 @@ protected:
vtkStdString CreatePieceFileName(int Piece);
// see algorithm for more info
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
int RequestData(
- vtkInformation* , vtkInformationVector** , vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformation* , vtkInformationVector** , vtkInformationVector*) override;
int RequestUpdateExtent(
vtkInformation* , vtkInformationVector** , vtkInformationVector*);
- int WriteData() VTK_OVERRIDE;
- const char* GetDataSetName() VTK_OVERRIDE;
+ int WriteData() override;
+ const char* GetDataSetName() override;
// Create a default executive.
- vtkExecutive* CreateDefaultExecutive() VTK_OVERRIDE;
+ vtkExecutive* CreateDefaultExecutive() override;
vtkInformation* InputInformation;
diff --git a/IO/XML/vtkXMLDataObjectWriter.h b/IO/XML/vtkXMLDataObjectWriter.h
index 4f04a6d1b830413797649373103c6d80fa0465f9..ef46efb57ac40ab5a0509baf5d7967d68d2551b3 100644
--- a/IO/XML/vtkXMLDataObjectWriter.h
+++ b/IO/XML/vtkXMLDataObjectWriter.h
@@ -38,7 +38,7 @@ class VTKIOXML_EXPORT vtkXMLDataObjectWriter : public vtkXMLWriter
{
public:
vtkTypeMacro(vtkXMLDataObjectWriter,vtkXMLWriter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkXMLDataObjectWriter* New();
/**
@@ -56,17 +56,17 @@ public:
protected:
vtkXMLDataObjectWriter();
- ~vtkXMLDataObjectWriter() VTK_OVERRIDE;
+ ~vtkXMLDataObjectWriter() override;
// see algorithm for more info
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
// Override writing method from superclass.
- int WriteInternal() VTK_OVERRIDE;
+ int WriteInternal() override;
// Dummies to satisfy pure virtuals from superclass.
- const char* GetDataSetName() VTK_OVERRIDE;
- const char* GetDefaultFileExtension() VTK_OVERRIDE;
+ const char* GetDataSetName() override;
+ const char* GetDefaultFileExtension() override;
// Callback registered with the InternalProgressObserver.
static void ProgressCallbackFunction(vtkObject*, unsigned long, void*,
diff --git a/IO/XML/vtkXMLDataReader.h b/IO/XML/vtkXMLDataReader.h
index 5920ecfff17326b17f8b5fd77f80b22c733b4ca6..8f4811ada92d4045f50ab532f020cccb2452fb02 100644
--- a/IO/XML/vtkXMLDataReader.h
+++ b/IO/XML/vtkXMLDataReader.h
@@ -35,7 +35,7 @@ class VTKIOXML_EXPORT vtkXMLDataReader : public vtkXMLReader
public:
vtkTypeMacro(vtkXMLDataReader,vtkXMLReader);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Get the number of points in the output.
@@ -49,19 +49,19 @@ public:
// For the specified port, copy the information this reader sets up in
// SetupOutputInformation to outInfo
- void CopyOutputInformation(vtkInformation *outInfo, int port) VTK_OVERRIDE;
+ void CopyOutputInformation(vtkInformation *outInfo, int port) override;
protected:
vtkXMLDataReader();
- ~vtkXMLDataReader() VTK_OVERRIDE;
+ ~vtkXMLDataReader() override;
// Add functionality to methods from superclass.
- void CreateXMLParser() VTK_OVERRIDE;
- void DestroyXMLParser() VTK_OVERRIDE;
- void SetupOutputInformation(vtkInformation *outInfo) VTK_OVERRIDE;
+ void CreateXMLParser() override;
+ void DestroyXMLParser() override;
+ void SetupOutputInformation(vtkInformation *outInfo) override;
- int ReadPrimaryElement(vtkXMLDataElement* ePrimary) VTK_OVERRIDE;
- void SetupOutputData() VTK_OVERRIDE;
+ int ReadPrimaryElement(vtkXMLDataElement* ePrimary) override;
+ void SetupOutputData() override;
// Setup the reader for a given number of pieces.
virtual void SetupPieces(int numPieces);
@@ -75,7 +75,7 @@ protected:
int ReadPieceData(int piece);
virtual int ReadPieceData();
- void ReadXMLData() VTK_OVERRIDE;
+ void ReadXMLData() override;
// Read a data array whose tuples coorrespond to points or cells.
virtual int ReadArrayForPoints(vtkXMLDataElement* da,
@@ -125,7 +125,7 @@ private:
void ConvertGhostLevelsToGhostType(
FieldType type, vtkAbstractArray* data, vtkIdType startIndex,
- vtkIdType numValues) VTK_OVERRIDE;
+ vtkIdType numValues) override;
};
diff --git a/IO/XML/vtkXMLDataSetWriter.h b/IO/XML/vtkXMLDataSetWriter.h
index 915863e544aff41a8b4dded363e4d2d282fc094c..30b11edd00864bfbb781e4ffcca3f53401207468 100644
--- a/IO/XML/vtkXMLDataSetWriter.h
+++ b/IO/XML/vtkXMLDataSetWriter.h
@@ -42,10 +42,10 @@ public:
protected:
vtkXMLDataSetWriter();
- ~vtkXMLDataSetWriter() VTK_OVERRIDE;
+ ~vtkXMLDataSetWriter() override;
// see algorithm for more info
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
private:
vtkXMLDataSetWriter(const vtkXMLDataSetWriter&) VTK_DELETE_FUNCTION;
diff --git a/IO/XML/vtkXMLFileReadTester.h b/IO/XML/vtkXMLFileReadTester.h
index 587e2307b891e2594286f0c80feb5aa6efa13511..b798bd5cc6cb0b79a7bfe5d98295722b7d0a9eee 100644
--- a/IO/XML/vtkXMLFileReadTester.h
+++ b/IO/XML/vtkXMLFileReadTester.h
@@ -31,7 +31,7 @@ class VTKIOXML_EXPORT vtkXMLFileReadTester: public vtkXMLParser
{
public:
vtkTypeMacro(vtkXMLFileReadTester,vtkXMLParser);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkXMLFileReadTester* New();
/**
@@ -58,15 +58,15 @@ public:
protected:
vtkXMLFileReadTester();
- ~vtkXMLFileReadTester() VTK_OVERRIDE;
-
- void StartElement(const char* name, const char** atts) VTK_OVERRIDE;
- int ParsingComplete() VTK_OVERRIDE;
- void ReportStrayAttribute(const char*, const char*, const char*) VTK_OVERRIDE {}
- void ReportMissingAttribute(const char*, const char*) VTK_OVERRIDE {}
- void ReportBadAttribute(const char*, const char*, const char*) VTK_OVERRIDE {}
- void ReportUnknownElement(const char*) VTK_OVERRIDE {}
- void ReportXmlParseError() VTK_OVERRIDE {}
+ ~vtkXMLFileReadTester() override;
+
+ void StartElement(const char* name, const char** atts) override;
+ int ParsingComplete() override;
+ void ReportStrayAttribute(const char*, const char*, const char*) override {}
+ void ReportMissingAttribute(const char*, const char*) override {}
+ void ReportBadAttribute(const char*, const char*, const char*) override {}
+ void ReportUnknownElement(const char*) override {}
+ void ReportXmlParseError() override {}
char* FileDataType;
char* FileVersion;
diff --git a/IO/XML/vtkXMLGenericDataObjectReader.h b/IO/XML/vtkXMLGenericDataObjectReader.h
index 471e8d4541e74f28bcc02c5e73444b4667da5da3..5b186569de5ef58135000691cda3fd602a6cfcb2 100644
--- a/IO/XML/vtkXMLGenericDataObjectReader.h
+++ b/IO/XML/vtkXMLGenericDataObjectReader.h
@@ -42,7 +42,7 @@ class VTKIOXML_EXPORT vtkXMLGenericDataObjectReader : public vtkXMLDataReader
{
public:
vtkTypeMacro(vtkXMLGenericDataObjectReader,vtkXMLDataReader);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkXMLGenericDataObjectReader *New();
//@{
@@ -74,17 +74,17 @@ public:
/**
* Overridden method.
*/
- vtkIdType GetNumberOfPoints() VTK_OVERRIDE;
+ vtkIdType GetNumberOfPoints() override;
/**
* Overridden method.
*/
- vtkIdType GetNumberOfCells() VTK_OVERRIDE;
+ vtkIdType GetNumberOfCells() override;
/**
* Overridden method. Not Used. Delegated.
*/
- void SetupEmptyOutput() VTK_OVERRIDE;
+ void SetupEmptyOutput() override;
/**
* This method can be used to find out the type of output expected without
@@ -94,25 +94,25 @@ public:
protected:
vtkXMLGenericDataObjectReader();
- ~vtkXMLGenericDataObjectReader() VTK_OVERRIDE;
+ ~vtkXMLGenericDataObjectReader() override;
/**
* Overridden method. Not used. Return "vtkDataObject".
*/
- const char* GetDataSetName() VTK_OVERRIDE;
+ const char* GetDataSetName() override;
int RequestDataObject(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
int RequestInformation(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
virtual int RequestUpdateExtent(vtkInformation *request,
vtkInformationVector **inputVector,
vtkInformationVector *outputVector);
int RequestData(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
- int FillOutputPortInformation(int, vtkInformation *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
+ int FillOutputPortInformation(int, vtkInformation *) override;
vtkXMLReader *Reader; // actual reader
diff --git a/IO/XML/vtkXMLHierarchicalBoxDataFileConverter.h b/IO/XML/vtkXMLHierarchicalBoxDataFileConverter.h
index 8654e71848f7b6b8146ba29f430a8f63b3527e07..95015bf1cf7015236977b7859872d02f9357fa51 100644
--- a/IO/XML/vtkXMLHierarchicalBoxDataFileConverter.h
+++ b/IO/XML/vtkXMLHierarchicalBoxDataFileConverter.h
@@ -35,7 +35,7 @@ class VTKIOXML_EXPORT vtkXMLHierarchicalBoxDataFileConverter : public vtkObject
public:
static vtkXMLHierarchicalBoxDataFileConverter* New();
vtkTypeMacro(vtkXMLHierarchicalBoxDataFileConverter, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -60,7 +60,7 @@ public:
protected:
vtkXMLHierarchicalBoxDataFileConverter();
- ~vtkXMLHierarchicalBoxDataFileConverter() VTK_OVERRIDE;
+ ~vtkXMLHierarchicalBoxDataFileConverter() override;
vtkXMLDataElement* ParseXML(const char* filename);
diff --git a/IO/XML/vtkXMLHierarchicalBoxDataReader.h b/IO/XML/vtkXMLHierarchicalBoxDataReader.h
index 099cf16a46403725c1d224ba1e9e2e73b2ef01e7..df50771daa2a9b1bafcb575909f620ceea07201e 100644
--- a/IO/XML/vtkXMLHierarchicalBoxDataReader.h
+++ b/IO/XML/vtkXMLHierarchicalBoxDataReader.h
@@ -38,11 +38,11 @@ class VTKIOXML_EXPORT vtkXMLHierarchicalBoxDataReader :
public:
static vtkXMLHierarchicalBoxDataReader* New();
vtkTypeMacro(vtkXMLHierarchicalBoxDataReader,vtkXMLUniformGridAMRReader);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkXMLHierarchicalBoxDataReader();
- ~vtkXMLHierarchicalBoxDataReader() VTK_OVERRIDE;
+ ~vtkXMLHierarchicalBoxDataReader() override;
private:
vtkXMLHierarchicalBoxDataReader(const vtkXMLHierarchicalBoxDataReader&) VTK_DELETE_FUNCTION;
diff --git a/IO/XML/vtkXMLHierarchicalBoxDataWriter.h b/IO/XML/vtkXMLHierarchicalBoxDataWriter.h
index 92f76d6918f0961e65ef72e6210c3f4fe533e729..e9257b9fc71f8e5c2dd9ca5ac74027c295d6ed18 100644
--- a/IO/XML/vtkXMLHierarchicalBoxDataWriter.h
+++ b/IO/XML/vtkXMLHierarchicalBoxDataWriter.h
@@ -32,17 +32,17 @@ class VTKIOXML_EXPORT vtkXMLHierarchicalBoxDataWriter : public vtkXMLUniformGrid
public:
static vtkXMLHierarchicalBoxDataWriter* New();
vtkTypeMacro(vtkXMLHierarchicalBoxDataWriter, vtkXMLUniformGridAMRWriter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Get the default file extension for files written by this writer.
*/
- const char* GetDefaultFileExtension() VTK_OVERRIDE
+ const char* GetDefaultFileExtension() override
{ return "vth"; }
protected:
vtkXMLHierarchicalBoxDataWriter();
- ~vtkXMLHierarchicalBoxDataWriter() VTK_OVERRIDE;
+ ~vtkXMLHierarchicalBoxDataWriter() override;
private:
vtkXMLHierarchicalBoxDataWriter(const vtkXMLHierarchicalBoxDataWriter&) VTK_DELETE_FUNCTION;
diff --git a/IO/XML/vtkXMLHierarchicalDataReader.h b/IO/XML/vtkXMLHierarchicalDataReader.h
index 39c09a2a1c9e2a452af4fcb81f165da15673857c..cbb624ffc2c4b44ac63bc34d69d2858f842991a8 100644
--- a/IO/XML/vtkXMLHierarchicalDataReader.h
+++ b/IO/XML/vtkXMLHierarchicalDataReader.h
@@ -39,14 +39,14 @@ class VTKIOXML_EXPORT vtkXMLHierarchicalDataReader : public vtkXMLMultiGroupData
public:
static vtkXMLHierarchicalDataReader* New();
vtkTypeMacro(vtkXMLHierarchicalDataReader,vtkXMLMultiGroupDataReader);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkXMLHierarchicalDataReader();
- ~vtkXMLHierarchicalDataReader() VTK_OVERRIDE;
+ ~vtkXMLHierarchicalDataReader() override;
// Get the name of the data set being read.
- const char* GetDataSetName() VTK_OVERRIDE
+ const char* GetDataSetName() override
{
return "vtkHierarchicalDataSet";
}
diff --git a/IO/XML/vtkXMLHyperOctreeReader.h b/IO/XML/vtkXMLHyperOctreeReader.h
index 9536c3476c5b6a9377684e104f9b36e261578faa..47cbd70e21c36405b824de64157d392a93ce31ec 100644
--- a/IO/XML/vtkXMLHyperOctreeReader.h
+++ b/IO/XML/vtkXMLHyperOctreeReader.h
@@ -40,7 +40,7 @@ class VTKIOXML_EXPORT vtkXMLHyperOctreeReader : public vtkXMLDataReader
{
public:
vtkTypeMacro(vtkXMLHyperOctreeReader,vtkXMLDataReader);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkXMLHyperOctreeReader *New();
//@{
@@ -53,31 +53,31 @@ public:
protected:
vtkXMLHyperOctreeReader();
- ~vtkXMLHyperOctreeReader() VTK_OVERRIDE;
+ ~vtkXMLHyperOctreeReader() override;
- const char* GetDataSetName() VTK_OVERRIDE;
+ const char* GetDataSetName() override;
// Setup the output with no data available. Used in error cases.
- void SetupEmptyOutput() VTK_OVERRIDE;
+ void SetupEmptyOutput() override;
// Declare that this reader produces HyperOctrees
- int FillOutputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
+ int FillOutputPortInformation(int, vtkInformation*) override;
//These defer to the HyperOctree output.
- vtkIdType GetNumberOfPoints() VTK_OVERRIDE;
- vtkIdType GetNumberOfCells() VTK_OVERRIDE;
+ vtkIdType GetNumberOfPoints() override;
+ vtkIdType GetNumberOfCells() override;
// Overridden here to do allocation.
int ReadArrayForPoints(vtkXMLDataElement* da,
- vtkAbstractArray* outArray) VTK_OVERRIDE;
+ vtkAbstractArray* outArray) override;
int ReadArrayForCells(vtkXMLDataElement* da,
- vtkAbstractArray* outArray) VTK_OVERRIDE;
+ vtkAbstractArray* outArray) override;
// The most important stuff is here.
// Read the rest of the file and create the HyperOctree.
- void ReadXMLData() VTK_OVERRIDE;
+ void ReadXMLData() override;
// Recover the structure of the HyperOctree, used by ReadXMLData.
void ReadTopology(vtkXMLDataElement *elem);
diff --git a/IO/XML/vtkXMLHyperOctreeWriter.h b/IO/XML/vtkXMLHyperOctreeWriter.h
index 76b5cefe668abf22c0547eca7bf00016baf65054..7e22063762eb6550b8000dc77ba8b263f3bdfe53 100644
--- a/IO/XML/vtkXMLHyperOctreeWriter.h
+++ b/IO/XML/vtkXMLHyperOctreeWriter.h
@@ -40,7 +40,7 @@ class VTKIOXML_EXPORT vtkXMLHyperOctreeWriter : public vtkXMLWriter
{
public:
vtkTypeMacro(vtkXMLHyperOctreeWriter,vtkXMLWriter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkXMLHyperOctreeWriter* New();
/**
@@ -51,25 +51,25 @@ public:
/**
* Get the default file extension for files written by this writer.
*/
- const char* GetDefaultFileExtension() VTK_OVERRIDE;
+ const char* GetDefaultFileExtension() override;
protected:
vtkXMLHyperOctreeWriter();
- ~vtkXMLHyperOctreeWriter() VTK_OVERRIDE;
+ ~vtkXMLHyperOctreeWriter() override;
- const char* GetDataSetName() VTK_OVERRIDE;
+ const char* GetDataSetName() override;
// specify that we require HyperOctree input
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
// The most important method, make the XML file for my input.
- int WriteData() VTK_OVERRIDE;
+ int WriteData() override;
// <HyperOctree ...
int StartPrimElement(vtkIndent);
// ... dim, size, origin>
- void WritePrimaryElementAttributes(ostream &, vtkIndent) VTK_OVERRIDE;
+ void WritePrimaryElementAttributes(ostream &, vtkIndent) override;
// Tree Structure
int WriteTopology(vtkIndent);
diff --git a/IO/XML/vtkXMLImageDataReader.h b/IO/XML/vtkXMLImageDataReader.h
index 36c096738196743bf97ad6af113f2e538ece13e4..31d3f1e28f50d204de0247de3354c20e456a03d1 100644
--- a/IO/XML/vtkXMLImageDataReader.h
+++ b/IO/XML/vtkXMLImageDataReader.h
@@ -38,7 +38,7 @@ class VTKIOXML_EXPORT vtkXMLImageDataReader : public vtkXMLStructuredDataReader
{
public:
vtkTypeMacro(vtkXMLImageDataReader,vtkXMLStructuredDataReader);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkXMLImageDataReader *New();
//@{
@@ -53,25 +53,25 @@ public:
* For the specified port, copy the information this reader sets up in
* SetupOutputInformation to outInfo
*/
- void CopyOutputInformation(vtkInformation *outInfo, int port) VTK_OVERRIDE;
+ void CopyOutputInformation(vtkInformation *outInfo, int port) override;
protected:
vtkXMLImageDataReader();
- ~vtkXMLImageDataReader() VTK_OVERRIDE;
+ ~vtkXMLImageDataReader() override;
double Origin[3];
double Spacing[3];
int PieceExtent[6];
- const char* GetDataSetName() VTK_OVERRIDE;
- void SetOutputExtent(int* extent) VTK_OVERRIDE;
+ const char* GetDataSetName() override;
+ void SetOutputExtent(int* extent) override;
- int ReadPrimaryElement(vtkXMLDataElement* ePrimary) VTK_OVERRIDE;
+ int ReadPrimaryElement(vtkXMLDataElement* ePrimary) override;
// Setup the output's information.
- void SetupOutputInformation(vtkInformation *outInfo) VTK_OVERRIDE;
+ void SetupOutputInformation(vtkInformation *outInfo) override;
- int FillOutputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
+ int FillOutputPortInformation(int, vtkInformation*) override;
diff --git a/IO/XML/vtkXMLImageDataWriter.h b/IO/XML/vtkXMLImageDataWriter.h
index 368199ea5935071b27440ed79c814e6a9a5cdaa2..96915969ec5c5812ce152fc68dfc36a803fdb8ae 100644
--- a/IO/XML/vtkXMLImageDataWriter.h
+++ b/IO/XML/vtkXMLImageDataWriter.h
@@ -39,7 +39,7 @@ class VTKIOXML_EXPORT vtkXMLImageDataWriter : public vtkXMLStructuredDataWriter
public:
static vtkXMLImageDataWriter* New();
vtkTypeMacro(vtkXMLImageDataWriter,vtkXMLStructuredDataWriter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Get/Set the writer's input.
@@ -49,18 +49,18 @@ public:
/**
* Get the default file extension for files written by this writer.
*/
- const char* GetDefaultFileExtension() VTK_OVERRIDE;
+ const char* GetDefaultFileExtension() override;
protected:
vtkXMLImageDataWriter();
- ~vtkXMLImageDataWriter() VTK_OVERRIDE;
+ ~vtkXMLImageDataWriter() override;
// see algorithm for more info
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
- void WritePrimaryElementAttributes(ostream &os, vtkIndent indent) VTK_OVERRIDE;
- void GetInputExtent(int* extent) VTK_OVERRIDE;
- const char* GetDataSetName() VTK_OVERRIDE;
+ void WritePrimaryElementAttributes(ostream &os, vtkIndent indent) override;
+ void GetInputExtent(int* extent) override;
+ const char* GetDataSetName() override;
private:
vtkXMLImageDataWriter(const vtkXMLImageDataWriter&) VTK_DELETE_FUNCTION;
diff --git a/IO/XML/vtkXMLMultiBlockDataReader.h b/IO/XML/vtkXMLMultiBlockDataReader.h
index c537ad2f3505791cdbdfbaffd6f018533d60bdc2..352f17beb510815fe4ff828535220c01d35e97ce 100644
--- a/IO/XML/vtkXMLMultiBlockDataReader.h
+++ b/IO/XML/vtkXMLMultiBlockDataReader.h
@@ -39,17 +39,17 @@ class VTKIOXML_EXPORT vtkXMLMultiBlockDataReader : public vtkXMLCompositeDataRea
public:
static vtkXMLMultiBlockDataReader* New();
vtkTypeMacro(vtkXMLMultiBlockDataReader,vtkXMLCompositeDataReader);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkXMLMultiBlockDataReader();
- ~vtkXMLMultiBlockDataReader() VTK_OVERRIDE;
+ ~vtkXMLMultiBlockDataReader() override;
// Read the XML element for the subtree of a the composite dataset.
// dataSetIndex is used to rank the leaf nodes in an inorder traversal.
void ReadComposite(vtkXMLDataElement* element,
vtkCompositeDataSet* composite, const char* filePath,
- unsigned int &dataSetIndex) VTK_OVERRIDE;
+ unsigned int &dataSetIndex) override;
// Reads file version < 1.0.
virtual void ReadVersion0(vtkXMLDataElement* element,
@@ -57,13 +57,13 @@ protected:
unsigned int &dataSetIndex);
// Get the name of the data set being read.
- const char* GetDataSetName() VTK_OVERRIDE;
+ const char* GetDataSetName() override;
- int FillOutputPortInformation(int, vtkInformation* info) VTK_OVERRIDE;
+ int FillOutputPortInformation(int, vtkInformation* info) override;
int RequestInformation(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
virtual int FillMetaData(vtkCompositeDataSet* metadata,
vtkXMLDataElement* element,
diff --git a/IO/XML/vtkXMLMultiBlockDataWriter.h b/IO/XML/vtkXMLMultiBlockDataWriter.h
index 0b223c5a0f42fe00b14cd2580c18c2241295c532..f8c45d85024af1df1d0d585156e814ba260ddde0 100644
--- a/IO/XML/vtkXMLMultiBlockDataWriter.h
+++ b/IO/XML/vtkXMLMultiBlockDataWriter.h
@@ -31,24 +31,24 @@ class VTKIOXML_EXPORT vtkXMLMultiBlockDataWriter : public vtkXMLCompositeDataWri
public:
static vtkXMLMultiBlockDataWriter* New();
vtkTypeMacro(vtkXMLMultiBlockDataWriter, vtkXMLCompositeDataWriter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Get the default file extension for files written by this writer.
*/
- const char* GetDefaultFileExtension() VTK_OVERRIDE
+ const char* GetDefaultFileExtension() override
{ return "vtm"; }
protected:
vtkXMLMultiBlockDataWriter();
- ~vtkXMLMultiBlockDataWriter() VTK_OVERRIDE;
+ ~vtkXMLMultiBlockDataWriter() override;
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
// Internal method called recursively to create the xml tree for the children
// of compositeData.
int WriteComposite(vtkCompositeDataSet* compositeData,
- vtkXMLDataElement* parent, int &writerIdx) VTK_OVERRIDE;
+ vtkXMLDataElement* parent, int &writerIdx) override;
private:
vtkXMLMultiBlockDataWriter(const vtkXMLMultiBlockDataWriter&) VTK_DELETE_FUNCTION;
diff --git a/IO/XML/vtkXMLMultiGroupDataReader.h b/IO/XML/vtkXMLMultiGroupDataReader.h
index fb5186f4eafaea4796f2279d4c8d2d5081288ff7..42488a515a05e476bc114cd7339df09850065eaf 100644
--- a/IO/XML/vtkXMLMultiGroupDataReader.h
+++ b/IO/XML/vtkXMLMultiGroupDataReader.h
@@ -31,14 +31,14 @@ class VTKIOXML_EXPORT vtkXMLMultiGroupDataReader : public vtkXMLMultiBlockDataRe
public:
static vtkXMLMultiGroupDataReader* New();
vtkTypeMacro(vtkXMLMultiGroupDataReader,vtkXMLMultiBlockDataReader);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkXMLMultiGroupDataReader();
- ~vtkXMLMultiGroupDataReader() VTK_OVERRIDE;
+ ~vtkXMLMultiGroupDataReader() override;
// Get the name of the data set being read.
- const char* GetDataSetName() VTK_OVERRIDE
+ const char* GetDataSetName() override
{
return "vtkMultiGroupDataSet";
}
diff --git a/IO/XML/vtkXMLPDataObjectReader.h b/IO/XML/vtkXMLPDataObjectReader.h
index 248eebfcd0067d3c0432e7dccb275c8ccb1c9741..697af7c95f9b503f6983567650da1e47b8be3847 100644
--- a/IO/XML/vtkXMLPDataObjectReader.h
+++ b/IO/XML/vtkXMLPDataObjectReader.h
@@ -30,7 +30,7 @@ class VTKIOXML_EXPORT vtkXMLPDataObjectReader : public vtkXMLReader
{
public:
vtkTypeMacro(vtkXMLPDataObjectReader, vtkXMLReader);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Get the number of pieces from the summary file being read.
@@ -39,7 +39,7 @@ public:
protected:
vtkXMLPDataObjectReader();
- ~vtkXMLPDataObjectReader() VTK_OVERRIDE;
+ ~vtkXMLPDataObjectReader() override;
/**
* Delete all piece readers and related information
@@ -49,7 +49,7 @@ protected:
/**
* Initialize the output data
*/
- void SetupOutputData() VTK_OVERRIDE;
+ void SetupOutputData() override;
/**
* Setup the number of pieces to be read and allocate space accordingly
@@ -59,7 +59,7 @@ protected:
/**
* Pipeline execute information driver. Called by vtkXMLReader.
*/
- int ReadXMLInformation() VTK_OVERRIDE;
+ int ReadXMLInformation() override;
/**
* Whether or not the current reader can read the current piece
diff --git a/IO/XML/vtkXMLPDataReader.h b/IO/XML/vtkXMLPDataReader.h
index 3df13d95d2eea16794a7116b88173cb2977b9043..671221143b958b8be400b9d678882e9fd54c9fb5 100644
--- a/IO/XML/vtkXMLPDataReader.h
+++ b/IO/XML/vtkXMLPDataReader.h
@@ -38,17 +38,17 @@ class VTKIOXML_EXPORT vtkXMLPDataReader : public vtkXMLPDataObjectReader
{
public:
vtkTypeMacro(vtkXMLPDataReader, vtkXMLPDataObjectReader);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* For the specified port, copy the information this reader sets up in
* SetupOutputInformation to outInfo
*/
- void CopyOutputInformation(vtkInformation* outInfo, int port) VTK_OVERRIDE;
+ void CopyOutputInformation(vtkInformation* outInfo, int port) override;
protected:
vtkXMLPDataReader();
- ~vtkXMLPDataReader() VTK_OVERRIDE;
+ ~vtkXMLPDataReader() override;
// Re-use any superclass signatures that we don't override.
using vtkXMLPDataObjectReader::ReadPiece;
@@ -56,7 +56,7 @@ protected:
/**
* Delete all piece readers and related information
*/
- void DestroyPieces() VTK_OVERRIDE;
+ void DestroyPieces() override;
virtual vtkIdType GetNumberOfPoints() = 0;
@@ -70,22 +70,22 @@ protected:
/**
* Initialize the output data
*/
- void SetupOutputData() VTK_OVERRIDE;
+ void SetupOutputData() override;
/**
* Pipeline execute information driver. Called by vtkXMLReader.
*/
- void SetupOutputInformation(vtkInformation* outInfo) VTK_OVERRIDE;
+ void SetupOutputInformation(vtkInformation* outInfo) override;
/**
* Setup the number of pieces to be read and allocate space accordingly
*/
- void SetupPieces(int numPieces) VTK_OVERRIDE;
+ void SetupPieces(int numPieces) override;
/**
* Whether or not the current reader can read the current piece
*/
- int CanReadPiece(int index) VTK_OVERRIDE;
+ int CanReadPiece(int index) override;
/**
* Create a reader according to the data to read. It needs to be overridden by subclass.
@@ -95,7 +95,7 @@ protected:
/**
* Setup the current piece reader
*/
- int ReadPiece(vtkXMLDataElement* ePiece) VTK_OVERRIDE;
+ int ReadPiece(vtkXMLDataElement* ePiece) override;
/**
* Actually read the piece at the given index data
@@ -110,7 +110,7 @@ protected:
/**
* Read the information relative to the dataset and allocate the needed structures according to it
*/
- int ReadPrimaryElement(vtkXMLDataElement* ePrimary) VTK_OVERRIDE;
+ int ReadPrimaryElement(vtkXMLDataElement* ePrimary) override;
virtual void CopyArrayForPoints(vtkDataArray* inArray, vtkDataArray* outArray) = 0;
virtual void CopyArrayForCells(vtkDataArray* inArray, vtkDataArray* outArray) = 0;
@@ -118,7 +118,7 @@ protected:
/**
* Callback registered with the PieceProgressObserver.
*/
- void PieceProgressCallback() VTK_OVERRIDE;
+ void PieceProgressCallback() override;
/**
* The ghost level available on each input piece.
diff --git a/IO/XML/vtkXMLPImageDataReader.h b/IO/XML/vtkXMLPImageDataReader.h
index 57c0a090f9d942faecd5a3f4b665a76ca6f27ed3..a144e0ebff610fce277c79d720b45e59731e2a4b 100644
--- a/IO/XML/vtkXMLPImageDataReader.h
+++ b/IO/XML/vtkXMLPImageDataReader.h
@@ -38,7 +38,7 @@ class VTKIOXML_EXPORT vtkXMLPImageDataReader : public vtkXMLPStructuredDataReade
{
public:
vtkTypeMacro(vtkXMLPImageDataReader,vtkXMLPStructuredDataReader);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkXMLPImageDataReader *New();
//@{
@@ -51,28 +51,28 @@ public:
// For the specified port, copy the information this reader sets up in
// SetupOutputInformation to outInfo
- void CopyOutputInformation(vtkInformation *outInfo, int port) VTK_OVERRIDE;
+ void CopyOutputInformation(vtkInformation *outInfo, int port) override;
protected:
vtkXMLPImageDataReader();
- ~vtkXMLPImageDataReader() VTK_OVERRIDE;
+ ~vtkXMLPImageDataReader() override;
double Origin[3];
double Spacing[3];
vtkImageData* GetPieceInput(int index);
- void SetupEmptyOutput() VTK_OVERRIDE;
- const char* GetDataSetName() VTK_OVERRIDE;
- void SetOutputExtent(int* extent) VTK_OVERRIDE;
- void GetPieceInputExtent(int index, int* extent) VTK_OVERRIDE;
- int ReadPrimaryElement(vtkXMLDataElement* ePrimary) VTK_OVERRIDE;
+ void SetupEmptyOutput() override;
+ const char* GetDataSetName() override;
+ void SetOutputExtent(int* extent) override;
+ void GetPieceInputExtent(int index, int* extent) override;
+ int ReadPrimaryElement(vtkXMLDataElement* ePrimary) override;
// Setup the output's information.
- void SetupOutputInformation(vtkInformation *outInfo) VTK_OVERRIDE;
+ void SetupOutputInformation(vtkInformation *outInfo) override;
- vtkXMLDataReader* CreatePieceReader() VTK_OVERRIDE;
- int FillOutputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
+ vtkXMLDataReader* CreatePieceReader() override;
+ int FillOutputPortInformation(int, vtkInformation*) override;
private:
vtkXMLPImageDataReader(const vtkXMLPImageDataReader&) VTK_DELETE_FUNCTION;
diff --git a/IO/XML/vtkXMLPPolyDataReader.h b/IO/XML/vtkXMLPPolyDataReader.h
index f2ee00f5c1ef0d6fb38c17662279ebf7e78376b5..c0aae49b803747d0dc661a97b90fdf84c54a2ea4 100644
--- a/IO/XML/vtkXMLPPolyDataReader.h
+++ b/IO/XML/vtkXMLPPolyDataReader.h
@@ -38,7 +38,7 @@ class VTKIOXML_EXPORT vtkXMLPPolyDataReader : public vtkXMLPUnstructuredDataRead
{
public:
vtkTypeMacro(vtkXMLPPolyDataReader,vtkXMLPUnstructuredDataReader);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkXMLPPolyDataReader *New();
//@{
@@ -51,24 +51,24 @@ public:
protected:
vtkXMLPPolyDataReader();
- ~vtkXMLPPolyDataReader() VTK_OVERRIDE;
+ ~vtkXMLPPolyDataReader() override;
- const char* GetDataSetName() VTK_OVERRIDE;
- void GetOutputUpdateExtent(int& piece, int& numberOfPieces, int& ghostLevel) VTK_OVERRIDE;
- vtkIdType GetNumberOfCellsInPiece(int piece) VTK_OVERRIDE;
+ const char* GetDataSetName() override;
+ void GetOutputUpdateExtent(int& piece, int& numberOfPieces, int& ghostLevel) override;
+ vtkIdType GetNumberOfCellsInPiece(int piece) override;
vtkIdType GetNumberOfVertsInPiece(int piece);
vtkIdType GetNumberOfLinesInPiece(int piece);
vtkIdType GetNumberOfStripsInPiece(int piece);
vtkIdType GetNumberOfPolysInPiece(int piece);
- void SetupOutputTotals() VTK_OVERRIDE;
+ void SetupOutputTotals() override;
- void SetupOutputData() VTK_OVERRIDE;
- void SetupNextPiece() VTK_OVERRIDE;
- int ReadPieceData() VTK_OVERRIDE;
+ void SetupOutputData() override;
+ void SetupNextPiece() override;
+ int ReadPieceData() override;
- void CopyArrayForCells(vtkDataArray* inArray, vtkDataArray* outArray) VTK_OVERRIDE;
- vtkXMLDataReader* CreatePieceReader() VTK_OVERRIDE;
- int FillOutputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
+ void CopyArrayForCells(vtkDataArray* inArray, vtkDataArray* outArray) override;
+ vtkXMLDataReader* CreatePieceReader() override;
+ int FillOutputPortInformation(int, vtkInformation*) override;
// The size of the UpdatePiece.
vtkIdType TotalNumberOfVerts;
diff --git a/IO/XML/vtkXMLPRectilinearGridReader.h b/IO/XML/vtkXMLPRectilinearGridReader.h
index 2f897c44ab9fa99d7d97381cca31ee658796c45e..a55bad6e04fec33d0795c2e541403a5151330874 100644
--- a/IO/XML/vtkXMLPRectilinearGridReader.h
+++ b/IO/XML/vtkXMLPRectilinearGridReader.h
@@ -38,7 +38,7 @@ class VTKIOXML_EXPORT vtkXMLPRectilinearGridReader : public vtkXMLPStructuredDat
{
public:
vtkTypeMacro(vtkXMLPRectilinearGridReader,vtkXMLPStructuredDataReader);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkXMLPRectilinearGridReader *New();
//@{
@@ -51,21 +51,21 @@ public:
protected:
vtkXMLPRectilinearGridReader();
- ~vtkXMLPRectilinearGridReader() VTK_OVERRIDE;
+ ~vtkXMLPRectilinearGridReader() override;
vtkRectilinearGrid* GetPieceInput(int index);
- void SetupEmptyOutput() VTK_OVERRIDE;
- const char* GetDataSetName() VTK_OVERRIDE;
- void SetOutputExtent(int* extent) VTK_OVERRIDE;
- void GetPieceInputExtent(int index, int* extent) VTK_OVERRIDE;
- int ReadPrimaryElement(vtkXMLDataElement* ePrimary) VTK_OVERRIDE;
- void SetupOutputData() VTK_OVERRIDE;
- int ReadPieceData() VTK_OVERRIDE;
- vtkXMLDataReader* CreatePieceReader() VTK_OVERRIDE;
+ void SetupEmptyOutput() override;
+ const char* GetDataSetName() override;
+ void SetOutputExtent(int* extent) override;
+ void GetPieceInputExtent(int index, int* extent) override;
+ int ReadPrimaryElement(vtkXMLDataElement* ePrimary) override;
+ void SetupOutputData() override;
+ int ReadPieceData() override;
+ vtkXMLDataReader* CreatePieceReader() override;
void CopySubCoordinates(int* inBounds, int* outBounds, int* subBounds,
vtkDataArray* inArray, vtkDataArray* outArray);
- int FillOutputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
+ int FillOutputPortInformation(int, vtkInformation*) override;
// The PCoordinates element with coordinate information.
vtkXMLDataElement* PCoordinatesElement;
diff --git a/IO/XML/vtkXMLPStructuredDataReader.h b/IO/XML/vtkXMLPStructuredDataReader.h
index 033f874c317a06fb2db03d5370350f9ba305e2be..10c1f29051dd406145d71271c9eb513c9dadcbe0 100644
--- a/IO/XML/vtkXMLPStructuredDataReader.h
+++ b/IO/XML/vtkXMLPStructuredDataReader.h
@@ -37,33 +37,33 @@ class VTKIOXML_EXPORT vtkXMLPStructuredDataReader : public vtkXMLPDataReader
{
public:
vtkTypeMacro(vtkXMLPStructuredDataReader,vtkXMLPDataReader);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
// For the specified port, copy the information this reader sets up in
// SetupOutputInformation to outInfo
- void CopyOutputInformation(vtkInformation *outInfo, int port) VTK_OVERRIDE;
+ void CopyOutputInformation(vtkInformation *outInfo, int port) override;
protected:
vtkXMLPStructuredDataReader();
- ~vtkXMLPStructuredDataReader() VTK_OVERRIDE;
+ ~vtkXMLPStructuredDataReader() override;
- vtkIdType GetNumberOfPoints() VTK_OVERRIDE;
- vtkIdType GetNumberOfCells() VTK_OVERRIDE;
- void CopyArrayForPoints(vtkDataArray* inArray, vtkDataArray* outArray) VTK_OVERRIDE;
- void CopyArrayForCells(vtkDataArray* inArray, vtkDataArray* outArray) VTK_OVERRIDE;
+ vtkIdType GetNumberOfPoints() override;
+ vtkIdType GetNumberOfCells() override;
+ void CopyArrayForPoints(vtkDataArray* inArray, vtkDataArray* outArray) override;
+ void CopyArrayForCells(vtkDataArray* inArray, vtkDataArray* outArray) override;
virtual void SetOutputExtent(int* extent)=0;
virtual void GetPieceInputExtent(int index, int* extent)=0;
// Pipeline execute data driver. Called by vtkXMLReader.
- void ReadXMLData() VTK_OVERRIDE;
- int ReadPrimaryElement(vtkXMLDataElement* ePrimary) VTK_OVERRIDE;
+ void ReadXMLData() override;
+ int ReadPrimaryElement(vtkXMLDataElement* ePrimary) override;
- void SetupOutputData() VTK_OVERRIDE;
+ void SetupOutputData() override;
- void SetupPieces(int numPieces) VTK_OVERRIDE;
- void DestroyPieces() VTK_OVERRIDE;
- int ReadPiece(vtkXMLDataElement* ePiece) VTK_OVERRIDE;
- int ReadPieceData() VTK_OVERRIDE;
+ void SetupPieces(int numPieces) override;
+ void DestroyPieces() override;
+ int ReadPiece(vtkXMLDataElement* ePiece) override;
+ int ReadPieceData() override;
void CopySubExtent(int* inExtent, int* inDimensions, vtkIdType* inIncrements,
int* outExtent,int* outDimensions,vtkIdType* outIncrements,
int* subExtent, int* subDimensions,
@@ -94,7 +94,7 @@ protected:
int RequestInformation(vtkInformation *request,
vtkInformationVector **inputVector,
- vtkInformationVector *outputVector) VTK_OVERRIDE;
+ vtkInformationVector *outputVector) override;
private:
vtkXMLPStructuredDataReader(const vtkXMLPStructuredDataReader&) VTK_DELETE_FUNCTION;
diff --git a/IO/XML/vtkXMLPStructuredGridReader.h b/IO/XML/vtkXMLPStructuredGridReader.h
index 195e72506f8198fade272810ed09c437843021e9..cfa222750efa721e66eb7c19c629e341d15ee257 100644
--- a/IO/XML/vtkXMLPStructuredGridReader.h
+++ b/IO/XML/vtkXMLPStructuredGridReader.h
@@ -38,7 +38,7 @@ class VTKIOXML_EXPORT vtkXMLPStructuredGridReader : public vtkXMLPStructuredData
{
public:
vtkTypeMacro(vtkXMLPStructuredGridReader,vtkXMLPStructuredDataReader);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkXMLPStructuredGridReader *New();
/**
@@ -53,19 +53,19 @@ public:
protected:
vtkXMLPStructuredGridReader();
- ~vtkXMLPStructuredGridReader() VTK_OVERRIDE;
+ ~vtkXMLPStructuredGridReader() override;
vtkStructuredGrid* GetPieceInput(int index);
- void SetupEmptyOutput() VTK_OVERRIDE;
- const char* GetDataSetName() VTK_OVERRIDE;
- void SetOutputExtent(int* extent) VTK_OVERRIDE;
- void GetPieceInputExtent(int index, int* extent) VTK_OVERRIDE;
- int ReadPrimaryElement(vtkXMLDataElement* ePrimary) VTK_OVERRIDE;
- void SetupOutputData() VTK_OVERRIDE;
- int ReadPieceData() VTK_OVERRIDE;
- vtkXMLDataReader* CreatePieceReader() VTK_OVERRIDE;
- int FillOutputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
+ void SetupEmptyOutput() override;
+ const char* GetDataSetName() override;
+ void SetOutputExtent(int* extent) override;
+ void GetPieceInputExtent(int index, int* extent) override;
+ int ReadPrimaryElement(vtkXMLDataElement* ePrimary) override;
+ void SetupOutputData() override;
+ int ReadPieceData() override;
+ vtkXMLDataReader* CreatePieceReader() override;
+ int FillOutputPortInformation(int, vtkInformation*) override;
// The PPoints element with point information.
vtkXMLDataElement* PPointsElement;
diff --git a/IO/XML/vtkXMLPTableReader.h b/IO/XML/vtkXMLPTableReader.h
index bfde255c8d9ad09c70c72307395fd3f0afa21497..1bac22ba327c23fe83550bc16b49b3fd9599d08b 100644
--- a/IO/XML/vtkXMLPTableReader.h
+++ b/IO/XML/vtkXMLPTableReader.h
@@ -39,7 +39,7 @@ class VTKIOXML_EXPORT vtkXMLPTableReader : public vtkXMLPDataObjectReader
{
public:
vtkTypeMacro(vtkXMLPTableReader, vtkXMLPDataObjectReader);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkXMLPTableReader* New();
//@{
@@ -54,7 +54,7 @@ public:
* For the specified port, copy the information this reader sets up in
* SetupOutputInformation to outInfo
*/
- void CopyOutputInformation(vtkInformation* outInfo, int port) VTK_OVERRIDE;
+ void CopyOutputInformation(vtkInformation* outInfo, int port) override;
/**
* Get the number of columns arrays available in the input.
@@ -84,12 +84,12 @@ public:
protected:
vtkXMLPTableReader();
- ~vtkXMLPTableReader() VTK_OVERRIDE;
+ ~vtkXMLPTableReader() override;
/**
* Return hte type of the dataset being read
*/
- const char* GetDataSetName() VTK_OVERRIDE;
+ const char* GetDataSetName() override;
/**
* Get the number of rows of the table
@@ -114,17 +114,17 @@ protected:
/**
* Initialize current output
*/
- void SetupEmptyOutput() VTK_OVERRIDE;
+ void SetupEmptyOutput() override;
/**
* Initialize current output data: allocate arrays for RowData
*/
- void SetupOutputData() VTK_OVERRIDE;
+ void SetupOutputData() override;
/**
* Setup the output's information.
*/
- void SetupOutputInformation(vtkInformation* outInfo) VTK_OVERRIDE;
+ void SetupOutputInformation(vtkInformation* outInfo) override;
/**
* Initialize the total number of rows to be read.
@@ -139,7 +139,7 @@ protected:
/**
* Setup the number of pieces to be read and allocate space accordingly
*/
- void SetupPieces(int numPieces) VTK_OVERRIDE;
+ void SetupPieces(int numPieces) override;
/**
* Setup the extent for the parallel reader and the piece readers.
@@ -149,29 +149,29 @@ protected:
/**
* Setup the readers and then read the input data
*/
- void ReadXMLData() VTK_OVERRIDE;
+ void ReadXMLData() override;
/**
* Whether or not the current reader can read the current piece
*/
- int CanReadPiece(int index) VTK_OVERRIDE;
+ int CanReadPiece(int index) override;
/**
* Pipeline execute data driver. Called by vtkXMLReader.
*/
- int ReadPrimaryElement(vtkXMLDataElement* ePrimary) VTK_OVERRIDE;
+ int ReadPrimaryElement(vtkXMLDataElement* ePrimary) override;
/**
* Delete all piece readers and related information
*/
- void DestroyPieces() VTK_OVERRIDE;
+ void DestroyPieces() override;
using vtkXMLPDataObjectReader::ReadPiece;
/**
* Setup the current piece reader.
*/
- int ReadPiece(vtkXMLDataElement* ePiece) VTK_OVERRIDE;
+ int ReadPiece(vtkXMLDataElement* ePiece) override;
/**
* Read piece at the given index RowData
@@ -188,15 +188,15 @@ protected:
*/
vtkXMLTableReader* CreatePieceReader();
- int FillOutputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
+ int FillOutputPortInformation(int, vtkInformation*) override;
int RequestInformation(vtkInformation* request, vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
/**
* Callback registered with the PieceProgressObserver.
*/
- void PieceProgressCallback() VTK_OVERRIDE;
+ void PieceProgressCallback() override;
/**
* Check whether the given array element is an enabled array.
diff --git a/IO/XML/vtkXMLPUnstructuredDataReader.h b/IO/XML/vtkXMLPUnstructuredDataReader.h
index 51b016f68b66e7cdd5e074b93b8839e4e5502e20..0ba9ad457ad8c523f98d172ed51d8bd86c61d102 100644
--- a/IO/XML/vtkXMLPUnstructuredDataReader.h
+++ b/IO/XML/vtkXMLPUnstructuredDataReader.h
@@ -37,44 +37,44 @@ class VTKIOXML_EXPORT vtkXMLPUnstructuredDataReader : public vtkXMLPDataReader
{
public:
vtkTypeMacro(vtkXMLPUnstructuredDataReader,vtkXMLPDataReader);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
// For the specified port, copy the information this reader sets up in
// SetupOutputInformation to outInfo
- void CopyOutputInformation(vtkInformation *outInfo, int port) VTK_OVERRIDE;
+ void CopyOutputInformation(vtkInformation *outInfo, int port) override;
protected:
vtkXMLPUnstructuredDataReader();
- ~vtkXMLPUnstructuredDataReader() VTK_OVERRIDE;
+ ~vtkXMLPUnstructuredDataReader() override;
int RequestInformation(vtkInformation *request,
vtkInformationVector **inputVector,
- vtkInformationVector *outputVector) VTK_OVERRIDE;
+ vtkInformationVector *outputVector) override;
vtkPointSet* GetOutputAsPointSet();
vtkPointSet* GetPieceInputAsPointSet(int piece);
virtual void SetupOutputTotals();
virtual void SetupNextPiece();
- vtkIdType GetNumberOfPoints() VTK_OVERRIDE;
- vtkIdType GetNumberOfCells() VTK_OVERRIDE;
- void CopyArrayForPoints(vtkDataArray* inArray, vtkDataArray* outArray) VTK_OVERRIDE;
+ vtkIdType GetNumberOfPoints() override;
+ vtkIdType GetNumberOfCells() override;
+ void CopyArrayForPoints(vtkDataArray* inArray, vtkDataArray* outArray) override;
- void SetupEmptyOutput() VTK_OVERRIDE;
+ void SetupEmptyOutput() override;
// Setup the output's information.
- void SetupOutputInformation(vtkInformation *outInfo) VTK_OVERRIDE;
+ void SetupOutputInformation(vtkInformation *outInfo) override;
- void SetupOutputData() VTK_OVERRIDE;
+ void SetupOutputData() override;
virtual void GetOutputUpdateExtent(int& piece, int& numberOfPieces,
int& ghostLevel)=0;
// Pipeline execute data driver. Called by vtkXMLReader.
- void ReadXMLData() VTK_OVERRIDE;
- int ReadPrimaryElement(vtkXMLDataElement* ePrimary) VTK_OVERRIDE;
+ void ReadXMLData() override;
+ int ReadPrimaryElement(vtkXMLDataElement* ePrimary) override;
void SetupUpdateExtent(int piece, int numberOfPieces, int ghostLevel);
- int ReadPieceData() VTK_OVERRIDE;
+ int ReadPieceData() override;
void CopyCellArray(vtkIdType totalNumberOfCells, vtkCellArray* inCells,
vtkCellArray* outCells);
diff --git a/IO/XML/vtkXMLPUnstructuredGridReader.h b/IO/XML/vtkXMLPUnstructuredGridReader.h
index f80019b870f6f49ed1c71122adac2dde3288c4d4..e41c4b6c253c2b9007ff6b323191d56044a2e761 100644
--- a/IO/XML/vtkXMLPUnstructuredGridReader.h
+++ b/IO/XML/vtkXMLPUnstructuredGridReader.h
@@ -38,7 +38,7 @@ class VTKIOXML_EXPORT vtkXMLPUnstructuredGridReader : public vtkXMLPUnstructured
{
public:
vtkTypeMacro(vtkXMLPUnstructuredGridReader,vtkXMLPUnstructuredDataReader);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkXMLPUnstructuredGridReader *New();
//@{
@@ -51,21 +51,21 @@ public:
protected:
vtkXMLPUnstructuredGridReader();
- ~vtkXMLPUnstructuredGridReader() VTK_OVERRIDE;
+ ~vtkXMLPUnstructuredGridReader() override;
- const char* GetDataSetName() VTK_OVERRIDE;
- void GetOutputUpdateExtent(int& piece, int& numberOfPieces, int& ghostLevel) VTK_OVERRIDE;
- void SetupOutputTotals() VTK_OVERRIDE;
+ const char* GetDataSetName() override;
+ void GetOutputUpdateExtent(int& piece, int& numberOfPieces, int& ghostLevel) override;
+ void SetupOutputTotals() override;
- void SetupOutputData() VTK_OVERRIDE;
- void SetupNextPiece() VTK_OVERRIDE;
- int ReadPieceData() VTK_OVERRIDE;
+ void SetupOutputData() override;
+ void SetupNextPiece() override;
+ int ReadPieceData() override;
- void CopyArrayForCells(vtkDataArray* inArray, vtkDataArray* outArray) VTK_OVERRIDE;
- vtkXMLDataReader* CreatePieceReader() VTK_OVERRIDE;
- int FillOutputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
+ void CopyArrayForCells(vtkDataArray* inArray, vtkDataArray* outArray) override;
+ vtkXMLDataReader* CreatePieceReader() override;
+ int FillOutputPortInformation(int, vtkInformation*) override;
- void SqueezeOutputArrays(vtkDataObject*) VTK_OVERRIDE;
+ void SqueezeOutputArrays(vtkDataObject*) override;
// The index of the cell in the output where the current piece
// begins.
diff --git a/IO/XML/vtkXMLPolyDataReader.h b/IO/XML/vtkXMLPolyDataReader.h
index 6f56c5d638fbcefe4a1786209ad985b34c6fea25..fb4fb520ddf05795f70ec5f966a8ae53df7d3ed1 100644
--- a/IO/XML/vtkXMLPolyDataReader.h
+++ b/IO/XML/vtkXMLPolyDataReader.h
@@ -38,7 +38,7 @@ class VTKIOXML_EXPORT vtkXMLPolyDataReader : public vtkXMLUnstructuredDataReader
{
public:
vtkTypeMacro(vtkXMLPolyDataReader,vtkXMLUnstructuredDataReader);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkXMLPolyDataReader *New();
//@{
@@ -61,28 +61,28 @@ public:
protected:
vtkXMLPolyDataReader();
- ~vtkXMLPolyDataReader() VTK_OVERRIDE;
+ ~vtkXMLPolyDataReader() override;
- const char* GetDataSetName() VTK_OVERRIDE;
- void GetOutputUpdateExtent(int& piece, int& numberOfPieces, int& ghostLevel) VTK_OVERRIDE;
- void SetupOutputTotals() VTK_OVERRIDE;
- void SetupNextPiece() VTK_OVERRIDE;
- void SetupPieces(int numPieces) VTK_OVERRIDE;
- void DestroyPieces() VTK_OVERRIDE;
+ const char* GetDataSetName() override;
+ void GetOutputUpdateExtent(int& piece, int& numberOfPieces, int& ghostLevel) override;
+ void SetupOutputTotals() override;
+ void SetupNextPiece() override;
+ void SetupPieces(int numPieces) override;
+ void DestroyPieces() override;
- void SetupOutputData() VTK_OVERRIDE;
- int ReadPiece(vtkXMLDataElement* ePiece) VTK_OVERRIDE;
- int ReadPieceData() VTK_OVERRIDE;
+ void SetupOutputData() override;
+ int ReadPiece(vtkXMLDataElement* ePiece) override;
+ int ReadPieceData() override;
// Read a data array whose tuples coorrespond to cells.
int ReadArrayForCells(vtkXMLDataElement* da,
- vtkAbstractArray* outArray) VTK_OVERRIDE;
+ vtkAbstractArray* outArray) override;
// Get the number of cells in the given piece. Valid after
// UpdateInformation.
- vtkIdType GetNumberOfCellsInPiece(int piece) VTK_OVERRIDE;
+ vtkIdType GetNumberOfCellsInPiece(int piece) override;
- int FillOutputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
+ int FillOutputPortInformation(int, vtkInformation*) override;
// The size of the UpdatePiece.
int TotalNumberOfVerts;
diff --git a/IO/XML/vtkXMLPolyDataWriter.h b/IO/XML/vtkXMLPolyDataWriter.h
index ec45fa3b95fd111867a010d2ba965e36521d5b7a..ef06d889efba79b95212fc7d9ab6e461c7ae239f 100644
--- a/IO/XML/vtkXMLPolyDataWriter.h
+++ b/IO/XML/vtkXMLPolyDataWriter.h
@@ -39,7 +39,7 @@ class VTKIOXML_EXPORT vtkXMLPolyDataWriter : public vtkXMLUnstructuredDataWriter
{
public:
vtkTypeMacro(vtkXMLPolyDataWriter,vtkXMLUnstructuredDataWriter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkXMLPolyDataWriter* New();
/**
@@ -50,28 +50,28 @@ public:
/**
* Get the default file extension for files written by this writer.
*/
- const char* GetDefaultFileExtension() VTK_OVERRIDE;
+ const char* GetDefaultFileExtension() override;
protected:
vtkXMLPolyDataWriter();
- ~vtkXMLPolyDataWriter() VTK_OVERRIDE;
+ ~vtkXMLPolyDataWriter() override;
// see algorithm for more info
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
- const char* GetDataSetName() VTK_OVERRIDE;
+ const char* GetDataSetName() override;
- void AllocatePositionArrays() VTK_OVERRIDE;
- void DeletePositionArrays() VTK_OVERRIDE;
+ void AllocatePositionArrays() override;
+ void DeletePositionArrays() override;
- void WriteInlinePieceAttributes() VTK_OVERRIDE;
- void WriteInlinePiece(vtkIndent indent) VTK_OVERRIDE;
+ void WriteInlinePieceAttributes() override;
+ void WriteInlinePiece(vtkIndent indent) override;
- void WriteAppendedPieceAttributes(int index) VTK_OVERRIDE;
- void WriteAppendedPiece(int index, vtkIndent indent) VTK_OVERRIDE;
- void WriteAppendedPieceData(int index) VTK_OVERRIDE;
+ void WriteAppendedPieceAttributes(int index) override;
+ void WriteAppendedPiece(int index, vtkIndent indent) override;
+ void WriteAppendedPieceData(int index) override;
- vtkIdType GetNumberOfInputCells() VTK_OVERRIDE;
+ vtkIdType GetNumberOfInputCells() override;
void CalculateSuperclassFraction(float* fractions);
// Positions of attributes for each piece.
diff --git a/IO/XML/vtkXMLReader.h b/IO/XML/vtkXMLReader.h
index cc3a039108183ac6a192255179bda4916e14c69c..0e00b443ff9cd35a4e7d52b018b8670163c8d8ae 100644
--- a/IO/XML/vtkXMLReader.h
+++ b/IO/XML/vtkXMLReader.h
@@ -44,7 +44,7 @@ class VTKIOXML_EXPORT vtkXMLReader : public vtkAlgorithm
{
public:
vtkTypeMacro(vtkXMLReader, vtkAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
enum FieldType
{
@@ -159,7 +159,7 @@ public:
int ProcessRequest(vtkInformation *request,
vtkInformationVector **inputVector,
- vtkInformationVector *outputVector) VTK_OVERRIDE;
+ vtkInformationVector *outputVector) override;
//@{
/**
@@ -181,7 +181,7 @@ public:
protected:
vtkXMLReader();
- ~vtkXMLReader() VTK_OVERRIDE;
+ ~vtkXMLReader() override;
// Pipeline execution methods to be defined by subclass. Called by
// corresponding RequestData methods after appropriate setup has been
diff --git a/IO/XML/vtkXMLRectilinearGridReader.h b/IO/XML/vtkXMLRectilinearGridReader.h
index a51a076eba27ce94003b21857b7600a179291363..3bc2d6e098dbfeb809a96ec742cf76e633468616 100644
--- a/IO/XML/vtkXMLRectilinearGridReader.h
+++ b/IO/XML/vtkXMLRectilinearGridReader.h
@@ -38,7 +38,7 @@ class VTKIOXML_EXPORT vtkXMLRectilinearGridReader : public vtkXMLStructuredDataR
{
public:
vtkTypeMacro(vtkXMLRectilinearGridReader,vtkXMLStructuredDataReader);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkXMLRectilinearGridReader *New();
//@{
@@ -51,19 +51,19 @@ public:
protected:
vtkXMLRectilinearGridReader();
- ~vtkXMLRectilinearGridReader() VTK_OVERRIDE;
+ ~vtkXMLRectilinearGridReader() override;
- const char* GetDataSetName() VTK_OVERRIDE;
- void SetOutputExtent(int* extent) VTK_OVERRIDE;
+ const char* GetDataSetName() override;
+ void SetOutputExtent(int* extent) override;
- void SetupPieces(int numPieces) VTK_OVERRIDE;
- void DestroyPieces() VTK_OVERRIDE;
- void SetupOutputData() VTK_OVERRIDE;
- int ReadPiece(vtkXMLDataElement* ePiece) VTK_OVERRIDE;
- int ReadPieceData() VTK_OVERRIDE;
+ void SetupPieces(int numPieces) override;
+ void DestroyPieces() override;
+ void SetupOutputData() override;
+ int ReadPiece(vtkXMLDataElement* ePiece) override;
+ int ReadPieceData() override;
int ReadSubCoordinates(int* inBounds, int* outBounds, int* subBounds,
vtkXMLDataElement* da, vtkDataArray* array);
- int FillOutputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
+ int FillOutputPortInformation(int, vtkInformation*) override;
// The elements representing the coordinate arrays for each piece.
vtkXMLDataElement** CoordinateElements;
diff --git a/IO/XML/vtkXMLRectilinearGridWriter.h b/IO/XML/vtkXMLRectilinearGridWriter.h
index 0bbd85fd05de7cdc626d5fbe3efe84e457289de2..3d7d8c9a82e3e9694e2ddf04a9fd011a86eb046c 100644
--- a/IO/XML/vtkXMLRectilinearGridWriter.h
+++ b/IO/XML/vtkXMLRectilinearGridWriter.h
@@ -39,7 +39,7 @@ class VTKIOXML_EXPORT vtkXMLRectilinearGridWriter : public vtkXMLStructuredDataW
public:
static vtkXMLRectilinearGridWriter* New();
vtkTypeMacro(vtkXMLRectilinearGridWriter,vtkXMLStructuredDataWriter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Get/Set the writer's input.
@@ -49,28 +49,28 @@ public:
/**
* Get the default file extension for files written by this writer.
*/
- const char* GetDefaultFileExtension() VTK_OVERRIDE;
+ const char* GetDefaultFileExtension() override;
protected:
vtkXMLRectilinearGridWriter();
- ~vtkXMLRectilinearGridWriter() VTK_OVERRIDE;
+ ~vtkXMLRectilinearGridWriter() override;
// see algorithm for more info
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
int WriteAppendedMode(vtkIndent indent);
- void WriteAppendedPiece(int index, vtkIndent indent) VTK_OVERRIDE;
- void WriteAppendedPieceData(int index) VTK_OVERRIDE;
- void WriteInlinePiece(vtkIndent indent) VTK_OVERRIDE;
- void GetInputExtent(int* extent) VTK_OVERRIDE;
- const char* GetDataSetName() VTK_OVERRIDE;
+ void WriteAppendedPiece(int index, vtkIndent indent) override;
+ void WriteAppendedPieceData(int index) override;
+ void WriteInlinePiece(vtkIndent indent) override;
+ void GetInputExtent(int* extent) override;
+ const char* GetDataSetName() override;
void CalculateSuperclassFraction(float* fractions);
// Coordinate array appended data positions.
OffsetsManagerArray *CoordinateOM;
- void AllocatePositionArrays() VTK_OVERRIDE;
- void DeletePositionArrays() VTK_OVERRIDE;
+ void AllocatePositionArrays() override;
+ void DeletePositionArrays() override;
private:
vtkXMLRectilinearGridWriter(const vtkXMLRectilinearGridWriter&) VTK_DELETE_FUNCTION;
diff --git a/IO/XML/vtkXMLStructuredDataReader.h b/IO/XML/vtkXMLStructuredDataReader.h
index 188fb6c6152b6961c51a2e0ccec0e24c5109bbb6..562128c0e7e10b0a3d396b5b1f334b18246873d6 100644
--- a/IO/XML/vtkXMLStructuredDataReader.h
+++ b/IO/XML/vtkXMLStructuredDataReader.h
@@ -35,17 +35,17 @@ class VTKIOXML_EXPORT vtkXMLStructuredDataReader : public vtkXMLDataReader
{
public:
vtkTypeMacro(vtkXMLStructuredDataReader,vtkXMLDataReader);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Get the number of points in the output.
*/
- vtkIdType GetNumberOfPoints() VTK_OVERRIDE;
+ vtkIdType GetNumberOfPoints() override;
/**
* Get the number of cells in the output.
*/
- vtkIdType GetNumberOfCells() VTK_OVERRIDE;
+ vtkIdType GetNumberOfCells() override;
//@{
/**
@@ -63,19 +63,19 @@ public:
* For the specified port, copy the information this reader sets up in
* SetupOutputInformation to outInfo
*/
- void CopyOutputInformation(vtkInformation *outInfo, int port) VTK_OVERRIDE;
+ void CopyOutputInformation(vtkInformation *outInfo, int port) override;
protected:
vtkXMLStructuredDataReader();
- ~vtkXMLStructuredDataReader() VTK_OVERRIDE;
+ ~vtkXMLStructuredDataReader() override;
virtual void SetOutputExtent(int* extent)=0;
- int ReadPrimaryElement(vtkXMLDataElement* ePrimary) VTK_OVERRIDE;
+ int ReadPrimaryElement(vtkXMLDataElement* ePrimary) override;
// Pipeline execute data driver. Called by vtkXMLReader.
- void ReadXMLData() VTK_OVERRIDE;
+ void ReadXMLData() override;
- void SetupOutputInformation(vtkInformation *outInfo) VTK_OVERRIDE;
+ void SetupOutputInformation(vtkInformation *outInfo) override;
// Internal representation of pieces in the file that may have come
// from a streamed write.
@@ -103,16 +103,16 @@ protected:
int SubCellDimensions[3];
// Override methods from superclass.
- void SetupEmptyOutput() VTK_OVERRIDE;
- void SetupPieces(int numPieces) VTK_OVERRIDE;
- void DestroyPieces() VTK_OVERRIDE;
+ void SetupEmptyOutput() override;
+ void SetupPieces(int numPieces) override;
+ void DestroyPieces() override;
int ReadArrayForPoints(vtkXMLDataElement* da,
- vtkAbstractArray* outArray) VTK_OVERRIDE;
+ vtkAbstractArray* outArray) override;
int ReadArrayForCells(vtkXMLDataElement* da,
- vtkAbstractArray* outArray) VTK_OVERRIDE;
+ vtkAbstractArray* outArray) override;
// Internal utility methods.
- int ReadPiece(vtkXMLDataElement* ePiece) VTK_OVERRIDE;
+ int ReadPiece(vtkXMLDataElement* ePiece) override;
virtual int ReadSubExtent(
int* inExtent, int* inDimensions, vtkIdType* inIncrements,
int* outExtent,int* outDimensions,vtkIdType* outIncrements,
diff --git a/IO/XML/vtkXMLStructuredDataWriter.h b/IO/XML/vtkXMLStructuredDataWriter.h
index 90944eb17138d37d285d68d686d6d7f6b54d0921..7b9c7e378e83973a7b692e5a4535a3c0e9d0aebb 100644
--- a/IO/XML/vtkXMLStructuredDataWriter.h
+++ b/IO/XML/vtkXMLStructuredDataWriter.h
@@ -34,7 +34,7 @@ class VTKIOXML_EXPORT vtkXMLStructuredDataWriter : public vtkXMLWriter
{
public:
vtkTypeMacro(vtkXMLStructuredDataWriter,vtkXMLWriter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -74,10 +74,10 @@ public:
protected:
vtkXMLStructuredDataWriter();
- ~vtkXMLStructuredDataWriter() VTK_OVERRIDE;
+ ~vtkXMLStructuredDataWriter() override;
// Writing drivers defined by subclasses.
- void WritePrimaryElementAttributes(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void WritePrimaryElementAttributes(ostream &os, vtkIndent indent) override;
virtual void WriteAppendedPiece(int index, vtkIndent indent);
virtual void WriteAppendedPieceData(int index);
virtual void WriteInlinePiece(vtkIndent indent);
@@ -98,7 +98,7 @@ protected:
void SetInputUpdateExtent(int piece);
int ProcessRequest(vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
vtkSetVector6Macro(InternalWriteExtent, int);
diff --git a/IO/XML/vtkXMLStructuredGridReader.h b/IO/XML/vtkXMLStructuredGridReader.h
index c7085830231e61095613bc174e63a6f43c0ec24b..b14b07fc0150960212dc1fcf6c34908a6b9dc750 100644
--- a/IO/XML/vtkXMLStructuredGridReader.h
+++ b/IO/XML/vtkXMLStructuredGridReader.h
@@ -38,7 +38,7 @@ class VTKIOXML_EXPORT vtkXMLStructuredGridReader : public vtkXMLStructuredDataRe
{
public:
vtkTypeMacro(vtkXMLStructuredGridReader,vtkXMLStructuredDataReader);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkXMLStructuredGridReader *New();
//@{
@@ -51,18 +51,18 @@ public:
protected:
vtkXMLStructuredGridReader();
- ~vtkXMLStructuredGridReader() VTK_OVERRIDE;
+ ~vtkXMLStructuredGridReader() override;
- const char* GetDataSetName() VTK_OVERRIDE;
- void SetOutputExtent(int* extent) VTK_OVERRIDE;
+ const char* GetDataSetName() override;
+ void SetOutputExtent(int* extent) override;
- void SetupPieces(int numPieces) VTK_OVERRIDE;
- void DestroyPieces() VTK_OVERRIDE;
- void SetupOutputData() VTK_OVERRIDE;
+ void SetupPieces(int numPieces) override;
+ void DestroyPieces() override;
+ void SetupOutputData() override;
- int ReadPiece(vtkXMLDataElement* ePiece) VTK_OVERRIDE;
- int ReadPieceData() VTK_OVERRIDE;
- int FillOutputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
+ int ReadPiece(vtkXMLDataElement* ePiece) override;
+ int ReadPieceData() override;
+ int FillOutputPortInformation(int, vtkInformation*) override;
// The elements representing the points for each piece.
vtkXMLDataElement** PointElements;
diff --git a/IO/XML/vtkXMLStructuredGridWriter.h b/IO/XML/vtkXMLStructuredGridWriter.h
index be4bba29af00cc97ae744c6f4eb48fe3ab6fecb7..7dc702c7d8d5114a579b73ae885d59482ee79f92 100644
--- a/IO/XML/vtkXMLStructuredGridWriter.h
+++ b/IO/XML/vtkXMLStructuredGridWriter.h
@@ -39,7 +39,7 @@ class VTKIOXML_EXPORT vtkXMLStructuredGridWriter : public vtkXMLStructuredDataWr
public:
static vtkXMLStructuredGridWriter* New();
vtkTypeMacro(vtkXMLStructuredGridWriter,vtkXMLStructuredDataWriter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Get/Set the writer's input.
@@ -49,28 +49,28 @@ public:
/**
* Get the default file extension for files written by this writer.
*/
- const char* GetDefaultFileExtension() VTK_OVERRIDE;
+ const char* GetDefaultFileExtension() override;
protected:
vtkXMLStructuredGridWriter();
- ~vtkXMLStructuredGridWriter() VTK_OVERRIDE;
+ ~vtkXMLStructuredGridWriter() override;
// see algorithm for more info
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
- void WriteAppendedPiece(int index, vtkIndent indent) VTK_OVERRIDE;
- void WriteAppendedPieceData(int index) VTK_OVERRIDE;
- void WriteInlinePiece(vtkIndent indent) VTK_OVERRIDE;
- void GetInputExtent(int* extent) VTK_OVERRIDE;
- const char* GetDataSetName() VTK_OVERRIDE;
+ void WriteAppendedPiece(int index, vtkIndent indent) override;
+ void WriteAppendedPieceData(int index) override;
+ void WriteInlinePiece(vtkIndent indent) override;
+ void GetInputExtent(int* extent) override;
+ const char* GetDataSetName() override;
void CalculateSuperclassFraction(float* fractions);
// The position of the appended data offset attribute for the points
// array.
OffsetsManagerGroup *PointsOM; //one per piece
- void AllocatePositionArrays() VTK_OVERRIDE;
- void DeletePositionArrays() VTK_OVERRIDE;
+ void AllocatePositionArrays() override;
+ void DeletePositionArrays() override;
private:
vtkXMLStructuredGridWriter(const vtkXMLStructuredGridWriter&) VTK_DELETE_FUNCTION;
diff --git a/IO/XML/vtkXMLTableReader.h b/IO/XML/vtkXMLTableReader.h
index 939b8ef45e8a2bdf3ca9a8e9d94a78997b505672..152716cd50abf3bcbc40e2de003e9a01e1f1746e 100644
--- a/IO/XML/vtkXMLTableReader.h
+++ b/IO/XML/vtkXMLTableReader.h
@@ -36,7 +36,7 @@ class VTKIOXML_EXPORT vtkXMLTableReader : public vtkXMLReader
{
public:
vtkTypeMacro(vtkXMLTableReader, vtkXMLReader);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkXMLTableReader* New();
//@{
@@ -69,7 +69,7 @@ public:
* For the specified port, copy the information this reader sets up in
* SetupOutputInformation to outInfo
*/
- void CopyOutputInformation(vtkInformation* outInfo, int port) VTK_OVERRIDE;
+ void CopyOutputInformation(vtkInformation* outInfo, int port) override;
/**
* Get the number of columns arrays available in the input.
@@ -99,7 +99,7 @@ public:
protected:
vtkXMLTableReader();
- ~vtkXMLTableReader() VTK_OVERRIDE;
+ ~vtkXMLTableReader() override;
/**
* Check whether the given array element is an enabled array.
@@ -111,7 +111,7 @@ protected:
/**
* Get the name of the data set being read.
*/
- const char* GetDataSetName() VTK_OVERRIDE;
+ const char* GetDataSetName() override;
/**
* Get the current piece index and the total number of piece in the dataset
@@ -126,7 +126,7 @@ protected:
/**
* Initialize current output
*/
- void SetupEmptyOutput() VTK_OVERRIDE;
+ void SetupEmptyOutput() override;
/**
* Initialize the total number of rows to be read.
@@ -141,12 +141,12 @@ protected:
/**
* Initialize current output data: allocate arrays for RowData
*/
- void SetupOutputData() VTK_OVERRIDE;
+ void SetupOutputData() override;
/**
* Setup the output's information.
*/
- void SetupOutputInformation(vtkInformation* outInfo) VTK_OVERRIDE;
+ void SetupOutputInformation(vtkInformation* outInfo) override;
/**
* Setup the number of pieces to be read and allocate space accordingly
@@ -156,12 +156,12 @@ protected:
/**
* Pipeline execute data driver. Called by vtkXMLReader.
*/
- void ReadXMLData() VTK_OVERRIDE;
+ void ReadXMLData() override;
/**
* Pipeline execute data driver. Called by vtkXMLReader.
*/
- int ReadPrimaryElement(vtkXMLDataElement* ePrimary) VTK_OVERRIDE;
+ int ReadPrimaryElement(vtkXMLDataElement* ePrimary) override;
/**
* Setup the piece reader at the given index.
@@ -178,7 +178,7 @@ protected:
*/
int ReadPieceData(int);
- int FillOutputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
+ int FillOutputPortInformation(int, vtkInformation*) override;
/**
* The update request.
diff --git a/IO/XML/vtkXMLTableWriter.h b/IO/XML/vtkXMLTableWriter.h
index 2fd8f741c893bcdafd927c1300eda09fe24cfa44..899bf97e5ea174b971a45b04671e3138a874a55e 100644
--- a/IO/XML/vtkXMLTableWriter.h
+++ b/IO/XML/vtkXMLTableWriter.h
@@ -32,7 +32,7 @@ class VTKIOXML_EXPORT vtkXMLTableWriter : public vtkXMLWriter
{
public:
vtkTypeMacro(vtkXMLTableWriter, vtkXMLWriter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkXMLTableWriter* New();
//@{
@@ -56,22 +56,22 @@ public:
/**
* See the vtkAlgorithm for a desciption of what these do
*/
- int ProcessRequest(vtkInformation*, vtkInformationVector**, vtkInformationVector*) VTK_OVERRIDE;
+ int ProcessRequest(vtkInformation*, vtkInformationVector**, vtkInformationVector*) override;
protected:
vtkXMLTableWriter();
- ~vtkXMLTableWriter() VTK_OVERRIDE;
+ ~vtkXMLTableWriter() override;
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
vtkTable* GetInputAsTable();
const char* GetDataSetName()
- VTK_OVERRIDE; // vtkTable isn't a DataSet but it's used by vtkXMLWriter
+ override; // vtkTable isn't a DataSet but it's used by vtkXMLWriter
/**
* Get the default file extension for files written by this writer.
*/
- const char* GetDefaultFileExtension() VTK_OVERRIDE;
+ const char* GetDefaultFileExtension() override;
void SetInputUpdateExtent(int piece, int numPieces);
diff --git a/IO/XML/vtkXMLUniformGridAMRReader.h b/IO/XML/vtkXMLUniformGridAMRReader.h
index cb27b5f2b8d411e601682b8f724f3cf216ced3df..48f07a39ca408936eb798fece1423e4766991d22 100644
--- a/IO/XML/vtkXMLUniformGridAMRReader.h
+++ b/IO/XML/vtkXMLUniformGridAMRReader.h
@@ -44,7 +44,7 @@ class VTKIOXML_EXPORT vtkXMLUniformGridAMRReader :
public:
static vtkXMLUniformGridAMRReader* New();
vtkTypeMacro(vtkXMLUniformGridAMRReader,vtkXMLCompositeDataReader);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -62,7 +62,7 @@ public:
protected:
vtkXMLUniformGridAMRReader();
- ~vtkXMLUniformGridAMRReader() VTK_OVERRIDE;
+ ~vtkXMLUniformGridAMRReader() override;
/**
* This method is used by CanReadFile() to check if the reader can read an XML
@@ -70,7 +70,7 @@ protected:
* compares the name with the text returned by this->GetDataSetName().
* Overridden to support all AMR types.
*/
- int CanReadFileWithDataType(const char* dsname) VTK_OVERRIDE;
+ int CanReadFileWithDataType(const char* dsname) override;
/**
* Read the top-level element from the file. This is always the
@@ -78,7 +78,7 @@ protected:
* Overridden to read the "type" information specified in the XML. The "type"
* attribute helps us identify the output data type.
*/
- int ReadVTKFile(vtkXMLDataElement* eVTKFile) VTK_OVERRIDE;
+ int ReadVTKFile(vtkXMLDataElement* eVTKFile) override;
/**
* Read the meta-data from the AMR from the file. Note that since
@@ -86,7 +86,7 @@ protected:
* technically not supporting time-varying AMR datasets in this format right
* now.
*/
- int ReadPrimaryElement(vtkXMLDataElement* ePrimary) VTK_OVERRIDE;
+ int ReadPrimaryElement(vtkXMLDataElement* ePrimary) override;
/**
* Overridden to create an output data object based on the type in the file.
@@ -94,26 +94,26 @@ protected:
* check in the file to decide what type to create.
*/
int RequestDataObject(vtkInformation *request,
- vtkInformationVector **inputVector, vtkInformationVector *outputVector) VTK_OVERRIDE;
+ vtkInformationVector **inputVector, vtkInformationVector *outputVector) override;
/**
* Overridden to put vtkOverlappingAMR in the pipeline if
* available/applicable.
*/
int RequestInformation(vtkInformation *request,
- vtkInformationVector **inputVector, vtkInformationVector *outputVector) VTK_OVERRIDE;
+ vtkInformationVector **inputVector, vtkInformationVector *outputVector) override;
// Get the name of the data set being read.
- const char* GetDataSetName() VTK_OVERRIDE;
+ const char* GetDataSetName() override;
// Read the XML element for the subtree of a the composite dataset.
// dataSetIndex is used to rank the leaf nodes in an inorder traversal.
void ReadComposite(vtkXMLDataElement* element,
vtkCompositeDataSet* composite, const char* filePath,
- unsigned int &dataSetIndex) VTK_OVERRIDE;
+ unsigned int &dataSetIndex) override;
// Read the vtkDataSet (a leaf) in the composite dataset.
- vtkDataSet* ReadDataset(vtkXMLDataElement* xmlElem, const char* filePath) VTK_OVERRIDE;
+ vtkDataSet* ReadDataset(vtkXMLDataElement* xmlElem, const char* filePath) override;
vtkSmartPointer<vtkOverlappingAMR> Metadata;
unsigned int MaximumLevelsToReadByDefault;
diff --git a/IO/XML/vtkXMLUniformGridAMRWriter.h b/IO/XML/vtkXMLUniformGridAMRWriter.h
index 286d5b9fd8f40d0556b03bfe8d786a72d759c615..8b4e942bfce6401f08d666ff42f40184c212e90c 100644
--- a/IO/XML/vtkXMLUniformGridAMRWriter.h
+++ b/IO/XML/vtkXMLUniformGridAMRWriter.h
@@ -32,32 +32,32 @@ class VTKIOXML_EXPORT vtkXMLUniformGridAMRWriter : public vtkXMLCompositeDataWri
public:
static vtkXMLUniformGridAMRWriter* New();
vtkTypeMacro(vtkXMLUniformGridAMRWriter, vtkXMLCompositeDataWriter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Get the default file extension for files written by this writer.
*/
- const char* GetDefaultFileExtension() VTK_OVERRIDE
+ const char* GetDefaultFileExtension() override
{ return "vth"; }
protected:
vtkXMLUniformGridAMRWriter();
- ~vtkXMLUniformGridAMRWriter() VTK_OVERRIDE;
+ ~vtkXMLUniformGridAMRWriter() override;
/**
* Methods to define the file's major and minor version numbers.
* VTH/VTHB version number 1.1 is used for overlapping/non-overlapping AMR
* datasets.
*/
- int GetDataSetMajorVersion() VTK_OVERRIDE { return 1; }
- int GetDataSetMinorVersion() VTK_OVERRIDE { return 1; }
+ int GetDataSetMajorVersion() override { return 1; }
+ int GetDataSetMinorVersion() override { return 1; }
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
// Internal method called recursively to create the xml tree for the children
// of compositeData.
int WriteComposite(vtkCompositeDataSet* compositeData,
- vtkXMLDataElement* parent, int &writerIdx) VTK_OVERRIDE;
+ vtkXMLDataElement* parent, int &writerIdx) override;
private:
vtkXMLUniformGridAMRWriter(const vtkXMLUniformGridAMRWriter&) VTK_DELETE_FUNCTION;
diff --git a/IO/XML/vtkXMLUnstructuredDataReader.h b/IO/XML/vtkXMLUnstructuredDataReader.h
index 1fbaa0db3aebab0f6fcd5d0a72650e29b4f11523..6a12479e9fc069fb40defbd62c72d5404cc548df 100644
--- a/IO/XML/vtkXMLUnstructuredDataReader.h
+++ b/IO/XML/vtkXMLUnstructuredDataReader.h
@@ -38,17 +38,17 @@ class VTKIOXML_EXPORT vtkXMLUnstructuredDataReader : public vtkXMLDataReader
{
public:
vtkTypeMacro(vtkXMLUnstructuredDataReader,vtkXMLDataReader);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Get the number of points in the output.
*/
- vtkIdType GetNumberOfPoints() VTK_OVERRIDE;
+ vtkIdType GetNumberOfPoints() override;
/**
* Get the number of cells in the output.
*/
- vtkIdType GetNumberOfCells() VTK_OVERRIDE;
+ vtkIdType GetNumberOfCells() override;
/**
* Get the number of pieces in the file
@@ -65,12 +65,12 @@ public:
// For the specified port, copy the information this reader sets up in
// SetupOutputInformation to outInfo
- void CopyOutputInformation(vtkInformation *outInfo, int port) VTK_OVERRIDE;
+ void CopyOutputInformation(vtkInformation *outInfo, int port) override;
protected:
vtkXMLUnstructuredDataReader();
- ~vtkXMLUnstructuredDataReader() VTK_OVERRIDE;
+ ~vtkXMLUnstructuredDataReader() override;
vtkPointSet* GetOutputAsPointSet();
vtkXMLDataElement* FindDataArrayWithName(vtkXMLDataElement* eParent,
@@ -79,22 +79,22 @@ protected:
vtkUnsignedCharArray* ConvertToUnsignedCharArray(vtkDataArray* a);
// Pipeline execute data driver. Called by vtkXMLReader.
- void ReadXMLData() VTK_OVERRIDE;
+ void ReadXMLData() override;
- void SetupEmptyOutput() VTK_OVERRIDE;
+ void SetupEmptyOutput() override;
virtual void GetOutputUpdateExtent(int& piece, int& numberOfPieces,
int& ghostLevel)=0;
virtual void SetupOutputTotals();
virtual void SetupNextPiece();
- void SetupPieces(int numPieces) VTK_OVERRIDE;
- void DestroyPieces() VTK_OVERRIDE;
+ void SetupPieces(int numPieces) override;
+ void DestroyPieces() override;
// Setup the output's information.
- void SetupOutputInformation(vtkInformation *outInfo) VTK_OVERRIDE;
+ void SetupOutputInformation(vtkInformation *outInfo) override;
- void SetupOutputData() VTK_OVERRIDE;
- int ReadPiece(vtkXMLDataElement* ePiece) VTK_OVERRIDE;
- int ReadPieceData() VTK_OVERRIDE;
+ void SetupOutputData() override;
+ int ReadPiece(vtkXMLDataElement* ePiece) override;
+ int ReadPieceData() override;
int ReadCellArray(vtkIdType numberOfCells, vtkIdType totalNumberOfCells,
vtkXMLDataElement* eCells, vtkCellArray* outCells);
@@ -103,7 +103,7 @@ protected:
vtkIdTypeArray* outFaces, vtkIdTypeArray* outFaceOffsets);
// Read a data array whose tuples coorrespond to points.
- int ReadArrayForPoints(vtkXMLDataElement* da, vtkAbstractArray* outArray) VTK_OVERRIDE;
+ int ReadArrayForPoints(vtkXMLDataElement* da, vtkAbstractArray* outArray) override;
// Get the number of points/cells in the given piece. Valid after
// UpdateInformation.
diff --git a/IO/XML/vtkXMLUnstructuredDataWriter.h b/IO/XML/vtkXMLUnstructuredDataWriter.h
index 38e0be6258693d45c151f6dca801e56779ba38f1..cc60c707d2553b8bc36a88453363a04303f50b2d 100644
--- a/IO/XML/vtkXMLUnstructuredDataWriter.h
+++ b/IO/XML/vtkXMLUnstructuredDataWriter.h
@@ -37,7 +37,7 @@ class VTKIOXML_EXPORT vtkXMLUnstructuredDataWriter : public vtkXMLWriter
{
public:
vtkTypeMacro(vtkXMLUnstructuredDataWriter,vtkXMLWriter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -68,14 +68,14 @@ public:
// See the vtkAlgorithm for a desciption of what these do
int ProcessRequest(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
protected:
vtkXMLUnstructuredDataWriter();
- ~vtkXMLUnstructuredDataWriter() VTK_OVERRIDE;
+ ~vtkXMLUnstructuredDataWriter() override;
vtkPointSet* GetInputAsPointSet();
- const char* GetDataSetName() VTK_OVERRIDE =0;
+ const char* GetDataSetName() override =0;
virtual void SetInputUpdateExtent(int piece, int numPieces,
int ghostLevel);
diff --git a/IO/XML/vtkXMLUnstructuredGridReader.h b/IO/XML/vtkXMLUnstructuredGridReader.h
index 83290b472626c5ee89893deb87ee4b57cf5cce86..0ae69ac22b9eae1640092770d4c8c36b8039708a 100644
--- a/IO/XML/vtkXMLUnstructuredGridReader.h
+++ b/IO/XML/vtkXMLUnstructuredGridReader.h
@@ -39,7 +39,7 @@ class VTKIOXML_EXPORT vtkXMLUnstructuredGridReader : public vtkXMLUnstructuredDa
{
public:
vtkTypeMacro(vtkXMLUnstructuredGridReader,vtkXMLUnstructuredDataReader);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkXMLUnstructuredGridReader *New();
//@{
@@ -52,28 +52,28 @@ public:
protected:
vtkXMLUnstructuredGridReader();
- ~vtkXMLUnstructuredGridReader() VTK_OVERRIDE;
+ ~vtkXMLUnstructuredGridReader() override;
- const char* GetDataSetName() VTK_OVERRIDE;
- void GetOutputUpdateExtent(int& piece, int& numberOfPieces, int& ghostLevel) VTK_OVERRIDE;
- void SetupOutputTotals() VTK_OVERRIDE;
- void SetupPieces(int numPieces) VTK_OVERRIDE;
- void DestroyPieces() VTK_OVERRIDE;
+ const char* GetDataSetName() override;
+ void GetOutputUpdateExtent(int& piece, int& numberOfPieces, int& ghostLevel) override;
+ void SetupOutputTotals() override;
+ void SetupPieces(int numPieces) override;
+ void DestroyPieces() override;
- void SetupOutputData() VTK_OVERRIDE;
- int ReadPiece(vtkXMLDataElement* ePiece) VTK_OVERRIDE;
- void SetupNextPiece() VTK_OVERRIDE;
- int ReadPieceData() VTK_OVERRIDE;
+ void SetupOutputData() override;
+ int ReadPiece(vtkXMLDataElement* ePiece) override;
+ void SetupNextPiece() override;
+ int ReadPieceData() override;
// Read a data array whose tuples correspond to cells.
int ReadArrayForCells(vtkXMLDataElement* da,
- vtkAbstractArray* outArray) VTK_OVERRIDE;
+ vtkAbstractArray* outArray) override;
// Get the number of cells in the given piece. Valid after
// UpdateInformation.
- vtkIdType GetNumberOfCellsInPiece(int piece) VTK_OVERRIDE;
+ vtkIdType GetNumberOfCellsInPiece(int piece) override;
- int FillOutputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
+ int FillOutputPortInformation(int, vtkInformation*) override;
// The index of the cell in the output where the current piece
// begins.
diff --git a/IO/XML/vtkXMLUnstructuredGridWriter.h b/IO/XML/vtkXMLUnstructuredGridWriter.h
index 5ded40d94be92b5daba0d5f8af84dbde6490bb3a..45db2a09238c613f0198b2ebc7188d8e52ea54c9 100644
--- a/IO/XML/vtkXMLUnstructuredGridWriter.h
+++ b/IO/XML/vtkXMLUnstructuredGridWriter.h
@@ -40,7 +40,7 @@ class VTKIOXML_EXPORT vtkXMLUnstructuredGridWriter : public vtkXMLUnstructuredDa
{
public:
vtkTypeMacro(vtkXMLUnstructuredGridWriter,vtkXMLUnstructuredDataWriter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkXMLUnstructuredGridWriter* New();
/**
@@ -51,28 +51,28 @@ public:
/**
* Get the default file extension for files written by this writer.
*/
- const char* GetDefaultFileExtension() VTK_OVERRIDE;
+ const char* GetDefaultFileExtension() override;
protected:
vtkXMLUnstructuredGridWriter();
- ~vtkXMLUnstructuredGridWriter() VTK_OVERRIDE;
+ ~vtkXMLUnstructuredGridWriter() override;
// see algorithm for more info
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
- void AllocatePositionArrays() VTK_OVERRIDE;
- void DeletePositionArrays() VTK_OVERRIDE;
+ void AllocatePositionArrays() override;
+ void DeletePositionArrays() override;
- const char* GetDataSetName() VTK_OVERRIDE;
+ const char* GetDataSetName() override;
- void WriteInlinePieceAttributes() VTK_OVERRIDE;
- void WriteInlinePiece(vtkIndent indent) VTK_OVERRIDE;
+ void WriteInlinePieceAttributes() override;
+ void WriteInlinePiece(vtkIndent indent) override;
- void WriteAppendedPieceAttributes(int index) VTK_OVERRIDE;
- void WriteAppendedPiece(int index, vtkIndent indent) VTK_OVERRIDE;
- void WriteAppendedPieceData(int index) VTK_OVERRIDE;
+ void WriteAppendedPieceAttributes(int index) override;
+ void WriteAppendedPiece(int index, vtkIndent indent) override;
+ void WriteAppendedPieceData(int index) override;
- vtkIdType GetNumberOfInputCells() VTK_OVERRIDE;
+ vtkIdType GetNumberOfInputCells() override;
void CalculateSuperclassFraction(float* fractions);
// Positions of attributes for each piece.
diff --git a/IO/XML/vtkXMLWriter.h b/IO/XML/vtkXMLWriter.h
index 0811798c7703de773cba2179af15ccea51dbd93c..9f628f66b6d87ff409710e11a6d0239170a4eb37 100644
--- a/IO/XML/vtkXMLWriter.h
+++ b/IO/XML/vtkXMLWriter.h
@@ -54,7 +54,7 @@ class VTKIOXML_EXPORT vtkXMLWriter : public vtkAlgorithm
{
public:
vtkTypeMacro(vtkXMLWriter, vtkAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Enumerate big and little endian byte order settings.
@@ -231,7 +231,7 @@ public:
// See the vtkAlgorithm for a description of what these do
int ProcessRequest(vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
//@{
@@ -253,7 +253,7 @@ public:
protected:
vtkXMLWriter();
- ~vtkXMLWriter() VTK_OVERRIDE;
+ ~vtkXMLWriter() override;
virtual int RequestInformation(
vtkInformation* request,
diff --git a/IO/XMLParser/vtkXMLDataHeaderPrivate.h b/IO/XMLParser/vtkXMLDataHeaderPrivate.h
index ac38d72e92d708284f83a570b77c59ed3a27b3d4..73e74756fbab20665851265ffc40955fc1f8b302 100644
--- a/IO/XMLParser/vtkXMLDataHeaderPrivate.h
+++ b/IO/XMLParser/vtkXMLDataHeaderPrivate.h
@@ -46,18 +46,18 @@ class vtkXMLDataHeaderImpl: public vtkXMLDataHeader
std::vector<T> Header;
public:
vtkXMLDataHeaderImpl(size_t n): Header(n, 0) {}
- void Resize(size_t count) VTK_OVERRIDE
+ void Resize(size_t count) override
{ this->Header.resize(count, 0); }
- vtkTypeUInt64 Get(size_t index) const VTK_OVERRIDE
+ vtkTypeUInt64 Get(size_t index) const override
{ return this->Header[index]; }
- bool Set(size_t index, vtkTypeUInt64 value) VTK_OVERRIDE
+ bool Set(size_t index, vtkTypeUInt64 value) override
{
this->Header[index] = T(value);
return vtkTypeUInt64(this->Header[index]) == value;
}
- size_t WordSize() const VTK_OVERRIDE { return sizeof(T); }
- size_t WordCount() const VTK_OVERRIDE { return this->Header.size(); }
- unsigned char* Data() VTK_OVERRIDE
+ size_t WordSize() const override { return sizeof(T); }
+ size_t WordCount() const override { return this->Header.size(); }
+ unsigned char* Data() override
{ return reinterpret_cast<unsigned char*>(&this->Header[0]); }
};
diff --git a/IO/XMLParser/vtkXMLDataParser.h b/IO/XMLParser/vtkXMLDataParser.h
index 31501a2a9405e700f09e6f8e13cd5051a1a006ae..ee5257365343cb2dd377ed98694b9a3bb72aec50 100644
--- a/IO/XMLParser/vtkXMLDataParser.h
+++ b/IO/XMLParser/vtkXMLDataParser.h
@@ -40,7 +40,7 @@ class VTKIOXMLPARSER_EXPORT vtkXMLDataParser : public vtkXMLParser
{
public:
vtkTypeMacro(vtkXMLDataParser,vtkXMLParser);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkXMLDataParser* New();
/**
@@ -111,7 +111,7 @@ public:
* Parse the XML input and check that the file is safe to read.
* Returns 1 for okay, 0 for error.
*/
- int Parse() VTK_OVERRIDE;
+ int Parse() override;
//@{
/**
@@ -150,7 +150,7 @@ public:
* will be stored in each XMLDataElement. VTK XML Readers store the
* information elsewhere, so the default is to ignore it.
*/
- void CharacterDataHandler(const char* data, int length) VTK_OVERRIDE;
+ void CharacterDataHandler(const char* data, int length) override;
/**
* Returns the byte index of where appended data starts (if the
@@ -163,20 +163,20 @@ public:
protected:
vtkXMLDataParser();
- ~vtkXMLDataParser() VTK_OVERRIDE;
+ ~vtkXMLDataParser() override;
// This parser does not support parsing from a string.
- int Parse(const char*) VTK_OVERRIDE;
- int Parse(const char*, unsigned int) VTK_OVERRIDE;
+ int Parse(const char*) override;
+ int Parse(const char*, unsigned int) override;
// Implement parsing methods.
- void StartElement(const char* name, const char** atts) VTK_OVERRIDE;
- void EndElement(const char*) VTK_OVERRIDE;
+ void StartElement(const char* name, const char** atts) override;
+ void EndElement(const char*) override;
- int ParsingComplete() VTK_OVERRIDE;
+ int ParsingComplete() override;
int CheckPrimaryAttributes();
void FindAppendedDataPosition();
- int ParseBuffer(const char* buffer, unsigned int count) VTK_OVERRIDE;
+ int ParseBuffer(const char* buffer, unsigned int count) override;
void AddElement(vtkXMLDataElement* element);
void PushOpenElement(vtkXMLDataElement* element);
diff --git a/IO/XMLParser/vtkXMLParser.h b/IO/XMLParser/vtkXMLParser.h
index 5982c49ee8818ee8d70cf42a336ff250d5a68b06..2b6dce6ae4594e9c6ce39dd399f7866fc4337c97 100644
--- a/IO/XMLParser/vtkXMLParser.h
+++ b/IO/XMLParser/vtkXMLParser.h
@@ -40,7 +40,7 @@ class VTKIOXMLPARSER_EXPORT vtkXMLParser : public vtkObject
{
public:
vtkTypeMacro(vtkXMLParser,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkXMLParser* New();
@@ -123,7 +123,7 @@ public:
protected:
vtkXMLParser();
- ~vtkXMLParser() VTK_OVERRIDE;
+ ~vtkXMLParser() override;
// Input stream. Set by user.
istream* Stream;
diff --git a/IO/XMLParser/vtkXMLUtilities.h b/IO/XMLParser/vtkXMLUtilities.h
index cb9d912da211cc6f1f64ed16616049610cafcabc..a301d333432afa31f3139e3ff16b1d72ea563dc0 100644
--- a/IO/XMLParser/vtkXMLUtilities.h
+++ b/IO/XMLParser/vtkXMLUtilities.h
@@ -137,7 +137,7 @@ public:
protected:
vtkXMLUtilities() {}
- ~vtkXMLUtilities() VTK_OVERRIDE {}
+ ~vtkXMLUtilities() override {}
static int FactorElementsInternal(vtkXMLDataElement *tree,
vtkXMLDataElement *root,
diff --git a/IO/Xdmf2/vtkSILBuilder.h b/IO/Xdmf2/vtkSILBuilder.h
index e144dfeb0f2fe42c56281a5138a9f20c57fbac1a..eef0b7e2abdb3d89b7408127cde14db973bf76a5 100644
--- a/IO/Xdmf2/vtkSILBuilder.h
+++ b/IO/Xdmf2/vtkSILBuilder.h
@@ -39,7 +39,7 @@ class VTKIOXDMF2_EXPORT vtkSILBuilder : public vtkObject
public:
static vtkSILBuilder* New();
vtkTypeMacro(vtkSILBuilder, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -72,7 +72,7 @@ public:
protected:
vtkSILBuilder();
- ~vtkSILBuilder() VTK_OVERRIDE;
+ ~vtkSILBuilder() override;
vtkStringArray* NamesArray;
vtkUnsignedCharArray* CrossEdgesArray;
diff --git a/IO/Xdmf2/vtkXdmfDataArray.h b/IO/Xdmf2/vtkXdmfDataArray.h
index 9a0b6cb54b40f5a83f42caacf5b86f22ae99556f..8ed5dffceaa70be57d7053ed711d66b4e32d14c6 100644
--- a/IO/Xdmf2/vtkXdmfDataArray.h
+++ b/IO/Xdmf2/vtkXdmfDataArray.h
@@ -37,7 +37,7 @@ class VTKIOXDMF2_EXPORT vtkXdmfDataArray : public vtkObject
public:
static vtkXdmfDataArray *New();
vtkTypeMacro(vtkXdmfDataArray,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
vtkDataArray *FromArray( void );
diff --git a/IO/Xdmf2/vtkXdmfReader.cxx b/IO/Xdmf2/vtkXdmfReader.cxx
index da11dfc7598ded2a4d1b8a288be6260e68eb2755..2e9f76096c09103654e2b6296311d19a2f78d9b2 100644
--- a/IO/Xdmf2/vtkXdmfReader.cxx
+++ b/IO/Xdmf2/vtkXdmfReader.cxx
@@ -59,7 +59,7 @@ public:
}
return 0;
}
- void StartElement(const char* name, const char**) VTK_OVERRIDE
+ void StartElement(const char* name, const char**) override
{
this->Done = 1;
if(strcmp(name, "Xdmf") == 0)
@@ -76,13 +76,13 @@ protected:
}
private:
- void ReportStrayAttribute(const char*, const char*, const char*) VTK_OVERRIDE {}
- void ReportMissingAttribute(const char*, const char*) VTK_OVERRIDE {}
- void ReportBadAttribute(const char*, const char*, const char*) VTK_OVERRIDE {}
- void ReportUnknownElement(const char*) VTK_OVERRIDE {}
- void ReportXmlParseError() VTK_OVERRIDE {}
+ void ReportStrayAttribute(const char*, const char*, const char*) override {}
+ void ReportMissingAttribute(const char*, const char*) override {}
+ void ReportBadAttribute(const char*, const char*, const char*) override {}
+ void ReportUnknownElement(const char*) override {}
+ void ReportXmlParseError() override {}
- int ParsingComplete() VTK_OVERRIDE { return this->Done; }
+ int ParsingComplete() override { return this->Done; }
int Valid;
int Done;
vtkXdmfReaderTester(const vtkXdmfReaderTester&) VTK_DELETE_FUNCTION;
diff --git a/IO/Xdmf2/vtkXdmfReader.h b/IO/Xdmf2/vtkXdmfReader.h
index 8d1d04e52bfb3c118cf851d773754668150b6a7c..5daa6cd2d0b1cfb3ca427d139863169ea8649a1c 100644
--- a/IO/Xdmf2/vtkXdmfReader.h
+++ b/IO/Xdmf2/vtkXdmfReader.h
@@ -47,7 +47,7 @@ class VTKIOXDMF2_EXPORT vtkXdmfReader : public vtkDataReader
public:
static vtkXdmfReader* New();
vtkTypeMacro(vtkXdmfReader, vtkDataReader);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
// Until needed, multiple domains are not supported.
//// Description:
@@ -185,17 +185,17 @@ public:
protected:
vtkXdmfReader();
- ~vtkXdmfReader() VTK_OVERRIDE;
+ ~vtkXdmfReader() override;
int ProcessRequest(vtkInformation *request,
vtkInformationVector **inputVector,
- vtkInformationVector *outputVector) VTK_OVERRIDE;
+ vtkInformationVector *outputVector) override;
virtual int RequestDataObject(vtkInformationVector *outputVector);
int RequestData(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
int RequestInformation(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
- int FillOutputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ vtkInformationVector *) override;
+ int FillOutputPortInformation(int port, vtkInformation *info) override;
vtkXdmfArraySelection* GetPointArraySelection();
vtkXdmfArraySelection* GetCellArraySelection();
diff --git a/IO/Xdmf2/vtkXdmfWriter.h b/IO/Xdmf2/vtkXdmfWriter.h
index 5e4aa869f1d7811e2d98a22e9e09e4c51d5beb4f..deca1cf99d5fce50265afa963b8e61c49150b7d2 100644
--- a/IO/Xdmf2/vtkXdmfWriter.h
+++ b/IO/Xdmf2/vtkXdmfWriter.h
@@ -59,7 +59,7 @@ class VTKIOXDMF2_EXPORT vtkXdmfWriter : public vtkDataObjectAlgorithm
public:
static vtkXdmfWriter *New();
vtkTypeMacro(vtkXdmfWriter,vtkDataObjectAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Set the input data set.
@@ -149,26 +149,26 @@ public:
protected:
vtkXdmfWriter();
- ~vtkXdmfWriter() VTK_OVERRIDE;
+ ~vtkXdmfWriter() override;
//Choose composite executive by default for time.
- vtkExecutive* CreateDefaultExecutive() VTK_OVERRIDE;
+ vtkExecutive* CreateDefaultExecutive() override;
//Can take any one data object
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
//Overridden to ...
int RequestInformation(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
//Overridden to ...
int RequestUpdateExtent(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
//Overridden to ...
int RequestData(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
//These do the work: recursively parse down input's structure all the way to arrays,
//use XDMF lib to dump everything to file.
diff --git a/IO/Xdmf3/vtkXdmf3Reader.h b/IO/Xdmf3/vtkXdmf3Reader.h
index 0aa4a41e53595413632f1f81f6253761e4683a99..b9aebdc3d6ee83ed87625e57e7c52947074fdc40 100644
--- a/IO/Xdmf3/vtkXdmf3Reader.h
+++ b/IO/Xdmf3/vtkXdmf3Reader.h
@@ -40,12 +40,12 @@ class VTKIOXDMF3_EXPORT vtkXdmf3Reader : public vtkDataReader
public:
static vtkXdmf3Reader* New();
vtkTypeMacro(vtkXdmf3Reader, vtkDataReader);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Set tells the reader the name of a single top level xml file to read.
*/
- void SetFileName(const char* filename) VTK_OVERRIDE;
+ void SetFileName(const char* filename) override;
//@{
/**
@@ -167,11 +167,11 @@ protected:
~vtkXdmf3Reader();
//Overridden to announce that we make general DataObjects.
- int FillOutputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int FillOutputPortInformation(int port, vtkInformation *info) override;
//Overridden to handle RDO requests the way we need to
int ProcessRequest(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
//Overridden to create the correct vtkDataObject subclass for the file.
virtual int RequestDataObject(
@@ -180,11 +180,11 @@ protected:
//Overridden to announce temporal information and to participate in
//structured extent splitting.
virtual int RequestInformation(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
//Read the XDMF and HDF input files and fill in vtk data objects.
virtual int RequestData(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
vtkXdmf3ArraySelection* GetFieldArraySelection();
vtkXdmf3ArraySelection* GetCellArraySelection();
diff --git a/IO/Xdmf3/vtkXdmf3Writer.h b/IO/Xdmf3/vtkXdmf3Writer.h
index 28651b404341e6210c585a686699b7d007c9513d..c83ec36fafce214a7ca32fe0aa5f451d8d57ed40 100644
--- a/IO/Xdmf3/vtkXdmf3Writer.h
+++ b/IO/Xdmf3/vtkXdmf3Writer.h
@@ -37,7 +37,7 @@ class VTKIOXDMF3_EXPORT vtkXdmf3Writer : public vtkDataObjectAlgorithm
public:
static vtkXdmf3Writer *New();
vtkTypeMacro(vtkXdmf3Writer,vtkDataObjectAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Set the input data set.
@@ -95,15 +95,15 @@ protected:
//Overridden to set up automatic loop over time steps.
int RequestInformation(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
//Overridden to continue automatic loop over time steps.
int RequestUpdateExtent(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
//Write out the input data objects as XDMF and HDF output files.
int RequestData(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
char *FileName;
unsigned int LightDataLimit;
diff --git a/Imaging/Color/vtkImageHSIToRGB.h b/Imaging/Color/vtkImageHSIToRGB.h
index 21e37f9e5f836c1fbf5f48c4d380eae4686ad7a2..8f9030fcc492c0a554a0d1469213a51ed224d4ce 100644
--- a/Imaging/Color/vtkImageHSIToRGB.h
+++ b/Imaging/Color/vtkImageHSIToRGB.h
@@ -36,7 +36,7 @@ public:
static vtkImageHSIToRGB *New();
vtkTypeMacro(vtkImageHSIToRGB,vtkThreadedImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -51,12 +51,12 @@ public:
protected:
vtkImageHSIToRGB();
- ~vtkImageHSIToRGB() VTK_OVERRIDE {}
+ ~vtkImageHSIToRGB() override {}
double Maximum;
void ThreadedExecute (vtkImageData *inData, vtkImageData *outData,
- int ext[6], int id) VTK_OVERRIDE;
+ int ext[6], int id) override;
private:
vtkImageHSIToRGB(const vtkImageHSIToRGB&) VTK_DELETE_FUNCTION;
void operator=(const vtkImageHSIToRGB&) VTK_DELETE_FUNCTION;
diff --git a/Imaging/Color/vtkImageHSVToRGB.h b/Imaging/Color/vtkImageHSVToRGB.h
index 874b914349e1e9ce9681d21a55d0166c3e5d03e3..bd8bab3546a266d52aef939a28ab00b50fad7bad 100644
--- a/Imaging/Color/vtkImageHSVToRGB.h
+++ b/Imaging/Color/vtkImageHSVToRGB.h
@@ -37,7 +37,7 @@ public:
static vtkImageHSVToRGB *New();
vtkTypeMacro(vtkImageHSVToRGB,vtkThreadedImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -52,12 +52,12 @@ public:
protected:
vtkImageHSVToRGB();
- ~vtkImageHSVToRGB() VTK_OVERRIDE {}
+ ~vtkImageHSVToRGB() override {}
double Maximum;
void ThreadedExecute (vtkImageData *inData, vtkImageData *outData,
- int ext[6], int id) VTK_OVERRIDE;
+ int ext[6], int id) override;
private:
vtkImageHSVToRGB(const vtkImageHSVToRGB&) VTK_DELETE_FUNCTION;
void operator=(const vtkImageHSVToRGB&) VTK_DELETE_FUNCTION;
diff --git a/Imaging/Color/vtkImageLuminance.h b/Imaging/Color/vtkImageLuminance.h
index ff11bed689e3e1b2911b43faf49e3372cf0521cb..e97a4bf3ad1ff91f367c16de3e11c4986b8d0198 100644
--- a/Imaging/Color/vtkImageLuminance.h
+++ b/Imaging/Color/vtkImageLuminance.h
@@ -34,13 +34,13 @@ public:
protected:
vtkImageLuminance();
- ~vtkImageLuminance() VTK_OVERRIDE {}
+ ~vtkImageLuminance() override {}
int RequestInformation (vtkInformation *, vtkInformationVector**,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
void ThreadedExecute (vtkImageData *inData, vtkImageData *outData,
- int outExt[6], int id) VTK_OVERRIDE;
+ int outExt[6], int id) override;
private:
vtkImageLuminance(const vtkImageLuminance&) VTK_DELETE_FUNCTION;
diff --git a/Imaging/Color/vtkImageMapToRGBA.h b/Imaging/Color/vtkImageMapToRGBA.h
index 00f65490458cc100a4f14bd6a2ae6e958289350b..ae67428991631bb05e75d1866ce09c67a698282e 100644
--- a/Imaging/Color/vtkImageMapToRGBA.h
+++ b/Imaging/Color/vtkImageMapToRGBA.h
@@ -38,7 +38,7 @@ public:
protected:
vtkImageMapToRGBA() {}
- ~vtkImageMapToRGBA() VTK_OVERRIDE {}
+ ~vtkImageMapToRGBA() override {}
private:
vtkImageMapToRGBA(const vtkImageMapToRGBA&) VTK_DELETE_FUNCTION;
void operator=(const vtkImageMapToRGBA&) VTK_DELETE_FUNCTION;
diff --git a/Imaging/Color/vtkImageMapToWindowLevelColors.h b/Imaging/Color/vtkImageMapToWindowLevelColors.h
index 5de8d952b1bdb9e06dc2d8a8904027ac118a9b18..8b873e5e4128e8a091887f4fe3d24585dc6a2164 100644
--- a/Imaging/Color/vtkImageMapToWindowLevelColors.h
+++ b/Imaging/Color/vtkImageMapToWindowLevelColors.h
@@ -40,7 +40,7 @@ class VTKIMAGINGCOLOR_EXPORT vtkImageMapToWindowLevelColors : public vtkImageMap
public:
static vtkImageMapToWindowLevelColors *New();
vtkTypeMacro(vtkImageMapToWindowLevelColors,vtkImageMapToColors);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -64,17 +64,17 @@ public:
protected:
vtkImageMapToWindowLevelColors();
- ~vtkImageMapToWindowLevelColors() VTK_OVERRIDE;
+ ~vtkImageMapToWindowLevelColors() override;
- int RequestInformation (vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestInformation (vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
void ThreadedRequestData(vtkInformation *request,
vtkInformationVector **inputVector,
vtkInformationVector *outputVector,
vtkImageData ***inData, vtkImageData **outData,
- int extent[6], int id) VTK_OVERRIDE;
+ int extent[6], int id) override;
int RequestData(vtkInformation *request,
vtkInformationVector **inputVector,
- vtkInformationVector *outputVector) VTK_OVERRIDE;
+ vtkInformationVector *outputVector) override;
double Window;
double Level;
diff --git a/Imaging/Color/vtkImageQuantizeRGBToIndex.h b/Imaging/Color/vtkImageQuantizeRGBToIndex.h
index 0974fee812be575e81c7b077a52524b9e25d484f..f28bac89b62aac201afee7583f0e2596074faced 100644
--- a/Imaging/Color/vtkImageQuantizeRGBToIndex.h
+++ b/Imaging/Color/vtkImageQuantizeRGBToIndex.h
@@ -41,7 +41,7 @@ class VTKIMAGINGCOLOR_EXPORT vtkImageQuantizeRGBToIndex : public vtkImageAlgorit
public:
static vtkImageQuantizeRGBToIndex *New();
vtkTypeMacro(vtkImageQuantizeRGBToIndex,vtkImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -82,7 +82,7 @@ public:
protected:
vtkImageQuantizeRGBToIndex();
- ~vtkImageQuantizeRGBToIndex() VTK_OVERRIDE;
+ ~vtkImageQuantizeRGBToIndex() override;
vtkLookupTable *LookupTable;
int NumberOfColors;
@@ -92,12 +92,12 @@ protected:
double BuildTreeExecuteTime;
double LookupIndexExecuteTime;
- int RequestInformation (vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int RequestUpdateExtent (vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestInformation (vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int RequestUpdateExtent (vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
int RequestData(vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
private:
vtkImageQuantizeRGBToIndex(const vtkImageQuantizeRGBToIndex&) VTK_DELETE_FUNCTION;
diff --git a/Imaging/Color/vtkImageRGBToHSI.h b/Imaging/Color/vtkImageRGBToHSI.h
index 9820f728aef1f3a1f3672caa426d99c20c86225a..0fc156f0ef61681afa8f4452dc8c6fc02bd56eaf 100644
--- a/Imaging/Color/vtkImageRGBToHSI.h
+++ b/Imaging/Color/vtkImageRGBToHSI.h
@@ -32,7 +32,7 @@ class VTKIMAGINGCOLOR_EXPORT vtkImageRGBToHSI : public vtkThreadedImageAlgorithm
public:
static vtkImageRGBToHSI *New();
vtkTypeMacro(vtkImageRGBToHSI,vtkThreadedImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -46,12 +46,12 @@ public:
protected:
vtkImageRGBToHSI();
- ~vtkImageRGBToHSI() VTK_OVERRIDE {}
+ ~vtkImageRGBToHSI() override {}
double Maximum;
void ThreadedExecute (vtkImageData *inData, vtkImageData *outData,
- int ext[6], int id) VTK_OVERRIDE;
+ int ext[6], int id) override;
private:
vtkImageRGBToHSI(const vtkImageRGBToHSI&) VTK_DELETE_FUNCTION;
diff --git a/Imaging/Color/vtkImageRGBToHSV.h b/Imaging/Color/vtkImageRGBToHSV.h
index 71e3b3dd36f3fadb818f9684c9587962c76408e5..6cb99a967f671effbd0bc765a3c9a51121820c16 100644
--- a/Imaging/Color/vtkImageRGBToHSV.h
+++ b/Imaging/Color/vtkImageRGBToHSV.h
@@ -33,7 +33,7 @@ class VTKIMAGINGCOLOR_EXPORT vtkImageRGBToHSV : public vtkThreadedImageAlgorithm
public:
static vtkImageRGBToHSV *New();
vtkTypeMacro(vtkImageRGBToHSV,vtkThreadedImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
// Hue is an angle. Maximum specifies when it maps back to 0. HueMaximum
@@ -44,12 +44,12 @@ public:
protected:
vtkImageRGBToHSV();
- ~vtkImageRGBToHSV() VTK_OVERRIDE {}
+ ~vtkImageRGBToHSV() override {}
double Maximum;
void ThreadedExecute (vtkImageData *inData, vtkImageData *outData,
- int ext[6], int id) VTK_OVERRIDE;
+ int ext[6], int id) override;
private:
vtkImageRGBToHSV(const vtkImageRGBToHSV&) VTK_DELETE_FUNCTION;
void operator=(const vtkImageRGBToHSV&) VTK_DELETE_FUNCTION;
diff --git a/Imaging/Color/vtkImageRGBToYIQ.h b/Imaging/Color/vtkImageRGBToYIQ.h
index 523cba849b428b01a58a04a72643c40bd7156758..b10d1e640e7e1d4043f3e4f4e69d9787e567f972 100644
--- a/Imaging/Color/vtkImageRGBToYIQ.h
+++ b/Imaging/Color/vtkImageRGBToYIQ.h
@@ -33,19 +33,19 @@ class VTKIMAGINGCOLOR_EXPORT vtkImageRGBToYIQ : public vtkThreadedImageAlgorithm
public:
static vtkImageRGBToYIQ *New();
vtkTypeMacro(vtkImageRGBToYIQ,vtkThreadedImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
vtkSetMacro(Maximum,double);
vtkGetMacro(Maximum,double);
protected:
vtkImageRGBToYIQ();
- ~vtkImageRGBToYIQ() VTK_OVERRIDE {}
+ ~vtkImageRGBToYIQ() override {}
double Maximum; // Maximum value of pixel intensity allowed
void ThreadedExecute (vtkImageData *inData, vtkImageData *outData,
- int ext[6], int id) VTK_OVERRIDE;
+ int ext[6], int id) override;
private:
vtkImageRGBToYIQ(const vtkImageRGBToYIQ&) VTK_DELETE_FUNCTION;
void operator=(const vtkImageRGBToYIQ&) VTK_DELETE_FUNCTION;
diff --git a/Imaging/Color/vtkImageYIQToRGB.h b/Imaging/Color/vtkImageYIQToRGB.h
index a909533321c16260f09a7c867bcaa19671444b93..40263ff3b4890dc1d5023710a2de605f41cd5587 100644
--- a/Imaging/Color/vtkImageYIQToRGB.h
+++ b/Imaging/Color/vtkImageYIQToRGB.h
@@ -33,19 +33,19 @@ class VTKIMAGINGCOLOR_EXPORT vtkImageYIQToRGB : public vtkThreadedImageAlgorithm
public:
static vtkImageYIQToRGB *New();
vtkTypeMacro(vtkImageYIQToRGB,vtkThreadedImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
vtkSetMacro(Maximum,double);
vtkGetMacro(Maximum,double);
protected:
vtkImageYIQToRGB();
- ~vtkImageYIQToRGB() VTK_OVERRIDE {}
+ ~vtkImageYIQToRGB() override {}
double Maximum; // Maximum value of pixel intensity allowed
void ThreadedExecute (vtkImageData *inData, vtkImageData *outData,
- int ext[6], int id) VTK_OVERRIDE;
+ int ext[6], int id) override;
private:
vtkImageYIQToRGB(const vtkImageYIQToRGB&) VTK_DELETE_FUNCTION;
void operator=(const vtkImageYIQToRGB&) VTK_DELETE_FUNCTION;
diff --git a/Imaging/Core/vtkAbstractImageInterpolator.h b/Imaging/Core/vtkAbstractImageInterpolator.h
index 26ab776f753d2f1322e0a2b2c56968e55307be8d..b2013b16804271592a9b72a9a9dfd4b721895435 100644
--- a/Imaging/Core/vtkAbstractImageInterpolator.h
+++ b/Imaging/Core/vtkAbstractImageInterpolator.h
@@ -47,7 +47,7 @@ class VTKIMAGINGCORE_EXPORT vtkAbstractImageInterpolator : public vtkObject
{
public:
vtkTypeMacro(vtkAbstractImageInterpolator, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Initialize the interpolator with the data that you wish to interpolate.
@@ -262,7 +262,7 @@ public:
protected:
vtkAbstractImageInterpolator();
- ~vtkAbstractImageInterpolator() VTK_OVERRIDE;
+ ~vtkAbstractImageInterpolator() override;
/**
* Subclass-specific updates.
diff --git a/Imaging/Core/vtkExtractVOI.h b/Imaging/Core/vtkExtractVOI.h
index 0c418d37264c284ea177bb973cd7ae6c1e7da4cd..fc5e3d81064c4fd4d6a977b92ba0b459bce7e6b4 100644
--- a/Imaging/Core/vtkExtractVOI.h
+++ b/Imaging/Core/vtkExtractVOI.h
@@ -49,7 +49,7 @@ class VTKIMAGINGCORE_EXPORT vtkExtractVOI : public vtkImageAlgorithm
{
public:
vtkTypeMacro(vtkExtractVOI,vtkImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct object to extract all of the input data.
@@ -93,17 +93,17 @@ public:
protected:
vtkExtractVOI();
- ~vtkExtractVOI() VTK_OVERRIDE;
+ ~vtkExtractVOI() override;
int RequestUpdateExtent(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
int RequestInformation (vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
int RequestData(vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
/**
* Implementation for RequestData using a specified VOI. This is because the
diff --git a/Imaging/Core/vtkImageAppendComponents.h b/Imaging/Core/vtkImageAppendComponents.h
index dac14420b628655da262deeb55add66194d53dd0..ced51fcb0d6255bcfa5f7b4a910f96f5810eaa71 100644
--- a/Imaging/Core/vtkImageAppendComponents.h
+++ b/Imaging/Core/vtkImageAppendComponents.h
@@ -73,19 +73,19 @@ public:
protected:
vtkImageAppendComponents() {}
- ~vtkImageAppendComponents() VTK_OVERRIDE {}
+ ~vtkImageAppendComponents() override {}
int RequestInformation (vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
void ThreadedRequestData (vtkInformation* request,
vtkInformationVector** inputVector,
vtkInformationVector* outputVector,
vtkImageData ***inData, vtkImageData **outData,
- int ext[6], int id) VTK_OVERRIDE;
+ int ext[6], int id) override;
// Implement methods required by vtkAlgorithm.
- int FillInputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
+ int FillInputPortInformation(int, vtkInformation*) override;
private:
vtkImageAppendComponents(const vtkImageAppendComponents&) VTK_DELETE_FUNCTION;
diff --git a/Imaging/Core/vtkImageBSplineCoefficients.h b/Imaging/Core/vtkImageBSplineCoefficients.h
index 25c1aa171fe2968fd0beec7d4a0ce1f90ffc55ab..d8bc91fed0509c35c1efa3fac7dadd91137b0735 100644
--- a/Imaging/Core/vtkImageBSplineCoefficients.h
+++ b/Imaging/Core/vtkImageBSplineCoefficients.h
@@ -57,7 +57,7 @@ public:
static vtkImageBSplineCoefficients *New();
vtkTypeMacro(vtkImageBSplineCoefficients,vtkThreadedImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -141,22 +141,22 @@ public:
protected:
vtkImageBSplineCoefficients();
- ~vtkImageBSplineCoefficients() VTK_OVERRIDE;
+ ~vtkImageBSplineCoefficients() override;
void AllocateOutputData(
- vtkImageData *out, vtkInformation *outInfo, int *uExtent) VTK_OVERRIDE;
+ vtkImageData *out, vtkInformation *outInfo, int *uExtent) override;
vtkImageData *AllocateOutputData(
- vtkDataObject *out, vtkInformation* outInfo) VTK_OVERRIDE;
+ vtkDataObject *out, vtkInformation* outInfo) override;
int RequestData(
- vtkInformation*, vtkInformationVector**, vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformation*, vtkInformationVector**, vtkInformationVector*) override;
int RequestInformation(
- vtkInformation*, vtkInformationVector**, vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformation*, vtkInformationVector**, vtkInformationVector*) override;
int RequestUpdateExtent(
- vtkInformation*, vtkInformationVector**, vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformation*, vtkInformationVector**, vtkInformationVector*) override;
void ThreadedExecute(vtkImageData *inData, vtkImageData *outData,
- int outExt[6], int threadId) VTK_OVERRIDE;
+ int outExt[6], int threadId) override;
int SplineDegree;
int BorderMode;
diff --git a/Imaging/Core/vtkImageBSplineInterpolator.h b/Imaging/Core/vtkImageBSplineInterpolator.h
index 40bd14a9104d7310e6842c42f4a15b603c22c70d..5405e5ae7bca2680b0ab556465166fd345b83f0a 100644
--- a/Imaging/Core/vtkImageBSplineInterpolator.h
+++ b/Imaging/Core/vtkImageBSplineInterpolator.h
@@ -51,7 +51,7 @@ class VTKIMAGINGCORE_EXPORT vtkImageBSplineInterpolator :
public:
static vtkImageBSplineInterpolator *New();
vtkTypeMacro(vtkImageBSplineInterpolator, vtkAbstractImageInterpolator);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -71,13 +71,13 @@ public:
* structured coordinate transformation between the output and the input.
* Otherwise, pass nullptr as the matrix to retrieve the full kernel size.
*/
- void ComputeSupportSize(const double matrix[16], int support[3]) VTK_OVERRIDE;
+ void ComputeSupportSize(const double matrix[16], int support[3]) override;
/**
* Returns true if the interpolator supports weight precomputation.
* This will always return true for this interpolator.
*/
- bool IsSeparable() VTK_OVERRIDE;
+ bool IsSeparable() override;
//@{
/**
@@ -92,30 +92,30 @@ public:
*/
void PrecomputeWeightsForExtent(
const double matrix[16], const int extent[6], int newExtent[6],
- vtkInterpolationWeights *&weights) VTK_OVERRIDE;
+ vtkInterpolationWeights *&weights) override;
void PrecomputeWeightsForExtent(
const float matrix[16], const int extent[6], int newExtent[6],
- vtkInterpolationWeights *&weights) VTK_OVERRIDE;
+ vtkInterpolationWeights *&weights) override;
//@}
/**
* Free the precomputed weights. THIS METHOD IS THREAD SAFE.
*/
- void FreePrecomputedWeights(vtkInterpolationWeights *&weights) VTK_OVERRIDE;
+ void FreePrecomputedWeights(vtkInterpolationWeights *&weights) override;
protected:
vtkImageBSplineInterpolator();
- ~vtkImageBSplineInterpolator() VTK_OVERRIDE;
+ ~vtkImageBSplineInterpolator() override;
/**
* Update the interpolator.
*/
- void InternalUpdate() VTK_OVERRIDE;
+ void InternalUpdate() override;
/**
* Copy the interpolator.
*/
- void InternalDeepCopy(vtkAbstractImageInterpolator *obj) VTK_OVERRIDE;
+ void InternalDeepCopy(vtkAbstractImageInterpolator *obj) override;
//@{
/**
@@ -123,10 +123,10 @@ protected:
*/
void GetInterpolationFunc(
void (**doublefunc)(
- vtkInterpolationInfo *, const double [3], double *)) VTK_OVERRIDE;
+ vtkInterpolationInfo *, const double [3], double *)) override;
void GetInterpolationFunc(
void (**floatfunc)(
- vtkInterpolationInfo *, const float [3], float *)) VTK_OVERRIDE;
+ vtkInterpolationInfo *, const float [3], float *)) override;
//@}
//@{
@@ -135,10 +135,10 @@ protected:
*/
void GetRowInterpolationFunc(
void (**doublefunc)(
- vtkInterpolationWeights *, int, int, int, double *, int)) VTK_OVERRIDE;
+ vtkInterpolationWeights *, int, int, int, double *, int)) override;
void GetRowInterpolationFunc(
void (**floatfunc)(
- vtkInterpolationWeights *, int, int, int, float *, int)) VTK_OVERRIDE;
+ vtkInterpolationWeights *, int, int, int, float *, int)) override;
//@}
/**
diff --git a/Imaging/Core/vtkImageBlend.h b/Imaging/Core/vtkImageBlend.h
index 96c490fa4f552a74d0d95a7a5859b1340183f61b..88e25f78e8a1134025828c99ed74e3c5dbcdfd40 100644
--- a/Imaging/Core/vtkImageBlend.h
+++ b/Imaging/Core/vtkImageBlend.h
@@ -88,7 +88,7 @@ class VTKIMAGINGCORE_EXPORT vtkImageBlend : public vtkThreadedImageAlgorithm
public:
static vtkImageBlend *New();
vtkTypeMacro(vtkImageBlend,vtkThreadedImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Replace one of the input connections with a new input. You can
@@ -174,11 +174,11 @@ public:
protected:
vtkImageBlend();
- ~vtkImageBlend() VTK_OVERRIDE;
+ ~vtkImageBlend() override;
int RequestUpdateExtent(vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
void InternalComputeInputUpdateExtent(int inExt[6], int outExt[6],
int inWExtent[6]);
@@ -187,15 +187,15 @@ protected:
vtkInformationVector** inputVector,
vtkInformationVector* outputVector,
vtkImageData ***inData, vtkImageData **outData,
- int ext[6], int id) VTK_OVERRIDE;
+ int ext[6], int id) override;
// see vtkAlgorithm for docs.
- int FillInputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
+ int FillInputPortInformation(int, vtkInformation*) override;
// see vtkAlgorithm for docs.
int RequestData(vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
double *Opacity;
int OpacityArrayLength;
diff --git a/Imaging/Core/vtkImageCacheFilter.h b/Imaging/Core/vtkImageCacheFilter.h
index c1c150b0dd955376b81b2045953ce1ed8a3da370..eab0a6f2600fb77feb66bdb28ee3555f7aa50e4f 100644
--- a/Imaging/Core/vtkImageCacheFilter.h
+++ b/Imaging/Core/vtkImageCacheFilter.h
@@ -36,7 +36,7 @@ class VTKIMAGINGCORE_EXPORT vtkImageCacheFilter : public vtkImageAlgorithm
public:
static vtkImageCacheFilter *New();
vtkTypeMacro(vtkImageCacheFilter,vtkImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -49,11 +49,11 @@ public:
protected:
vtkImageCacheFilter();
- ~vtkImageCacheFilter() VTK_OVERRIDE;
+ ~vtkImageCacheFilter() override;
// Create a default executive.
- vtkExecutive* CreateDefaultExecutive() VTK_OVERRIDE;
- void ExecuteData(vtkDataObject *) VTK_OVERRIDE;
+ vtkExecutive* CreateDefaultExecutive() override;
+ void ExecuteData(vtkDataObject *) override;
private:
vtkImageCacheFilter(const vtkImageCacheFilter&) VTK_DELETE_FUNCTION;
diff --git a/Imaging/Core/vtkImageCast.h b/Imaging/Core/vtkImageCast.h
index e81216270cc04ce5db4a84db06468e9a8cefc3c0..ea9398c5372c67656de38f828e0072f5cdf93ddf 100644
--- a/Imaging/Core/vtkImageCast.h
+++ b/Imaging/Core/vtkImageCast.h
@@ -42,7 +42,7 @@ class VTKIMAGINGCORE_EXPORT vtkImageCast : public vtkThreadedImageAlgorithm
public:
static vtkImageCast *New();
vtkTypeMacro(vtkImageCast,vtkThreadedImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -84,14 +84,14 @@ public:
protected:
vtkImageCast();
- ~vtkImageCast()VTK_OVERRIDE {}
+ ~vtkImageCast() override {}
int ClampOverflow;
int OutputScalarType;
- int RequestInformation (vtkInformation *, vtkInformationVector**, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestInformation (vtkInformation *, vtkInformationVector**, vtkInformationVector *) override;
void ThreadedExecute (vtkImageData *inData, vtkImageData *outData,
- int ext[6], int id) VTK_OVERRIDE;
+ int ext[6], int id) override;
private:
vtkImageCast(const vtkImageCast&) VTK_DELETE_FUNCTION;
diff --git a/Imaging/Core/vtkImageChangeInformation.h b/Imaging/Core/vtkImageChangeInformation.h
index 33ab6006f62559b3aa2316713b485b37ba76d3d5..e1bb70fc3c2cbb5c21c3341d6a9ca04e83eb1df2 100644
--- a/Imaging/Core/vtkImageChangeInformation.h
+++ b/Imaging/Core/vtkImageChangeInformation.h
@@ -34,7 +34,7 @@ class VTKIMAGINGCORE_EXPORT vtkImageChangeInformation : public vtkImageAlgorithm
public:
static vtkImageChangeInformation *New();
vtkTypeMacro(vtkImageChangeInformation, vtkImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -124,7 +124,7 @@ public:
protected:
vtkImageChangeInformation();
- ~vtkImageChangeInformation() VTK_OVERRIDE;
+ ~vtkImageChangeInformation() override;
int CenterImage;
@@ -141,16 +141,16 @@ protected:
int RequestUpdateExtent (vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
int RequestInformation (vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
int RequestData(vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
private:
vtkImageChangeInformation(const vtkImageChangeInformation&) VTK_DELETE_FUNCTION;
diff --git a/Imaging/Core/vtkImageClip.h b/Imaging/Core/vtkImageClip.h
index d3a7e7ce0013e361bf3ab9e893b4d8ca22f4433b..101b60e7702a3f4aca852043ec8962917961494c 100644
--- a/Imaging/Core/vtkImageClip.h
+++ b/Imaging/Core/vtkImageClip.h
@@ -39,7 +39,7 @@ class VTKIMAGINGCORE_EXPORT vtkImageClip : public vtkImageAlgorithm
public:
static vtkImageClip *New();
vtkTypeMacro(vtkImageClip,vtkImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -67,7 +67,7 @@ public:
protected:
vtkImageClip();
- ~vtkImageClip() VTK_OVERRIDE {}
+ ~vtkImageClip() override {}
// Time when OutputImageExtent was computed.
vtkTimeStamp CTime;
@@ -78,13 +78,13 @@ protected:
int RequestInformation (vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
void CopyData(vtkImageData *inData, vtkImageData *outData, int *ext);
int RequestData(vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
private:
vtkImageClip(const vtkImageClip&) VTK_DELETE_FUNCTION;
diff --git a/Imaging/Core/vtkImageConstantPad.h b/Imaging/Core/vtkImageConstantPad.h
index 1a40329a1f4832c6d00ba22e408186ffd816f0cb..b8fea9e80f45f8e3be7e622c491500d9c0292822 100644
--- a/Imaging/Core/vtkImageConstantPad.h
+++ b/Imaging/Core/vtkImageConstantPad.h
@@ -37,7 +37,7 @@ public:
static vtkImageConstantPad *New();
vtkTypeMacro(vtkImageConstantPad,vtkImagePadFilter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -50,7 +50,7 @@ public:
protected:
vtkImageConstantPad();
- ~vtkImageConstantPad() VTK_OVERRIDE {}
+ ~vtkImageConstantPad() override {}
double Constant;
@@ -58,7 +58,7 @@ protected:
vtkInformationVector** inputVector,
vtkInformationVector* outputVector,
vtkImageData ***inData, vtkImageData **outData,
- int ext[6], int id) VTK_OVERRIDE;
+ int ext[6], int id) override;
private:
vtkImageConstantPad(const vtkImageConstantPad&) VTK_DELETE_FUNCTION;
void operator=(const vtkImageConstantPad&) VTK_DELETE_FUNCTION;
diff --git a/Imaging/Core/vtkImageDataStreamer.h b/Imaging/Core/vtkImageDataStreamer.h
index 325411fd792523fde395d1b534207f90c19ab5e1..3e048fddbad552a87ddf4d886ec2a5e11722581f 100644
--- a/Imaging/Core/vtkImageDataStreamer.h
+++ b/Imaging/Core/vtkImageDataStreamer.h
@@ -34,7 +34,7 @@ class VTKIMAGINGCORE_EXPORT vtkImageDataStreamer : public vtkImageAlgorithm
public:
static vtkImageDataStreamer *New();
vtkTypeMacro(vtkImageDataStreamer,vtkImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -57,11 +57,11 @@ public:
// See the vtkAlgorithm for a desciption of what these do
int ProcessRequest(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
protected:
vtkImageDataStreamer();
- ~vtkImageDataStreamer() VTK_OVERRIDE;
+ ~vtkImageDataStreamer() override;
vtkExtentTranslator *ExtentTranslator;
int NumberOfStreamDivisions;
diff --git a/Imaging/Core/vtkImageDecomposeFilter.h b/Imaging/Core/vtkImageDecomposeFilter.h
index 2f65a91a67e81797f97541ab2a3777c8dd91e0d2..ae5743c03fe9707b62703f53f4040aa12f5d51ea 100644
--- a/Imaging/Core/vtkImageDecomposeFilter.h
+++ b/Imaging/Core/vtkImageDecomposeFilter.h
@@ -39,7 +39,7 @@ public:
* dimensionality 3.
*/
vtkTypeMacro(vtkImageDecomposeFilter,vtkImageIterateFilter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -63,7 +63,7 @@ public:
protected:
vtkImageDecomposeFilter();
- ~vtkImageDecomposeFilter()VTK_OVERRIDE {}
+ ~vtkImageDecomposeFilter() override {}
int Dimensionality;
diff --git a/Imaging/Core/vtkImageDifference.h b/Imaging/Core/vtkImageDifference.h
index 8a7823f8026ec9b39f6ed2cf4c5b04fdb3bcbb5b..2b8858eeab896b31ad0b01849c947513ac32c33a 100644
--- a/Imaging/Core/vtkImageDifference.h
+++ b/Imaging/Core/vtkImageDifference.h
@@ -48,7 +48,7 @@ class VTKIMAGINGCORE_EXPORT vtkImageDifference : public vtkThreadedImageAlgorith
public:
static vtkImageDifference *New();
vtkTypeMacro(vtkImageDifference,vtkThreadedImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -111,7 +111,7 @@ public:
protected:
vtkImageDifference();
- ~vtkImageDifference() VTK_OVERRIDE {}
+ ~vtkImageDifference() override {}
// Parameters
int AllowShift;
@@ -125,20 +125,20 @@ protected:
int RequestInformation (vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
int RequestUpdateExtent(vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
int RequestData(vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
void ThreadedRequestData(vtkInformation *request,
vtkInformationVector **inputVector,
vtkInformationVector *outputVector,
vtkImageData ***inData,
vtkImageData **outData,
- int extent[6], int threadId) VTK_OVERRIDE;
+ int extent[6], int threadId) override;
// Used for vtkMultiThreader operation.
vtkImageDifferenceThreadData *ThreadData;
diff --git a/Imaging/Core/vtkImageExtractComponents.h b/Imaging/Core/vtkImageExtractComponents.h
index 6294801eb626de1bcb0b383daa1178a328bb3788..03f09ee9e32d79b9d67961d80f7b5f6d36215104 100644
--- a/Imaging/Core/vtkImageExtractComponents.h
+++ b/Imaging/Core/vtkImageExtractComponents.h
@@ -35,7 +35,7 @@ class VTKIMAGINGCORE_EXPORT vtkImageExtractComponents : public vtkThreadedImageA
public:
static vtkImageExtractComponents *New();
vtkTypeMacro(vtkImageExtractComponents,vtkThreadedImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -57,16 +57,16 @@ public:
protected:
vtkImageExtractComponents();
- ~vtkImageExtractComponents() VTK_OVERRIDE {}
+ ~vtkImageExtractComponents() override {}
int NumberOfComponents;
int Components[3];
int RequestInformation (vtkInformation *, vtkInformationVector**,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
void ThreadedExecute (vtkImageData *inData, vtkImageData *outData,
- int ext[6], int id) VTK_OVERRIDE;
+ int ext[6], int id) override;
private:
vtkImageExtractComponents(const vtkImageExtractComponents&) VTK_DELETE_FUNCTION;
void operator=(const vtkImageExtractComponents&) VTK_DELETE_FUNCTION;
diff --git a/Imaging/Core/vtkImageFlip.h b/Imaging/Core/vtkImageFlip.h
index 5f4e0f5c7f1553e94e27ee8cccb03f03ce3eeefc..0f84af5d44213af9e5179e5206c6ff85b717001f 100644
--- a/Imaging/Core/vtkImageFlip.h
+++ b/Imaging/Core/vtkImageFlip.h
@@ -33,7 +33,7 @@ public:
static vtkImageFlip *New();
vtkTypeMacro(vtkImageFlip,vtkImageReslice);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -86,11 +86,11 @@ public:
protected:
vtkImageFlip();
- ~vtkImageFlip()VTK_OVERRIDE {}
+ ~vtkImageFlip() override {}
int RequestInformation(vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
int FilteredAxis;
int FlipAboutOrigin;
diff --git a/Imaging/Core/vtkImageInterpolator.h b/Imaging/Core/vtkImageInterpolator.h
index 0ebb9d2074b5a01f5c96a705766ff1d5b0f96eef..fb71f570cb64d27a52a8a9f772bf8d080455506e 100644
--- a/Imaging/Core/vtkImageInterpolator.h
+++ b/Imaging/Core/vtkImageInterpolator.h
@@ -37,7 +37,7 @@ class VTKIMAGINGCORE_EXPORT vtkImageInterpolator :
public:
static vtkImageInterpolator *New();
vtkTypeMacro(vtkImageInterpolator, vtkAbstractImageInterpolator);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -61,13 +61,13 @@ public:
* structured coordinate transformation between the output and the input.
* Otherwise, pass nullptr as the matrix to retrieve the full kernel size.
*/
- void ComputeSupportSize(const double matrix[16], int support[3]) VTK_OVERRIDE;
+ void ComputeSupportSize(const double matrix[16], int support[3]) override;
/**
* Returns true if the interpolator supports weight precomputation.
* This will always return true for this interpolator.
*/
- bool IsSeparable() VTK_OVERRIDE;
+ bool IsSeparable() override;
//@{
/**
@@ -81,30 +81,30 @@ public:
*/
void PrecomputeWeightsForExtent(
const double matrix[16], const int extent[6], int newExtent[6],
- vtkInterpolationWeights *&weights) VTK_OVERRIDE;
+ vtkInterpolationWeights *&weights) override;
void PrecomputeWeightsForExtent(
const float matrix[16], const int extent[6], int newExtent[6],
- vtkInterpolationWeights *&weights) VTK_OVERRIDE;
+ vtkInterpolationWeights *&weights) override;
//@}
/**
* Free the precomputed weights. THIS METHOD IS THREAD SAFE.
*/
- void FreePrecomputedWeights(vtkInterpolationWeights *&weights) VTK_OVERRIDE;
+ void FreePrecomputedWeights(vtkInterpolationWeights *&weights) override;
protected:
vtkImageInterpolator();
- ~vtkImageInterpolator() VTK_OVERRIDE;
+ ~vtkImageInterpolator() override;
/**
* Update the interpolator.
*/
- void InternalUpdate() VTK_OVERRIDE;
+ void InternalUpdate() override;
/**
* Copy all members.
*/
- void InternalDeepCopy(vtkAbstractImageInterpolator *obj) VTK_OVERRIDE;
+ void InternalDeepCopy(vtkAbstractImageInterpolator *obj) override;
//@{
/**
@@ -112,10 +112,10 @@ protected:
*/
void GetInterpolationFunc(
void (**doublefunc)(
- vtkInterpolationInfo *, const double [3], double *)) VTK_OVERRIDE;
+ vtkInterpolationInfo *, const double [3], double *)) override;
void GetInterpolationFunc(
void (**floatfunc)(
- vtkInterpolationInfo *, const float [3], float *)) VTK_OVERRIDE;
+ vtkInterpolationInfo *, const float [3], float *)) override;
//@}
//@{
@@ -124,10 +124,10 @@ protected:
*/
void GetRowInterpolationFunc(
void (**doublefunc)(
- vtkInterpolationWeights *, int, int, int, double *, int)) VTK_OVERRIDE;
+ vtkInterpolationWeights *, int, int, int, double *, int)) override;
void GetRowInterpolationFunc(
void (**floatfunc)(
- vtkInterpolationWeights *, int, int, int, float *, int)) VTK_OVERRIDE;
+ vtkInterpolationWeights *, int, int, int, float *, int)) override;
//@}
int InterpolationMode;
diff --git a/Imaging/Core/vtkImageIterateFilter.h b/Imaging/Core/vtkImageIterateFilter.h
index b66e4d562c9d4daf22125049a35be0a4e912dc7b..26dbcf37bb4a9e1558711f397dbde836e9c87930 100644
--- a/Imaging/Core/vtkImageIterateFilter.h
+++ b/Imaging/Core/vtkImageIterateFilter.h
@@ -34,7 +34,7 @@ class VTKIMAGINGCORE_EXPORT vtkImageIterateFilter : public vtkThreadedImageAlgor
{
public:
vtkTypeMacro(vtkImageIterateFilter,vtkThreadedImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -47,19 +47,19 @@ public:
protected:
vtkImageIterateFilter();
- ~vtkImageIterateFilter() VTK_OVERRIDE;
+ ~vtkImageIterateFilter() override;
// Implement standard requests by calling iterative versions the
// specified number of times.
int RequestUpdateExtent(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
int RequestInformation (vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
int RequestData(vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
// Iterative versions of standard requests. These are given the
// pipeline information object for the in/out pair at each
diff --git a/Imaging/Core/vtkImageMagnify.h b/Imaging/Core/vtkImageMagnify.h
index f5cb697500325f0057b42db61447d05fab922bec..2113522c1b6e20d372e008d3f902a88d3c0dcefa 100644
--- a/Imaging/Core/vtkImageMagnify.h
+++ b/Imaging/Core/vtkImageMagnify.h
@@ -34,7 +34,7 @@ class VTKIMAGINGCORE_EXPORT vtkImageMagnify : public vtkThreadedImageAlgorithm
public:
static vtkImageMagnify *New();
vtkTypeMacro(vtkImageMagnify,vtkThreadedImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -57,16 +57,16 @@ public:
protected:
vtkImageMagnify();
- ~vtkImageMagnify()VTK_OVERRIDE {}
+ ~vtkImageMagnify() override {}
int MagnificationFactors[3];
int Interpolate;
int RequestUpdateExtent(vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
int RequestInformation(vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
void ThreadedRequestData(vtkInformation *request,
vtkInformationVector **inputVector,
@@ -74,7 +74,7 @@ protected:
vtkImageData ***inData,
vtkImageData **outData,
int outExt[6],
- int id) VTK_OVERRIDE;
+ int id) override;
void InternalRequestUpdateExtent(int *inExt, int *outExt);
diff --git a/Imaging/Core/vtkImageMapToColors.h b/Imaging/Core/vtkImageMapToColors.h
index f9a9ef3b104e85eb03bb29f4683bc3bfa3b99eb8..080c941e6da55d57f5b307b6a2fc4310b7b74cf6 100644
--- a/Imaging/Core/vtkImageMapToColors.h
+++ b/Imaging/Core/vtkImageMapToColors.h
@@ -40,7 +40,7 @@ class VTKIMAGINGCORE_EXPORT vtkImageMapToColors : public vtkThreadedImageAlgorit
public:
static vtkImageMapToColors *New();
vtkTypeMacro(vtkImageMapToColors,vtkThreadedImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -83,7 +83,7 @@ public:
/**
* We need to check the modified time of the lookup table too.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
//@{
/**
@@ -96,21 +96,21 @@ public:
protected:
vtkImageMapToColors();
- ~vtkImageMapToColors() VTK_OVERRIDE;
+ ~vtkImageMapToColors() override;
int RequestInformation(vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
void ThreadedRequestData(vtkInformation *request,
vtkInformationVector **inputVector,
vtkInformationVector *outputVector,
vtkImageData ***inData, vtkImageData **outData,
- int extent[6], int id) VTK_OVERRIDE;
+ int extent[6], int id) override;
int RequestData(vtkInformation *request,
vtkInformationVector **inputVector,
- vtkInformationVector *outputVector) VTK_OVERRIDE;
+ vtkInformationVector *outputVector) override;
vtkScalarsToColors *LookupTable;
int OutputFormat;
diff --git a/Imaging/Core/vtkImageMask.h b/Imaging/Core/vtkImageMask.h
index f09e87044f9a7755e1fecace4e2047f9832ac133..790a9b5ae21251d40db07236c2d0d0d71da89dba 100644
--- a/Imaging/Core/vtkImageMask.h
+++ b/Imaging/Core/vtkImageMask.h
@@ -39,7 +39,7 @@ class VTKIMAGINGCORE_EXPORT vtkImageMask : public vtkThreadedImageAlgorithm
public:
static vtkImageMask *New();
vtkTypeMacro(vtkImageMask,vtkThreadedImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* SetGet the value of the output pixel replaced by mask.
@@ -94,7 +94,7 @@ public:
protected:
vtkImageMask();
- ~vtkImageMask() VTK_OVERRIDE;
+ ~vtkImageMask() override;
double *MaskedOutputValue;
int MaskedOutputValueLength;
@@ -103,7 +103,7 @@ protected:
int RequestInformation (vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
void ThreadedRequestData(vtkInformation *request,
@@ -111,7 +111,7 @@ protected:
vtkInformationVector *outputVector,
vtkImageData ***inData,
vtkImageData **outData,
- int extent[6], int threadId) VTK_OVERRIDE;
+ int extent[6], int threadId) override;
private:
vtkImageMask(const vtkImageMask&) VTK_DELETE_FUNCTION;
diff --git a/Imaging/Core/vtkImageMirrorPad.h b/Imaging/Core/vtkImageMirrorPad.h
index d1718a9b96143d2b1b06fb705482468943e0c21b..deefb45eb934bfe173de440d10a09f3e5a3cece1 100644
--- a/Imaging/Core/vtkImageMirrorPad.h
+++ b/Imaging/Core/vtkImageMirrorPad.h
@@ -35,14 +35,14 @@ public:
protected:
vtkImageMirrorPad() {}
- ~vtkImageMirrorPad()VTK_OVERRIDE {}
+ ~vtkImageMirrorPad() override {}
- void ComputeInputUpdateExtent(int inExt[6], int outExt[6], int wExt[6]) VTK_OVERRIDE;
+ void ComputeInputUpdateExtent(int inExt[6], int outExt[6], int wExt[6]) override;
void ThreadedRequestData (vtkInformation* request,
vtkInformationVector** inputVector,
vtkInformationVector* outputVector,
vtkImageData ***inData, vtkImageData **outData,
- int ext[6], int id) VTK_OVERRIDE;
+ int ext[6], int id) override;
private:
vtkImageMirrorPad(const vtkImageMirrorPad&) VTK_DELETE_FUNCTION;
void operator=(const vtkImageMirrorPad&) VTK_DELETE_FUNCTION;
diff --git a/Imaging/Core/vtkImagePadFilter.h b/Imaging/Core/vtkImagePadFilter.h
index 17b485bd612de3166bbe7fa36eb7f355bcbea31e..a7cbe66c00d73be870eb89dd6b66cee7bdd2e1af 100644
--- a/Imaging/Core/vtkImagePadFilter.h
+++ b/Imaging/Core/vtkImagePadFilter.h
@@ -33,7 +33,7 @@ class VTKIMAGINGCORE_EXPORT vtkImagePadFilter : public vtkThreadedImageAlgorithm
public:
static vtkImagePadFilter *New();
vtkTypeMacro(vtkImagePadFilter,vtkThreadedImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -56,17 +56,17 @@ public:
protected:
vtkImagePadFilter();
- ~vtkImagePadFilter() VTK_OVERRIDE {}
+ ~vtkImagePadFilter() override {}
int OutputWholeExtent[6];
int OutputNumberOfScalarComponents;
int RequestInformation (vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
int RequestUpdateExtent(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
virtual void ComputeInputUpdateExtent (int inExt[6], int outExt[6],
int wExt[6]);
diff --git a/Imaging/Core/vtkImagePermute.h b/Imaging/Core/vtkImagePermute.h
index 158ca9768324676791dad6d5fbbe36b18f25f6b4..376a8e4ba73ae8ea436f7a7778b770cd5ee962de 100644
--- a/Imaging/Core/vtkImagePermute.h
+++ b/Imaging/Core/vtkImagePermute.h
@@ -36,7 +36,7 @@ public:
static vtkImagePermute *New();
vtkTypeMacro(vtkImagePermute,vtkImageReslice);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -50,7 +50,7 @@ public:
protected:
vtkImagePermute();
- ~vtkImagePermute()VTK_OVERRIDE {}
+ ~vtkImagePermute() override {}
int FilteredAxes[3];
diff --git a/Imaging/Core/vtkImageResample.h b/Imaging/Core/vtkImageResample.h
index 412160b83d192464625af18ecd87104e881429a1..47522156775a66f9304e24c105e35908319eed5b 100644
--- a/Imaging/Core/vtkImageResample.h
+++ b/Imaging/Core/vtkImageResample.h
@@ -34,15 +34,15 @@ class VTKIMAGINGCORE_EXPORT vtkImageResample : public vtkImageReslice
public:
static vtkImageResample *New();
vtkTypeMacro(vtkImageResample,vtkImageReslice);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
* Set desired spacing.
* Zero is a reserved value indicating spacing has not been set.
*/
- void SetOutputSpacing(double sx, double sy, double sz) VTK_OVERRIDE;
- void SetOutputSpacing(const double spacing[3]) VTK_OVERRIDE {
+ void SetOutputSpacing(double sx, double sy, double sz) override;
+ void SetOutputSpacing(const double spacing[3]) override {
this->SetOutputSpacing(spacing[0], spacing[1], spacing[2]); }
void SetAxisOutputSpacing(int axis, double spacing);
//@}
@@ -78,14 +78,14 @@ public:
protected:
vtkImageResample();
- ~vtkImageResample() VTK_OVERRIDE {}
+ ~vtkImageResample() override {}
double MagnificationFactors[3];
int Dimensionality;
int RequestInformation(vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
private:
vtkImageResample(const vtkImageResample&) VTK_DELETE_FUNCTION;
diff --git a/Imaging/Core/vtkImageResize.h b/Imaging/Core/vtkImageResize.h
index baf2e7f59b2c625fe79823661b925a6a6455458a..28c4bea8439a49e5da23c8e4aebd9c8bfe242d1c 100644
--- a/Imaging/Core/vtkImageResize.h
+++ b/Imaging/Core/vtkImageResize.h
@@ -41,7 +41,7 @@ class VTKIMAGINGCORE_EXPORT vtkImageResize : public vtkThreadedImageAlgorithm
public:
static vtkImageResize *New();
vtkTypeMacro(vtkImageResize, vtkThreadedImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
enum
{
@@ -153,25 +153,25 @@ public:
/**
* Get the modified time of the filter.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
protected:
vtkImageResize();
- ~vtkImageResize() VTK_OVERRIDE;
+ ~vtkImageResize() override;
virtual vtkAbstractImageInterpolator *GetInternalInterpolator();
int RequestInformation(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
int RequestUpdateExtent(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
int RequestData(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
void ThreadedRequestData(vtkInformation *request,
vtkInformationVector **inputVector,
vtkInformationVector *outputVector,
vtkImageData ***inData,
- vtkImageData **outData, int ext[6], int id) VTK_OVERRIDE;
+ vtkImageData **outData, int ext[6], int id) override;
int ResizeMethod;
int OutputDimensions[3];
diff --git a/Imaging/Core/vtkImageReslice.h b/Imaging/Core/vtkImageReslice.h
index 9bcea09f20806e9c68decdf0caecf5066c64dae2..6d1c5a29a61e64655aa822db772961f825e756f0 100644
--- a/Imaging/Core/vtkImageReslice.h
+++ b/Imaging/Core/vtkImageReslice.h
@@ -74,7 +74,7 @@ public:
static vtkImageReslice *New();
vtkTypeMacro(vtkImageReslice, vtkThreadedImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -425,12 +425,12 @@ public:
* When determining the modified time of the filter,
* this check the modified time of the transform and matrix.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
/**
* Report object referenced by instances of this class.
*/
- void ReportReferences(vtkGarbageCollector*) VTK_OVERRIDE;
+ void ReportReferences(vtkGarbageCollector*) override;
//@{
/**
@@ -486,7 +486,7 @@ public:
protected:
vtkImageReslice();
- ~vtkImageReslice() VTK_OVERRIDE;
+ ~vtkImageReslice() override;
vtkMatrix4x4 *ResliceAxes;
double ResliceAxesDirectionCosines[9];
@@ -555,21 +555,21 @@ protected:
count, idX, idY, idZ, threadId); }
void GetAutoCroppedOutputBounds(vtkInformation *inInfo, double bounds[6]);
- void AllocateOutputData(vtkImageData *output, vtkInformation *outInfo, int *uExtent) VTK_OVERRIDE;
- vtkImageData *AllocateOutputData(vtkDataObject *, vtkInformation *) VTK_OVERRIDE;
+ void AllocateOutputData(vtkImageData *output, vtkInformation *outInfo, int *uExtent) override;
+ vtkImageData *AllocateOutputData(vtkDataObject *, vtkInformation *) override;
int RequestInformation(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
int RequestUpdateExtent(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
int RequestData(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
void ThreadedRequestData(vtkInformation *request,
vtkInformationVector **inputVector,
vtkInformationVector *outputVector,
vtkImageData ***inData,
- vtkImageData **outData, int ext[6], int id) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
- int FillOutputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ vtkImageData **outData, int ext[6], int id) override;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
+ int FillOutputPortInformation(int port, vtkInformation *info) override;
vtkMatrix4x4 *GetIndexMatrix(vtkInformation *inInfo,
vtkInformation *outInfo);
diff --git a/Imaging/Core/vtkImageResliceToColors.h b/Imaging/Core/vtkImageResliceToColors.h
index 321576667173f748cf3b10ababda130e9d9d9936..2226545a1563736b55071f2907f162f48bc96320 100644
--- a/Imaging/Core/vtkImageResliceToColors.h
+++ b/Imaging/Core/vtkImageResliceToColors.h
@@ -43,7 +43,7 @@ public:
static vtkImageResliceToColors *New();
vtkTypeMacro(vtkImageResliceToColors, vtkImageReslice);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -87,22 +87,22 @@ public:
* When determining the modified time of the filter,
* this check the modified time of the transform and matrix.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
protected:
vtkImageResliceToColors();
- ~vtkImageResliceToColors() VTK_OVERRIDE;
+ ~vtkImageResliceToColors() override;
vtkScalarsToColors *LookupTable;
vtkScalarsToColors *DefaultLookupTable;
int OutputFormat;
int Bypass;
- int ConvertScalarInfo(int &scalarType, int &numComponents) VTK_OVERRIDE;
+ int ConvertScalarInfo(int &scalarType, int &numComponents) override;
void ConvertScalars(void *inPtr, void *outPtr, int inputType,
int inputNumComponents, int count,
- int idX, int idY, int idZ, int threadId) VTK_OVERRIDE;
+ int idX, int idY, int idZ, int threadId) override;
private:
vtkImageResliceToColors(const vtkImageResliceToColors&) VTK_DELETE_FUNCTION;
diff --git a/Imaging/Core/vtkImageShiftScale.h b/Imaging/Core/vtkImageShiftScale.h
index 26f67925acf510fa17d956923bc3f8e37122aa83..7c8b0997564d121a5d52d4f09c6167eacb5a550d 100644
--- a/Imaging/Core/vtkImageShiftScale.h
+++ b/Imaging/Core/vtkImageShiftScale.h
@@ -34,7 +34,7 @@ class VTKIMAGINGCORE_EXPORT vtkImageShiftScale : public vtkThreadedImageAlgorith
public:
static vtkImageShiftScale *New();
vtkTypeMacro(vtkImageShiftScale,vtkThreadedImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -97,7 +97,7 @@ public:
protected:
vtkImageShiftScale();
- ~vtkImageShiftScale() VTK_OVERRIDE;
+ ~vtkImageShiftScale() override;
double Shift;
double Scale;
@@ -106,7 +106,7 @@ protected:
int RequestInformation(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
void ThreadedRequestData(vtkInformation*,
vtkInformationVector**,
@@ -114,7 +114,7 @@ protected:
vtkImageData*** inData,
vtkImageData** outData,
int outExt[6],
- int threadId) VTK_OVERRIDE;
+ int threadId) override;
private:
vtkImageShiftScale(const vtkImageShiftScale&) VTK_DELETE_FUNCTION;
void operator=(const vtkImageShiftScale&) VTK_DELETE_FUNCTION;
diff --git a/Imaging/Core/vtkImageShrink3D.h b/Imaging/Core/vtkImageShrink3D.h
index 472f6f5dd253194eae344c41ad17f453bc2cfbff..b6d62d02f61e7fbb66378742dd659cc5fbd34d43 100644
--- a/Imaging/Core/vtkImageShrink3D.h
+++ b/Imaging/Core/vtkImageShrink3D.h
@@ -32,7 +32,7 @@ class VTKIMAGINGCORE_EXPORT vtkImageShrink3D : public vtkThreadedImageAlgorithm
public:
static vtkImageShrink3D *New();
vtkTypeMacro(vtkImageShrink3D,vtkThreadedImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -81,7 +81,7 @@ public:
protected:
vtkImageShrink3D();
- ~vtkImageShrink3D()VTK_OVERRIDE {}
+ ~vtkImageShrink3D() override {}
int ShrinkFactors[3];
int Shift[3];
@@ -90,14 +90,14 @@ protected:
int Maximum;
int Median;
- int RequestInformation (vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int RequestUpdateExtent (vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestInformation (vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int RequestUpdateExtent (vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
void ThreadedRequestData(vtkInformation *request,
vtkInformationVector **inputVector,
vtkInformationVector *outputVector,
vtkImageData ***inData, vtkImageData **outData,
- int ext[6], int id) VTK_OVERRIDE;
+ int ext[6], int id) override;
void InternalRequestUpdateExtent(int *inExt, int *outExt);
diff --git a/Imaging/Core/vtkImageSincInterpolator.h b/Imaging/Core/vtkImageSincInterpolator.h
index df824b2146ce4e0b41fb7cda17551ca7c0a01905..539e11e6ebf598af76396adb84224b6a43670ac0 100644
--- a/Imaging/Core/vtkImageSincInterpolator.h
+++ b/Imaging/Core/vtkImageSincInterpolator.h
@@ -56,7 +56,7 @@ class VTKIMAGINGCORE_EXPORT vtkImageSincInterpolator :
public:
static vtkImageSincInterpolator *New();
vtkTypeMacro(vtkImageSincInterpolator, vtkAbstractImageInterpolator);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -130,7 +130,7 @@ public:
* structured coordinate transformation between the output and the input.
* Otherwise, pass nullptr as the matrix to retrieve the full kernel size.
*/
- void ComputeSupportSize(const double matrix[16], int support[3]) VTK_OVERRIDE;
+ void ComputeSupportSize(const double matrix[16], int support[3]) override;
//@{
/**
@@ -182,7 +182,7 @@ public:
* Returns true if the interpolator supports weight precomputation.
* This will always return true for this interpolator.
*/
- bool IsSeparable() VTK_OVERRIDE;
+ bool IsSeparable() override;
//@{
/**
@@ -197,30 +197,30 @@ public:
*/
void PrecomputeWeightsForExtent(
const double matrix[16], const int extent[6], int newExtent[6],
- vtkInterpolationWeights *&weights) VTK_OVERRIDE;
+ vtkInterpolationWeights *&weights) override;
void PrecomputeWeightsForExtent(
const float matrix[16], const int extent[6], int newExtent[6],
- vtkInterpolationWeights *&weights) VTK_OVERRIDE;
+ vtkInterpolationWeights *&weights) override;
//@}
/**
* Free the precomputed weights. THIS METHOD IS THREAD SAFE.
*/
- void FreePrecomputedWeights(vtkInterpolationWeights *&weights) VTK_OVERRIDE;
+ void FreePrecomputedWeights(vtkInterpolationWeights *&weights) override;
protected:
vtkImageSincInterpolator();
- ~vtkImageSincInterpolator() VTK_OVERRIDE;
+ ~vtkImageSincInterpolator() override;
/**
* Update the interpolator.
*/
- void InternalUpdate() VTK_OVERRIDE;
+ void InternalUpdate() override;
/**
* Copy the interpolator.
*/
- void InternalDeepCopy(vtkAbstractImageInterpolator *obj) VTK_OVERRIDE;
+ void InternalDeepCopy(vtkAbstractImageInterpolator *obj) override;
//@{
/**
@@ -228,10 +228,10 @@ protected:
*/
void GetInterpolationFunc(
void (**doublefunc)(
- vtkInterpolationInfo *, const double [3], double *)) VTK_OVERRIDE;
+ vtkInterpolationInfo *, const double [3], double *)) override;
void GetInterpolationFunc(
void (**floatfunc)(
- vtkInterpolationInfo *, const float [3], float *)) VTK_OVERRIDE;
+ vtkInterpolationInfo *, const float [3], float *)) override;
//@}
//@{
@@ -240,10 +240,10 @@ protected:
*/
void GetRowInterpolationFunc(
void (**doublefunc)(
- vtkInterpolationWeights *, int, int, int, double *, int)) VTK_OVERRIDE;
+ vtkInterpolationWeights *, int, int, int, double *, int)) override;
void GetRowInterpolationFunc(
void (**floatfunc)(
- vtkInterpolationWeights *, int, int, int, float *, int)) VTK_OVERRIDE;
+ vtkInterpolationWeights *, int, int, int, float *, int)) override;
//@}
/**
diff --git a/Imaging/Core/vtkImageStencilAlgorithm.h b/Imaging/Core/vtkImageStencilAlgorithm.h
index e202ef84c46d252687267b2bec0f7d71cbb5d5e8..f7c418e259b863eb05c21b5276e261eafd9ab5c3 100644
--- a/Imaging/Core/vtkImageStencilAlgorithm.h
+++ b/Imaging/Core/vtkImageStencilAlgorithm.h
@@ -39,7 +39,7 @@ public:
static vtkImageStencilAlgorithm *New();
vtkTypeMacro(vtkImageStencilAlgorithm, vtkAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -54,11 +54,11 @@ public:
*/
int ProcessRequest(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
protected:
vtkImageStencilAlgorithm();
- ~vtkImageStencilAlgorithm() VTK_OVERRIDE;
+ ~vtkImageStencilAlgorithm() override;
virtual int RequestData(vtkInformation *, vtkInformationVector **,
vtkInformationVector *);
@@ -68,7 +68,7 @@ protected:
vtkInformationVector *);
vtkImageStencilData *AllocateOutputData(vtkDataObject *out, int* updateExt);
- int FillOutputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
+ int FillOutputPortInformation(int, vtkInformation*) override;
private:
vtkImageStencilAlgorithm(const vtkImageStencilAlgorithm&) VTK_DELETE_FUNCTION;
diff --git a/Imaging/Core/vtkImageStencilData.h b/Imaging/Core/vtkImageStencilData.h
index b624b0bfcee57d463ed3f8695299b8ea61bca638..b2fbabfd9d72459035420cdb71ebd720c2f99f3b 100644
--- a/Imaging/Core/vtkImageStencilData.h
+++ b/Imaging/Core/vtkImageStencilData.h
@@ -36,23 +36,23 @@ class VTKIMAGINGCORE_EXPORT vtkImageStencilData : public vtkDataObject
public:
static vtkImageStencilData *New();
vtkTypeMacro(vtkImageStencilData, vtkDataObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
- void Initialize() VTK_OVERRIDE;
- void DeepCopy(vtkDataObject *o) VTK_OVERRIDE;
- void ShallowCopy(vtkDataObject *f) VTK_OVERRIDE;
+ void Initialize() override;
+ void DeepCopy(vtkDataObject *o) override;
+ void ShallowCopy(vtkDataObject *f) override;
void InternalImageStencilDataCopy(vtkImageStencilData *s);
/**
* Get the data type as an integer (this will return VTK_DATA_OBJECT
* for now, maybe a proper type constant will be reserved later).
*/
- int GetDataObjectType() VTK_OVERRIDE { return VTK_DATA_OBJECT; }
+ int GetDataObjectType() override { return VTK_DATA_OBJECT; }
/**
* The extent type is 3D, just like vtkImageData.
*/
- int GetExtentType() VTK_OVERRIDE { return VTK_3D_EXTENT; };
+ int GetExtentType() override { return VTK_3D_EXTENT; };
/**
* Given the total output x extent [xMin,xMax] and the current y, z indices,
@@ -147,8 +147,8 @@ public:
* Override these to handle origin, spacing, scalar type, and scalar
* number of components. See vtkDataObject for details.
*/
- void CopyInformationFromPipeline(vtkInformation *info) VTK_OVERRIDE;
- void CopyInformationToPipeline(vtkInformation *info) VTK_OVERRIDE;
+ void CopyInformationFromPipeline(vtkInformation *info) override;
+ void CopyInformationToPipeline(vtkInformation *info) override;
//@}
//@{
@@ -184,7 +184,7 @@ public:
protected:
vtkImageStencilData();
- ~vtkImageStencilData() VTK_OVERRIDE;
+ ~vtkImageStencilData() override;
enum Operation { Merge, Erase };
diff --git a/Imaging/Core/vtkImageStencilSource.h b/Imaging/Core/vtkImageStencilSource.h
index 98a2ac9a586e4467d2357d3fb42e85728e10b34a..3a360c9f6638af7475c990e6d23d2442344782bc 100644
--- a/Imaging/Core/vtkImageStencilSource.h
+++ b/Imaging/Core/vtkImageStencilSource.h
@@ -46,7 +46,7 @@ public:
static vtkImageStencilSource *New();
vtkTypeMacro(vtkImageStencilSource, vtkImageStencilAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -93,14 +93,14 @@ public:
/**
* Report object referenced by instances of this class.
*/
- void ReportReferences(vtkGarbageCollector*) VTK_OVERRIDE;
+ void ReportReferences(vtkGarbageCollector*) override;
protected:
vtkImageStencilSource();
- ~vtkImageStencilSource() VTK_OVERRIDE;
+ ~vtkImageStencilSource() override;
int RequestInformation(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
vtkImageData *InformationInput;
diff --git a/Imaging/Core/vtkImageThreshold.h b/Imaging/Core/vtkImageThreshold.h
index b21e64c8aea101f8979e4e217a30625dd50627d4..090015e0c6b11155fde8b80c60143ec29f3eb31a 100644
--- a/Imaging/Core/vtkImageThreshold.h
+++ b/Imaging/Core/vtkImageThreshold.h
@@ -33,7 +33,7 @@ class VTKIMAGINGCORE_EXPORT vtkImageThreshold : public vtkThreadedImageAlgorithm
public:
static vtkImageThreshold *New();
vtkTypeMacro(vtkImageThreshold,vtkThreadedImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* The values greater than or equal to the value match.
@@ -124,7 +124,7 @@ public:
protected:
vtkImageThreshold();
- ~vtkImageThreshold()VTK_OVERRIDE {}
+ ~vtkImageThreshold() override {}
double UpperThreshold;
double LowerThreshold;
@@ -135,13 +135,13 @@ protected:
int OutputScalarType;
- int RequestInformation (vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestInformation (vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
void ThreadedRequestData(vtkInformation *request,
vtkInformationVector **inputVector,
vtkInformationVector *outputVector,
vtkImageData ***inData, vtkImageData **outData,
- int extent[6], int id) VTK_OVERRIDE;
+ int extent[6], int id) override;
private:
vtkImageThreshold(const vtkImageThreshold&) VTK_DELETE_FUNCTION;
diff --git a/Imaging/Core/vtkImageTranslateExtent.h b/Imaging/Core/vtkImageTranslateExtent.h
index c7ac06f2a1eb9c4c507715b5dd40141046d73bd8..cd76891a46ad7ab502b8f51902e6f0450883e477 100644
--- a/Imaging/Core/vtkImageTranslateExtent.h
+++ b/Imaging/Core/vtkImageTranslateExtent.h
@@ -31,7 +31,7 @@ class VTKIMAGINGCORE_EXPORT vtkImageTranslateExtent : public vtkImageAlgorithm
public:
static vtkImageTranslateExtent *New();
vtkTypeMacro(vtkImageTranslateExtent,vtkImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -43,14 +43,14 @@ public:
protected:
vtkImageTranslateExtent();
- ~vtkImageTranslateExtent()VTK_OVERRIDE {}
+ ~vtkImageTranslateExtent() override {}
int Translation[3];
- int RequestUpdateExtent (vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int RequestInformation (vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestUpdateExtent (vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int RequestInformation (vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
private:
vtkImageTranslateExtent(const vtkImageTranslateExtent&) VTK_DELETE_FUNCTION;
diff --git a/Imaging/Core/vtkImageWrapPad.h b/Imaging/Core/vtkImageWrapPad.h
index b5ed3215e643666952f7c842e8c2321c2ea9f0e3..d060b956f5ec386758de9a0e8580fff3d65929a0 100644
--- a/Imaging/Core/vtkImageWrapPad.h
+++ b/Imaging/Core/vtkImageWrapPad.h
@@ -40,14 +40,14 @@ public:
protected:
vtkImageWrapPad() {}
- ~vtkImageWrapPad()VTK_OVERRIDE {}
+ ~vtkImageWrapPad() override {}
- void ComputeInputUpdateExtent (int inExt[6], int outExt[6], int wExt[6]) VTK_OVERRIDE;
+ void ComputeInputUpdateExtent (int inExt[6], int outExt[6], int wExt[6]) override;
void ThreadedRequestData (vtkInformation* request,
vtkInformationVector** inputVector,
vtkInformationVector* outputVector,
vtkImageData ***inData, vtkImageData **outData,
- int ext[6], int id) VTK_OVERRIDE;
+ int ext[6], int id) override;
private:
vtkImageWrapPad(const vtkImageWrapPad&) VTK_DELETE_FUNCTION;
void operator=(const vtkImageWrapPad&) VTK_DELETE_FUNCTION;
diff --git a/Imaging/Core/vtkRTAnalyticSource.h b/Imaging/Core/vtkRTAnalyticSource.h
index 79823ca0c02899a241fd418d0c492145d81be2ad..788eab029542747637153e246acb7e59406fea0b 100644
--- a/Imaging/Core/vtkRTAnalyticSource.h
+++ b/Imaging/Core/vtkRTAnalyticSource.h
@@ -32,7 +32,7 @@ class VTKIMAGINGCORE_EXPORT vtkRTAnalyticSource : public vtkImageAlgorithm
public:
static vtkRTAnalyticSource *New();
vtkTypeMacro(vtkRTAnalyticSource,vtkImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -136,7 +136,7 @@ protected:
/**
* Destructor.
*/
- ~vtkRTAnalyticSource() VTK_OVERRIDE
+ ~vtkRTAnalyticSource() override
{
}
@@ -154,10 +154,10 @@ protected:
int RequestInformation(vtkInformation *request,
vtkInformationVector **inputVector,
- vtkInformationVector *outputVector) VTK_OVERRIDE;
- void ExecuteDataWithInformation(vtkDataObject *data, vtkInformation *outInfo) VTK_OVERRIDE;
+ vtkInformationVector *outputVector) override;
+ void ExecuteDataWithInformation(vtkDataObject *data, vtkInformation *outInfo) override;
- int FillOutputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillOutputPortInformation(int port, vtkInformation* info) override;
private:
vtkRTAnalyticSource(const vtkRTAnalyticSource&) VTK_DELETE_FUNCTION;
diff --git a/Imaging/Fourier/vtkImageButterworthHighPass.h b/Imaging/Fourier/vtkImageButterworthHighPass.h
index 5077465edb43ef659e4802275efcf205dc2cc164..2eb8d338c86ff6c1e9feb5ef4c6c36b89d6ada1a 100644
--- a/Imaging/Fourier/vtkImageButterworthHighPass.h
+++ b/Imaging/Fourier/vtkImageButterworthHighPass.h
@@ -40,7 +40,7 @@ class VTKIMAGINGFOURIER_EXPORT vtkImageButterworthHighPass : public vtkThreadedI
public:
static vtkImageButterworthHighPass *New();
vtkTypeMacro(vtkImageButterworthHighPass,vtkThreadedImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -69,7 +69,7 @@ public:
protected:
vtkImageButterworthHighPass();
- ~vtkImageButterworthHighPass()VTK_OVERRIDE {}
+ ~vtkImageButterworthHighPass() override {}
int Order;
double CutOff[3];
@@ -78,7 +78,7 @@ protected:
vtkInformationVector **inputVector,
vtkInformationVector *outputVector,
vtkImageData ***inData, vtkImageData **outData,
- int outExt[6], int id) VTK_OVERRIDE;
+ int outExt[6], int id) override;
private:
vtkImageButterworthHighPass(const vtkImageButterworthHighPass&) VTK_DELETE_FUNCTION;
void operator=(const vtkImageButterworthHighPass&) VTK_DELETE_FUNCTION;
diff --git a/Imaging/Fourier/vtkImageButterworthLowPass.h b/Imaging/Fourier/vtkImageButterworthLowPass.h
index ffb88e385480213cdc9d5aeb30d2f89411944b51..a559ea46df0b3dd205c6269a5c14fcfde9c511e8 100644
--- a/Imaging/Fourier/vtkImageButterworthLowPass.h
+++ b/Imaging/Fourier/vtkImageButterworthLowPass.h
@@ -40,7 +40,7 @@ class VTKIMAGINGFOURIER_EXPORT vtkImageButterworthLowPass : public vtkThreadedIm
public:
static vtkImageButterworthLowPass *New();
vtkTypeMacro(vtkImageButterworthLowPass,vtkThreadedImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -70,7 +70,7 @@ public:
protected:
vtkImageButterworthLowPass();
- ~vtkImageButterworthLowPass()VTK_OVERRIDE {}
+ ~vtkImageButterworthLowPass() override {}
int Order;
double CutOff[3];
@@ -79,7 +79,7 @@ protected:
vtkInformationVector **inputVector,
vtkInformationVector *outputVector,
vtkImageData ***inData, vtkImageData **outData,
- int outExt[6], int id) VTK_OVERRIDE;
+ int outExt[6], int id) override;
private:
vtkImageButterworthLowPass(const vtkImageButterworthLowPass&) VTK_DELETE_FUNCTION;
void operator=(const vtkImageButterworthLowPass&) VTK_DELETE_FUNCTION;
diff --git a/Imaging/Fourier/vtkImageFFT.h b/Imaging/Fourier/vtkImageFFT.h
index 94693dda12c6d2c3688b67d03831e5f401d7c647..2824fd69f9868ef372a57c67d8048674de706837 100644
--- a/Imaging/Fourier/vtkImageFFT.h
+++ b/Imaging/Fourier/vtkImageFFT.h
@@ -41,12 +41,12 @@ public:
protected:
vtkImageFFT() {}
- ~vtkImageFFT()VTK_OVERRIDE {}
+ ~vtkImageFFT() override {}
int IterativeRequestInformation(vtkInformation* in,
- vtkInformation* out) VTK_OVERRIDE;
+ vtkInformation* out) override;
int IterativeRequestUpdateExtent(vtkInformation* in,
- vtkInformation* out) VTK_OVERRIDE;
+ vtkInformation* out) override;
void ThreadedRequestData(
vtkInformation* vtkNotUsed( request ),
@@ -55,7 +55,7 @@ protected:
vtkImageData ***inDataVec,
vtkImageData **outDataVec,
int outExt[6],
- int threadId) VTK_OVERRIDE;
+ int threadId) override;
private:
vtkImageFFT(const vtkImageFFT&) VTK_DELETE_FUNCTION;
void operator=(const vtkImageFFT&) VTK_DELETE_FUNCTION;
diff --git a/Imaging/Fourier/vtkImageFourierCenter.h b/Imaging/Fourier/vtkImageFourierCenter.h
index f8cff9e29099a75b495c08c63b4a14cdf08726d5..9decf9ff6577b058c1e3bbfb3d8e5489ba37c2e3 100644
--- a/Imaging/Fourier/vtkImageFourierCenter.h
+++ b/Imaging/Fourier/vtkImageFourierCenter.h
@@ -38,10 +38,10 @@ public:
protected:
vtkImageFourierCenter();
- ~vtkImageFourierCenter()VTK_OVERRIDE {}
+ ~vtkImageFourierCenter() override {}
int IterativeRequestUpdateExtent(vtkInformation* in,
- vtkInformation* out) VTK_OVERRIDE;
+ vtkInformation* out) override;
void ThreadedRequestData(
vtkInformation* vtkNotUsed( request ),
@@ -50,7 +50,7 @@ protected:
vtkImageData ***inDataVec,
vtkImageData **outDataVec,
int outExt[6],
- int threadId) VTK_OVERRIDE;
+ int threadId) override;
private:
vtkImageFourierCenter(const vtkImageFourierCenter&) VTK_DELETE_FUNCTION;
void operator=(const vtkImageFourierCenter&) VTK_DELETE_FUNCTION;
diff --git a/Imaging/Fourier/vtkImageFourierFilter.h b/Imaging/Fourier/vtkImageFourierFilter.h
index 43d17ee0f8998df6105cf46b8d671ef6da3be380..b24d4b24102f906de3f9e9924c723db8b428a368 100644
--- a/Imaging/Fourier/vtkImageFourierFilter.h
+++ b/Imaging/Fourier/vtkImageFourierFilter.h
@@ -110,7 +110,7 @@ public:
protected:
vtkImageFourierFilter() {}
- ~vtkImageFourierFilter()VTK_OVERRIDE {}
+ ~vtkImageFourierFilter() override {}
void ExecuteFftStep2(vtkImageComplex *p_in, vtkImageComplex *p_out,
int N, int bsize, int fb);
@@ -124,7 +124,7 @@ protected:
*/
int RequestData(vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
private:
vtkImageFourierFilter(const vtkImageFourierFilter&) VTK_DELETE_FUNCTION;
diff --git a/Imaging/Fourier/vtkImageIdealHighPass.h b/Imaging/Fourier/vtkImageIdealHighPass.h
index b385438e8d25826bfbdef819fed24180a1921723..1c9fe3546a3ea83d3085be384343e9aab8c9be1b 100644
--- a/Imaging/Fourier/vtkImageIdealHighPass.h
+++ b/Imaging/Fourier/vtkImageIdealHighPass.h
@@ -40,7 +40,7 @@ class VTKIMAGINGFOURIER_EXPORT vtkImageIdealHighPass : public vtkThreadedImageAl
public:
static vtkImageIdealHighPass *New();
vtkTypeMacro(vtkImageIdealHighPass,vtkThreadedImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -61,7 +61,7 @@ public:
protected:
vtkImageIdealHighPass();
- ~vtkImageIdealHighPass()VTK_OVERRIDE {}
+ ~vtkImageIdealHighPass() override {}
double CutOff[3];
@@ -69,7 +69,7 @@ protected:
vtkInformationVector **inputVector,
vtkInformationVector *outputVector,
vtkImageData ***inData, vtkImageData **outData,
- int outExt[6], int id) VTK_OVERRIDE;
+ int outExt[6], int id) override;
private:
vtkImageIdealHighPass(const vtkImageIdealHighPass&) VTK_DELETE_FUNCTION;
void operator=(const vtkImageIdealHighPass&) VTK_DELETE_FUNCTION;
diff --git a/Imaging/Fourier/vtkImageIdealLowPass.h b/Imaging/Fourier/vtkImageIdealLowPass.h
index bea6717fb904a89db6c86bda4c55a7b11d42df61..2f3885566c4e4439d1400045988221a276562790 100644
--- a/Imaging/Fourier/vtkImageIdealLowPass.h
+++ b/Imaging/Fourier/vtkImageIdealLowPass.h
@@ -40,7 +40,7 @@ class VTKIMAGINGFOURIER_EXPORT vtkImageIdealLowPass : public vtkThreadedImageAlg
public:
static vtkImageIdealLowPass *New();
vtkTypeMacro(vtkImageIdealLowPass,vtkThreadedImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -61,7 +61,7 @@ public:
protected:
vtkImageIdealLowPass();
- ~vtkImageIdealLowPass()VTK_OVERRIDE {}
+ ~vtkImageIdealLowPass() override {}
double CutOff[3];
@@ -69,7 +69,7 @@ protected:
vtkInformationVector **inputVector,
vtkInformationVector *outputVector,
vtkImageData ***inData, vtkImageData **outData,
- int outExt[6], int id) VTK_OVERRIDE;
+ int outExt[6], int id) override;
private:
vtkImageIdealLowPass(const vtkImageIdealLowPass&) VTK_DELETE_FUNCTION;
void operator=(const vtkImageIdealLowPass&) VTK_DELETE_FUNCTION;
diff --git a/Imaging/Fourier/vtkImageRFFT.h b/Imaging/Fourier/vtkImageRFFT.h
index ca3d844812e267300e1e19a8427c5b4e5dcb739d..97164fdb9daa990e425ebaf62f02a803bb3f7c4a 100644
--- a/Imaging/Fourier/vtkImageRFFT.h
+++ b/Imaging/Fourier/vtkImageRFFT.h
@@ -47,12 +47,12 @@ public:
protected:
vtkImageRFFT() {}
- ~vtkImageRFFT()VTK_OVERRIDE {}
+ ~vtkImageRFFT() override {}
int IterativeRequestInformation(vtkInformation* in,
- vtkInformation* out) VTK_OVERRIDE;
+ vtkInformation* out) override;
int IterativeRequestUpdateExtent(vtkInformation* in,
- vtkInformation* out) VTK_OVERRIDE;
+ vtkInformation* out) override;
void ThreadedRequestData(
vtkInformation* vtkNotUsed( request ),
@@ -61,7 +61,7 @@ protected:
vtkImageData ***inDataVec,
vtkImageData **outDataVec,
int outExt[6],
- int threadId) VTK_OVERRIDE;
+ int threadId) override;
private:
vtkImageRFFT(const vtkImageRFFT&) VTK_DELETE_FUNCTION;
void operator=(const vtkImageRFFT&) VTK_DELETE_FUNCTION;
diff --git a/Imaging/Fourier/vtkTableFFT.h b/Imaging/Fourier/vtkTableFFT.h
index bbbc8f324e5cc35af0430c7265dd78f88c9cd869..af081706976f9d08c03ae7a3039b7a54c541bbb3 100644
--- a/Imaging/Fourier/vtkTableFFT.h
+++ b/Imaging/Fourier/vtkTableFFT.h
@@ -48,15 +48,15 @@ class VTKIMAGINGFOURIER_EXPORT vtkTableFFT : public vtkTableAlgorithm
public:
vtkTypeMacro(vtkTableFFT, vtkTableAlgorithm);
static vtkTableFFT *New();
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
protected:
vtkTableFFT();
- ~vtkTableFFT() VTK_OVERRIDE;
+ ~vtkTableFFT() override;
int RequestData(vtkInformation *request,
vtkInformationVector **inputVector,
- vtkInformationVector *outputVector) VTK_OVERRIDE;
+ vtkInformationVector *outputVector) override;
/**
* Perform the FFT on the given data array.
diff --git a/Imaging/General/vtkImageAnisotropicDiffusion2D.h b/Imaging/General/vtkImageAnisotropicDiffusion2D.h
index 1a93ef808e7db8a752abf0ae97873473ac2933cb..7efbc4d6eed01d6f5f458e9481fc670a64e279a7 100644
--- a/Imaging/General/vtkImageAnisotropicDiffusion2D.h
+++ b/Imaging/General/vtkImageAnisotropicDiffusion2D.h
@@ -48,7 +48,7 @@ class VTKIMAGINGGENERAL_EXPORT vtkImageAnisotropicDiffusion2D : public vtkImageS
public:
static vtkImageAnisotropicDiffusion2D *New();
vtkTypeMacro(vtkImageAnisotropicDiffusion2D,vtkImageSpatialAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* This method sets the number of interations which also affects the
@@ -113,7 +113,7 @@ public:
protected:
vtkImageAnisotropicDiffusion2D();
- ~vtkImageAnisotropicDiffusion2D()VTK_OVERRIDE {}
+ ~vtkImageAnisotropicDiffusion2D() override {}
int NumberOfIterations;
double DiffusionThreshold;
@@ -129,7 +129,7 @@ protected:
vtkInformationVector **inputVector,
vtkInformationVector *outputVector,
vtkImageData ***inData, vtkImageData **outData,
- int extent[6], int id) VTK_OVERRIDE;
+ int extent[6], int id) override;
void Iterate(vtkImageData *in, vtkImageData *out,
double ar0, double ar1, int *coreExtent, int count);
private:
diff --git a/Imaging/General/vtkImageAnisotropicDiffusion3D.h b/Imaging/General/vtkImageAnisotropicDiffusion3D.h
index b86ddb1becd607db534a0f48ec8cd2b4e4d85867..f1ad5464f2d5393cb2434ee25cb983fd0dc835c0 100644
--- a/Imaging/General/vtkImageAnisotropicDiffusion3D.h
+++ b/Imaging/General/vtkImageAnisotropicDiffusion3D.h
@@ -50,7 +50,7 @@ class VTKIMAGINGGENERAL_EXPORT vtkImageAnisotropicDiffusion3D : public vtkImageS
public:
static vtkImageAnisotropicDiffusion3D *New();
vtkTypeMacro(vtkImageAnisotropicDiffusion3D,vtkImageSpatialAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
@@ -114,7 +114,7 @@ public:
protected:
vtkImageAnisotropicDiffusion3D();
- ~vtkImageAnisotropicDiffusion3D()VTK_OVERRIDE {}
+ ~vtkImageAnisotropicDiffusion3D() override {}
int NumberOfIterations;
double DiffusionThreshold;
@@ -130,7 +130,7 @@ protected:
vtkInformationVector **inputVector,
vtkInformationVector *outputVector,
vtkImageData ***inData, vtkImageData **outData,
- int extent[6], int id) VTK_OVERRIDE;
+ int extent[6], int id) override;
void Iterate(vtkImageData *in, vtkImageData *out,
double ar0, double ar1, double ar3, int *coreExtent, int count);
private:
diff --git a/Imaging/General/vtkImageCheckerboard.h b/Imaging/General/vtkImageCheckerboard.h
index 7d67526a24be5c3ce033e1a864fb21c09ed9d098..e5b778d9f1373990113475fe70e6b8505b6285eb 100644
--- a/Imaging/General/vtkImageCheckerboard.h
+++ b/Imaging/General/vtkImageCheckerboard.h
@@ -35,7 +35,7 @@ class VTKIMAGINGGENERAL_EXPORT vtkImageCheckerboard : public vtkThreadedImageAlg
public:
static vtkImageCheckerboard *New();
vtkTypeMacro(vtkImageCheckerboard,vtkThreadedImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -53,14 +53,14 @@ public:
protected:
vtkImageCheckerboard();
- ~vtkImageCheckerboard()VTK_OVERRIDE {}
+ ~vtkImageCheckerboard() override {}
void ThreadedRequestData(vtkInformation *request,
vtkInformationVector **inputVector,
vtkInformationVector *outputVector,
vtkImageData ***inData,
vtkImageData **outData,
- int extent[6], int threadId) VTK_OVERRIDE;
+ int extent[6], int threadId) override;
int NumberOfDivisions[3];
private:
vtkImageCheckerboard(const vtkImageCheckerboard&) VTK_DELETE_FUNCTION;
diff --git a/Imaging/General/vtkImageCityBlockDistance.h b/Imaging/General/vtkImageCityBlockDistance.h
index 095e12be957b3f8139a4773d6afe50104fa4e9eb..db7e334edf810aff9085944f0b98fe8160ade8f0 100644
--- a/Imaging/General/vtkImageCityBlockDistance.h
+++ b/Imaging/General/vtkImageCityBlockDistance.h
@@ -44,13 +44,13 @@ public:
protected:
vtkImageCityBlockDistance();
- ~vtkImageCityBlockDistance()VTK_OVERRIDE {}
+ ~vtkImageCityBlockDistance() override {}
int IterativeRequestUpdateExtent(vtkInformation* in,
- vtkInformation* out) VTK_OVERRIDE;
+ vtkInformation* out) override;
int IterativeRequestData(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
void AllocateOutputScalars(vtkImageData *outData,
int* updateExtent,
diff --git a/Imaging/General/vtkImageConvolve.h b/Imaging/General/vtkImageConvolve.h
index 67bfc03b484589ce4edbdef45612f909b6480c31..c147394e671df63568a91a6968268cd2f890affc 100644
--- a/Imaging/General/vtkImageConvolve.h
+++ b/Imaging/General/vtkImageConvolve.h
@@ -36,7 +36,7 @@ public:
*/
static vtkImageConvolve *New();
vtkTypeMacro(vtkImageConvolve,vtkThreadedImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -92,13 +92,13 @@ public:
protected:
vtkImageConvolve();
- ~vtkImageConvolve() VTK_OVERRIDE;
+ ~vtkImageConvolve() override;
void ThreadedRequestData(vtkInformation *request,
vtkInformationVector **inputVector,
vtkInformationVector *outputVector,
vtkImageData ***inData, vtkImageData **outData,
- int outExt[6], int id) VTK_OVERRIDE;
+ int outExt[6], int id) override;
void GetKernel(double *kernel);
double* GetKernel();
diff --git a/Imaging/General/vtkImageCorrelation.h b/Imaging/General/vtkImageCorrelation.h
index e902355f1e428c697efb6d1ecc1a40c339269a48..ca4ac24c8820d092190f38b14aa95211126a658d 100644
--- a/Imaging/General/vtkImageCorrelation.h
+++ b/Imaging/General/vtkImageCorrelation.h
@@ -37,7 +37,7 @@ class VTKIMAGINGGENERAL_EXPORT vtkImageCorrelation : public vtkThreadedImageAlgo
public:
static vtkImageCorrelation *New();
vtkTypeMacro(vtkImageCorrelation,vtkThreadedImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -60,22 +60,22 @@ public:
protected:
vtkImageCorrelation();
- ~vtkImageCorrelation()VTK_OVERRIDE {}
+ ~vtkImageCorrelation() override {}
int Dimensionality;
int RequestInformation (vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
int RequestUpdateExtent(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
void ThreadedRequestData(vtkInformation *request,
vtkInformationVector **inputVector,
vtkInformationVector *outputVector,
vtkImageData ***inData,
vtkImageData **outData,
- int extent[6], int threadId) VTK_OVERRIDE;
+ int extent[6], int threadId) override;
private:
vtkImageCorrelation(const vtkImageCorrelation&) VTK_DELETE_FUNCTION;
diff --git a/Imaging/General/vtkImageEuclideanDistance.h b/Imaging/General/vtkImageEuclideanDistance.h
index 26102f0232c185c67ef2ca15f8d70889c1fcf24c..0981c6c0f3381c9739f9252337da83eae6587a8b 100644
--- a/Imaging/General/vtkImageEuclideanDistance.h
+++ b/Imaging/General/vtkImageEuclideanDistance.h
@@ -56,7 +56,7 @@ class VTKIMAGINGGENERAL_EXPORT vtkImageEuclideanDistance : public vtkImageDecomp
public:
static vtkImageEuclideanDistance *New();
vtkTypeMacro(vtkImageEuclideanDistance,vtkImageDecomposeFilter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -106,11 +106,11 @@ public:
int IterativeRequestData(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
protected:
vtkImageEuclideanDistance();
- ~vtkImageEuclideanDistance()VTK_OVERRIDE {}
+ ~vtkImageEuclideanDistance() override {}
double MaximumDistance;
int Initialize;
@@ -123,9 +123,9 @@ protected:
vtkInformation* outInfo);
int IterativeRequestInformation(vtkInformation* in,
- vtkInformation* out) VTK_OVERRIDE;
+ vtkInformation* out) override;
int IterativeRequestUpdateExtent(vtkInformation* in,
- vtkInformation* out) VTK_OVERRIDE;
+ vtkInformation* out) override;
private:
vtkImageEuclideanDistance(const vtkImageEuclideanDistance&) VTK_DELETE_FUNCTION;
diff --git a/Imaging/General/vtkImageEuclideanToPolar.h b/Imaging/General/vtkImageEuclideanToPolar.h
index 7138ae152106c484d51d5cffbd0aa74a445f1070..a89d931f1d1ef9f396781361b222e652a732defc 100644
--- a/Imaging/General/vtkImageEuclideanToPolar.h
+++ b/Imaging/General/vtkImageEuclideanToPolar.h
@@ -33,7 +33,7 @@ public:
static vtkImageEuclideanToPolar *New();
vtkTypeMacro(vtkImageEuclideanToPolar,
vtkThreadedImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -47,12 +47,12 @@ public:
protected:
vtkImageEuclideanToPolar();
- ~vtkImageEuclideanToPolar()VTK_OVERRIDE {}
+ ~vtkImageEuclideanToPolar() override {}
double ThetaMaximum;
void ThreadedExecute (vtkImageData *inData, vtkImageData *outData,
- int ext[6], int id) VTK_OVERRIDE;
+ int ext[6], int id) override;
private:
vtkImageEuclideanToPolar(const vtkImageEuclideanToPolar&) VTK_DELETE_FUNCTION;
void operator=(const vtkImageEuclideanToPolar&) VTK_DELETE_FUNCTION;
diff --git a/Imaging/General/vtkImageGaussianSmooth.h b/Imaging/General/vtkImageGaussianSmooth.h
index dffa44ffe361b66160f776456f6c1578b7851dd7..e1f19e7f7699f25f706395c6ee489386a444d28c 100644
--- a/Imaging/General/vtkImageGaussianSmooth.h
+++ b/Imaging/General/vtkImageGaussianSmooth.h
@@ -31,7 +31,7 @@ class VTKIMAGINGGENERAL_EXPORT vtkImageGaussianSmooth : public vtkThreadedImageA
{
public:
vtkTypeMacro(vtkImageGaussianSmooth,vtkThreadedImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Creates an instance of vtkImageGaussianSmooth with the following
@@ -86,14 +86,14 @@ public:
protected:
vtkImageGaussianSmooth();
- ~vtkImageGaussianSmooth() VTK_OVERRIDE;
+ ~vtkImageGaussianSmooth() override;
int Dimensionality;
double StandardDeviations[3];
double RadiusFactors[3];
void ComputeKernel(double *kernel, int min, int max, double std);
- int RequestUpdateExtent (vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestUpdateExtent (vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
void InternalRequestUpdateExtent(int *, int*);
void ExecuteAxis(int axis, vtkImageData *inData, int inExt[6],
vtkImageData *outData, int outExt[6],
@@ -103,7 +103,7 @@ protected:
vtkInformationVector **inputVector,
vtkInformationVector *outputVector,
vtkImageData ***inData, vtkImageData **outData,
- int outExt[6], int id) VTK_OVERRIDE;
+ int outExt[6], int id) override;
private:
vtkImageGaussianSmooth(const vtkImageGaussianSmooth&) VTK_DELETE_FUNCTION;
diff --git a/Imaging/General/vtkImageGradient.h b/Imaging/General/vtkImageGradient.h
index df5c04a99f0afd3969e7e473c23640c7b23493c9..bc39001ec309638c5e71b2cd25b034a49a4d3110 100644
--- a/Imaging/General/vtkImageGradient.h
+++ b/Imaging/General/vtkImageGradient.h
@@ -34,7 +34,7 @@ class VTKIMAGINGGENERAL_EXPORT vtkImageGradient : public vtkThreadedImageAlgorit
public:
static vtkImageGradient *New();
vtkTypeMacro(vtkImageGradient,vtkThreadedImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -58,20 +58,20 @@ public:
protected:
vtkImageGradient();
- ~vtkImageGradient()VTK_OVERRIDE {}
+ ~vtkImageGradient() override {}
int HandleBoundaries;
int Dimensionality;
int RequestInformation (vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
int RequestUpdateExtent(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
int RequestData(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
void ThreadedRequestData(vtkInformation*,
vtkInformationVector**,
@@ -79,7 +79,7 @@ protected:
vtkImageData*** inData,
vtkImageData** outData,
int outExt[6],
- int threadId) VTK_OVERRIDE;
+ int threadId) override;
private:
vtkImageGradient(const vtkImageGradient&) VTK_DELETE_FUNCTION;
void operator=(const vtkImageGradient&) VTK_DELETE_FUNCTION;
diff --git a/Imaging/General/vtkImageGradientMagnitude.h b/Imaging/General/vtkImageGradientMagnitude.h
index 98968df711e8763bd36836c1cb6089ee10b80559..afbc0c8c19071125c0dc77a4cdc7bdd4a2fb37e7 100644
--- a/Imaging/General/vtkImageGradientMagnitude.h
+++ b/Imaging/General/vtkImageGradientMagnitude.h
@@ -37,7 +37,7 @@ class VTKIMAGINGGENERAL_EXPORT vtkImageGradientMagnitude : public vtkThreadedIma
public:
static vtkImageGradientMagnitude *New();
vtkTypeMacro(vtkImageGradientMagnitude,vtkThreadedImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -59,20 +59,20 @@ public:
protected:
vtkImageGradientMagnitude();
- ~vtkImageGradientMagnitude()VTK_OVERRIDE {}
+ ~vtkImageGradientMagnitude() override {}
int HandleBoundaries;
int Dimensionality;
int RequestInformation (vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
int RequestUpdateExtent(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
void ThreadedExecute (vtkImageData *inData, vtkImageData *outData,
- int extent[6], int id) VTK_OVERRIDE;
+ int extent[6], int id) override;
private:
vtkImageGradientMagnitude(const vtkImageGradientMagnitude&) VTK_DELETE_FUNCTION;
void operator=(const vtkImageGradientMagnitude&) VTK_DELETE_FUNCTION;
diff --git a/Imaging/General/vtkImageHybridMedian2D.h b/Imaging/General/vtkImageHybridMedian2D.h
index 63a918bcb0efe9317e9ad8968adbf47f472c18a2..acf07761962493fa4f19b0dcb5b60e738d10b1c4 100644
--- a/Imaging/General/vtkImageHybridMedian2D.h
+++ b/Imaging/General/vtkImageHybridMedian2D.h
@@ -39,13 +39,13 @@ public:
protected:
vtkImageHybridMedian2D();
- ~vtkImageHybridMedian2D()VTK_OVERRIDE {}
+ ~vtkImageHybridMedian2D() override {}
void ThreadedRequestData(vtkInformation *request,
vtkInformationVector **inputVector,
vtkInformationVector *outputVector,
vtkImageData ***inData, vtkImageData **outData,
- int outExt[6], int id) VTK_OVERRIDE;
+ int outExt[6], int id) override;
private:
vtkImageHybridMedian2D(const vtkImageHybridMedian2D&) VTK_DELETE_FUNCTION;
void operator=(const vtkImageHybridMedian2D&) VTK_DELETE_FUNCTION;
diff --git a/Imaging/General/vtkImageLaplacian.h b/Imaging/General/vtkImageLaplacian.h
index c2382769bcf261db2b4b029eda99316cb4d6be20..9b0524bd78d38f1ebc48dd5ac695d89b2a1279b1 100644
--- a/Imaging/General/vtkImageLaplacian.h
+++ b/Imaging/General/vtkImageLaplacian.h
@@ -36,7 +36,7 @@ class VTKIMAGINGGENERAL_EXPORT vtkImageLaplacian : public vtkThreadedImageAlgori
public:
static vtkImageLaplacian *New();
vtkTypeMacro(vtkImageLaplacian,vtkThreadedImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -48,17 +48,17 @@ public:
protected:
vtkImageLaplacian();
- ~vtkImageLaplacian()VTK_OVERRIDE {}
+ ~vtkImageLaplacian() override {}
int Dimensionality;
int RequestUpdateExtent (vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
void ThreadedRequestData(vtkInformation *request,
vtkInformationVector **inputVector,
vtkInformationVector *outputVector,
vtkImageData ***inData, vtkImageData **outData,
- int outExt[6], int id) VTK_OVERRIDE;
+ int outExt[6], int id) override;
private:
vtkImageLaplacian(const vtkImageLaplacian&) VTK_DELETE_FUNCTION;
diff --git a/Imaging/General/vtkImageMedian3D.h b/Imaging/General/vtkImageMedian3D.h
index 691bc952141f1db7f846c5a1fc1cc10fb34e3d50..ef4bd62d00e99958e40ea7be698881b599cfc186 100644
--- a/Imaging/General/vtkImageMedian3D.h
+++ b/Imaging/General/vtkImageMedian3D.h
@@ -35,7 +35,7 @@ class VTKIMAGINGGENERAL_EXPORT vtkImageMedian3D : public vtkImageSpatialAlgorith
public:
static vtkImageMedian3D *New();
vtkTypeMacro(vtkImageMedian3D,vtkImageSpatialAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* This method sets the size of the neighborhood. It also sets the
@@ -52,7 +52,7 @@ public:
protected:
vtkImageMedian3D();
- ~vtkImageMedian3D() VTK_OVERRIDE;
+ ~vtkImageMedian3D() override;
int NumberOfElements;
@@ -60,7 +60,7 @@ protected:
vtkInformationVector **inputVector,
vtkInformationVector *outputVector,
vtkImageData ***inData, vtkImageData **outData,
- int extent[6], int id) VTK_OVERRIDE;
+ int extent[6], int id) override;
private:
vtkImageMedian3D(const vtkImageMedian3D&) VTK_DELETE_FUNCTION;
diff --git a/Imaging/General/vtkImageNormalize.h b/Imaging/General/vtkImageNormalize.h
index 45e2b840d5131d04b3d2c3e8ac6ccc598b153345..e630525b33f358f6dfb0895c8fe898f397160022 100644
--- a/Imaging/General/vtkImageNormalize.h
+++ b/Imaging/General/vtkImageNormalize.h
@@ -36,12 +36,12 @@ public:
protected:
vtkImageNormalize();
- ~vtkImageNormalize()VTK_OVERRIDE {}
+ ~vtkImageNormalize() override {}
- int RequestInformation (vtkInformation *, vtkInformationVector**, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestInformation (vtkInformation *, vtkInformationVector**, vtkInformationVector *) override;
void ThreadedExecute (vtkImageData *inData, vtkImageData *outData,
- int extent[6], int id) VTK_OVERRIDE;
+ int extent[6], int id) override;
private:
vtkImageNormalize(const vtkImageNormalize&) VTK_DELETE_FUNCTION;
void operator=(const vtkImageNormalize&) VTK_DELETE_FUNCTION;
diff --git a/Imaging/General/vtkImageRange3D.h b/Imaging/General/vtkImageRange3D.h
index 196c79a5b8651e31e8d601dae59081f7fc5678ea..5ba6c539a8b4f466b01919eeff733352e1d097b8 100644
--- a/Imaging/General/vtkImageRange3D.h
+++ b/Imaging/General/vtkImageRange3D.h
@@ -35,7 +35,7 @@ class VTKIMAGINGGENERAL_EXPORT vtkImageRange3D : public vtkImageSpatialAlgorithm
public:
static vtkImageRange3D *New();
vtkTypeMacro(vtkImageRange3D,vtkImageSpatialAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* This method sets the size of the neighborhood. It also sets the
@@ -45,21 +45,21 @@ public:
protected:
vtkImageRange3D();
- ~vtkImageRange3D() VTK_OVERRIDE;
+ ~vtkImageRange3D() override;
vtkImageEllipsoidSource *Ellipse;
int RequestInformation (vtkInformation *request,
vtkInformationVector **inputVector,
- vtkInformationVector *outputVector) VTK_OVERRIDE;
+ vtkInformationVector *outputVector) override;
void ThreadedRequestData(vtkInformation *request,
vtkInformationVector **inputVector,
vtkInformationVector *outputVector,
vtkImageData ***inData, vtkImageData **outData,
- int extent[6], int id) VTK_OVERRIDE;
+ int extent[6], int id) override;
int RequestData(vtkInformation *request,
vtkInformationVector **inputVector,
- vtkInformationVector *outputVector) VTK_OVERRIDE;
+ vtkInformationVector *outputVector) override;
private:
vtkImageRange3D(const vtkImageRange3D&) VTK_DELETE_FUNCTION;
diff --git a/Imaging/General/vtkImageSeparableConvolution.h b/Imaging/General/vtkImageSeparableConvolution.h
index 3d20837a4b04f32d0e655f45b79d05f37149be49..a967fa4b775223ede02f7bd23eeedde1d45867e3 100644
--- a/Imaging/General/vtkImageSeparableConvolution.h
+++ b/Imaging/General/vtkImageSeparableConvolution.h
@@ -57,17 +57,17 @@ public:
virtual void SetZKernel(vtkFloatArray*);
vtkGetObjectMacro ( ZKernel, vtkFloatArray );
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Overload standard modified time function. If kernel arrays are modified,
* then this object is modified as well.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
protected:
vtkImageSeparableConvolution();
- ~vtkImageSeparableConvolution() VTK_OVERRIDE;
+ ~vtkImageSeparableConvolution() override;
vtkFloatArray* XKernel;
vtkFloatArray* YKernel;
@@ -75,12 +75,12 @@ protected:
int IterativeRequestData(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
int IterativeRequestInformation(vtkInformation* in,
- vtkInformation* out) VTK_OVERRIDE;
+ vtkInformation* out) override;
int IterativeRequestUpdateExtent(vtkInformation* in,
- vtkInformation* out) VTK_OVERRIDE;
+ vtkInformation* out) override;
private:
vtkImageSeparableConvolution(const vtkImageSeparableConvolution&) VTK_DELETE_FUNCTION;
diff --git a/Imaging/General/vtkImageSlab.h b/Imaging/General/vtkImageSlab.h
index 42de2112013e2fe263e18fc0264517b1f88c912d..29b7796993ca2f8bd5ae868d1d0a3d8431ebb5e8 100644
--- a/Imaging/General/vtkImageSlab.h
+++ b/Imaging/General/vtkImageSlab.h
@@ -36,7 +36,7 @@ class VTKIMAGINGGENERAL_EXPORT vtkImageSlab : public vtkThreadedImageAlgorithm
public:
static vtkImageSlab *New();
vtkTypeMacro(vtkImageSlab, vtkThreadedImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -123,17 +123,17 @@ public:
protected:
vtkImageSlab();
- ~vtkImageSlab() VTK_OVERRIDE;
+ ~vtkImageSlab() override;
int RequestInformation(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
int RequestUpdateExtent(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
void ThreadedRequestData(vtkInformation *request,
vtkInformationVector **inputVector,
vtkInformationVector *outputVector,
vtkImageData ***inData,
- vtkImageData **outData, int ext[6], int id) VTK_OVERRIDE;
+ vtkImageData **outData, int ext[6], int id) override;
vtkSetMacro(OutputScalarType, int);
diff --git a/Imaging/General/vtkImageSlabReslice.h b/Imaging/General/vtkImageSlabReslice.h
index ac95a270e40ce6eb3d66a1ef73a5952b666a1c25..1e50aa636e8945a722adbd9d7097e29fe36ed3bd 100644
--- a/Imaging/General/vtkImageSlabReslice.h
+++ b/Imaging/General/vtkImageSlabReslice.h
@@ -57,7 +57,7 @@ public:
/**
* Printself method.
*/
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -99,7 +99,7 @@ public:
protected:
vtkImageSlabReslice();
- ~vtkImageSlabReslice() VTK_OVERRIDE;
+ ~vtkImageSlabReslice() override;
/**
* This method simply calls the superclass method. In addition, it also
@@ -107,7 +107,7 @@ protected:
* SlabResolution.
*/
int RequestInformation(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
int BlendMode; // can be MIN, MIP, MAX
double SlabThickness;
diff --git a/Imaging/General/vtkImageSobel2D.h b/Imaging/General/vtkImageSobel2D.h
index 9d2d222ea168aefbd9800c047f72b56e81c90a7a..ce622c145468a2c5e48fb94c3930bf185055908a 100644
--- a/Imaging/General/vtkImageSobel2D.h
+++ b/Imaging/General/vtkImageSobel2D.h
@@ -33,20 +33,20 @@ class VTKIMAGINGGENERAL_EXPORT vtkImageSobel2D : public vtkImageSpatialAlgorithm
public:
static vtkImageSobel2D *New();
vtkTypeMacro(vtkImageSobel2D,vtkImageSpatialAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkImageSobel2D();
- ~vtkImageSobel2D()VTK_OVERRIDE {}
+ ~vtkImageSobel2D() override {}
void ThreadedRequestData(vtkInformation *request,
vtkInformationVector **inputVector,
vtkInformationVector *outputVector,
vtkImageData ***inData, vtkImageData **outData,
- int outExt[6], int id) VTK_OVERRIDE;
+ int outExt[6], int id) override;
int RequestInformation (vtkInformation *request,
vtkInformationVector **inputVector,
- vtkInformationVector *outputVector) VTK_OVERRIDE;
+ vtkInformationVector *outputVector) override;
private:
vtkImageSobel2D(const vtkImageSobel2D&) VTK_DELETE_FUNCTION;
diff --git a/Imaging/General/vtkImageSobel3D.h b/Imaging/General/vtkImageSobel3D.h
index 87364ad02c66676647182d08fe45da4b94935f13..c2900794ce36c135b15cdb039c7b3f6f83b674ce 100644
--- a/Imaging/General/vtkImageSobel3D.h
+++ b/Imaging/General/vtkImageSobel3D.h
@@ -34,20 +34,20 @@ class VTKIMAGINGGENERAL_EXPORT vtkImageSobel3D : public vtkImageSpatialAlgorithm
public:
static vtkImageSobel3D *New();
vtkTypeMacro(vtkImageSobel3D,vtkImageSpatialAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkImageSobel3D();
- ~vtkImageSobel3D()VTK_OVERRIDE {}
+ ~vtkImageSobel3D() override {}
void ThreadedRequestData(vtkInformation *request,
vtkInformationVector **inputVector,
vtkInformationVector *outputVector,
vtkImageData ***inData, vtkImageData **outData,
- int outExt[6], int id) VTK_OVERRIDE;
+ int outExt[6], int id) override;
int RequestInformation (vtkInformation *request,
vtkInformationVector **inputVector,
- vtkInformationVector *outputVector) VTK_OVERRIDE;
+ vtkInformationVector *outputVector) override;
private:
vtkImageSobel3D(const vtkImageSobel3D&) VTK_DELETE_FUNCTION;
diff --git a/Imaging/General/vtkImageSpatialAlgorithm.h b/Imaging/General/vtkImageSpatialAlgorithm.h
index df5d401fda53a4af6aa68697321930c8a043405c..b1ffafe567a29f6f90fe7f38feb0c64c9a8e6ad8 100644
--- a/Imaging/General/vtkImageSpatialAlgorithm.h
+++ b/Imaging/General/vtkImageSpatialAlgorithm.h
@@ -36,7 +36,7 @@ class VTKIMAGINGGENERAL_EXPORT vtkImageSpatialAlgorithm : public vtkThreadedImag
public:
static vtkImageSpatialAlgorithm *New();
vtkTypeMacro(vtkImageSpatialAlgorithm,vtkThreadedImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -54,16 +54,16 @@ public:
protected:
vtkImageSpatialAlgorithm();
- ~vtkImageSpatialAlgorithm()VTK_OVERRIDE {}
+ ~vtkImageSpatialAlgorithm() override {}
int KernelSize[3];
int KernelMiddle[3]; // Index of kernel origin
int HandleBoundaries; // Output shrinks if boundaries aren't handled
- int RequestInformation (vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestInformation (vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
void ComputeOutputWholeExtent(int extent[6], int handleBoundaries);
- int RequestUpdateExtent(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestUpdateExtent(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
void InternalRequestUpdateExtent(int *extent, int *inExtent, int *wholeExtent);
private:
diff --git a/Imaging/General/vtkImageVariance3D.h b/Imaging/General/vtkImageVariance3D.h
index ded359df3342c1ab1a84a0d04e0c5bff38861fb2..510e300c97a743e5e5ac9aa5843bd4ad38e6a31d 100644
--- a/Imaging/General/vtkImageVariance3D.h
+++ b/Imaging/General/vtkImageVariance3D.h
@@ -38,7 +38,7 @@ class VTKIMAGINGGENERAL_EXPORT vtkImageVariance3D : public vtkImageSpatialAlgori
public:
static vtkImageVariance3D *New();
vtkTypeMacro(vtkImageVariance3D,vtkImageSpatialAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* This method sets the size of the neighborhood. It also sets the default
@@ -48,22 +48,22 @@ public:
protected:
vtkImageVariance3D();
- ~vtkImageVariance3D() VTK_OVERRIDE;
+ ~vtkImageVariance3D() override;
vtkImageEllipsoidSource *Ellipse;
int RequestInformation (vtkInformation *request,
vtkInformationVector **inputVector,
- vtkInformationVector *outputVector) VTK_OVERRIDE;
+ vtkInformationVector *outputVector) override;
void ThreadedRequestData(vtkInformation *request,
vtkInformationVector **inputVector,
vtkInformationVector *outputVector,
vtkImageData ***inData, vtkImageData **outData,
- int extent[6], int id) VTK_OVERRIDE;
+ int extent[6], int id) override;
int RequestData(vtkInformation *request,
vtkInformationVector **inputVector,
- vtkInformationVector *outputVector) VTK_OVERRIDE;
+ vtkInformationVector *outputVector) override;
private:
vtkImageVariance3D(const vtkImageVariance3D&) VTK_DELETE_FUNCTION;
diff --git a/Imaging/General/vtkSimpleImageFilterExample.h b/Imaging/General/vtkSimpleImageFilterExample.h
index 1ebab108b1b13b98f29ee72c0c4c76acfd75e210..1cc95a9e87f810b238d1b432e3c426b71de598d0 100644
--- a/Imaging/General/vtkSimpleImageFilterExample.h
+++ b/Imaging/General/vtkSimpleImageFilterExample.h
@@ -38,9 +38,9 @@ public:
protected:
vtkSimpleImageFilterExample() {}
- ~vtkSimpleImageFilterExample()VTK_OVERRIDE {}
+ ~vtkSimpleImageFilterExample() override {}
- void SimpleExecute(vtkImageData* input, vtkImageData* output) VTK_OVERRIDE;
+ void SimpleExecute(vtkImageData* input, vtkImageData* output) override;
private:
vtkSimpleImageFilterExample(const vtkSimpleImageFilterExample&) VTK_DELETE_FUNCTION;
void operator=(const vtkSimpleImageFilterExample&) VTK_DELETE_FUNCTION;
diff --git a/Imaging/Hybrid/vtkBooleanTexture.h b/Imaging/Hybrid/vtkBooleanTexture.h
index 5f791ba07ac153886da4c5c33ae6edcd01e30c26..2535f7ecc46aa5dee71e03277b4a9a36661ac3ba 100644
--- a/Imaging/Hybrid/vtkBooleanTexture.h
+++ b/Imaging/Hybrid/vtkBooleanTexture.h
@@ -53,7 +53,7 @@ public:
static vtkBooleanTexture *New();
vtkTypeMacro(vtkBooleanTexture,vtkImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -153,10 +153,10 @@ public:
protected:
vtkBooleanTexture();
- ~vtkBooleanTexture() VTK_OVERRIDE {}
+ ~vtkBooleanTexture() override {}
- int RequestInformation (vtkInformation *, vtkInformationVector**, vtkInformationVector *) VTK_OVERRIDE;
- void ExecuteDataWithInformation(vtkDataObject *data, vtkInformation* outInfo) VTK_OVERRIDE;
+ int RequestInformation (vtkInformation *, vtkInformationVector**, vtkInformationVector *) override;
+ void ExecuteDataWithInformation(vtkDataObject *data, vtkInformation* outInfo) override;
int XSize;
int YSize;
diff --git a/Imaging/Hybrid/vtkCheckerboardSplatter.h b/Imaging/Hybrid/vtkCheckerboardSplatter.h
index d840fd470b8aa4d69f81af51442f737391b125b6..d4f56a0700066399fd480d08246e762aacff4916 100644
--- a/Imaging/Hybrid/vtkCheckerboardSplatter.h
+++ b/Imaging/Hybrid/vtkCheckerboardSplatter.h
@@ -109,7 +109,7 @@ class VTKIMAGINGHYBRID_EXPORT vtkCheckerboardSplatter : public vtkImageAlgorithm
{
public:
vtkTypeMacro(vtkCheckerboardSplatter,vtkImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct object with dimensions=(50,50,50); automatic computation of
@@ -317,15 +317,15 @@ public:
protected:
vtkCheckerboardSplatter();
- ~vtkCheckerboardSplatter() VTK_OVERRIDE {}
+ ~vtkCheckerboardSplatter() override {}
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
int RequestInformation (vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
int RequestData(vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
int OutputScalarType; //the type of output scalars
int SampleDimensions[3]; // dimensions of volume to splat into
diff --git a/Imaging/Hybrid/vtkFastSplatter.h b/Imaging/Hybrid/vtkFastSplatter.h
index 42cbd20e21dcccc1e5ff210c6b853650c8a0f9cd..ef814d53cc5a18baba89121ce8a530e8fda87467 100644
--- a/Imaging/Hybrid/vtkFastSplatter.h
+++ b/Imaging/Hybrid/vtkFastSplatter.h
@@ -53,7 +53,7 @@ class VTKIMAGINGHYBRID_EXPORT vtkFastSplatter : public vtkImageAlgorithm
public:
vtkTypeMacro(vtkFastSplatter, vtkImageAlgorithm);
static vtkFastSplatter *New();
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
//@{
/**
@@ -118,7 +118,7 @@ public:
protected:
vtkFastSplatter();
- ~vtkFastSplatter() VTK_OVERRIDE;
+ ~vtkFastSplatter() override;
double ModelBounds[6];
int OutputDimensions[3];
@@ -130,16 +130,16 @@ protected:
vtkImageData *Buckets;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
int RequestInformation(vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
int RequestUpdateExtent(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
int RequestData(vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
// Used internally for converting points in world space to indices in
// the output image.
diff --git a/Imaging/Hybrid/vtkGaussianSplatter.h b/Imaging/Hybrid/vtkGaussianSplatter.h
index 276f5bbeb356a27916924d42fc33896c1daa2e32..04f843a315ccec3d27fb4518c2989f3813408025 100644
--- a/Imaging/Hybrid/vtkGaussianSplatter.h
+++ b/Imaging/Hybrid/vtkGaussianSplatter.h
@@ -88,7 +88,7 @@ class VTKIMAGINGHYBRID_EXPORT vtkGaussianSplatter : public vtkImageAlgorithm
{
public:
vtkTypeMacro(vtkGaussianSplatter,vtkImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct object with dimensions=(50,50,50); automatic computation of
@@ -284,15 +284,15 @@ public:
protected:
vtkGaussianSplatter();
- ~vtkGaussianSplatter() VTK_OVERRIDE {}
+ ~vtkGaussianSplatter() override {}
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
int RequestInformation (vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
int RequestData(vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
void Cap(vtkDoubleArray *s);
int SampleDimensions[3]; // dimensions of volume to splat into
diff --git a/Imaging/Hybrid/vtkImageCursor3D.h b/Imaging/Hybrid/vtkImageCursor3D.h
index c0cc3e2efe6bcdb0e45c439cf5785ac58e06d288..8be63c850e478229527cd81e16be111285e7689f 100644
--- a/Imaging/Hybrid/vtkImageCursor3D.h
+++ b/Imaging/Hybrid/vtkImageCursor3D.h
@@ -30,7 +30,7 @@ class VTKIMAGINGHYBRID_EXPORT vtkImageCursor3D : public vtkImageInPlaceFilter
public:
static vtkImageCursor3D *New();
vtkTypeMacro(vtkImageCursor3D,vtkImageInPlaceFilter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
@@ -61,7 +61,7 @@ public:
protected:
vtkImageCursor3D();
- ~vtkImageCursor3D() VTK_OVERRIDE {}
+ ~vtkImageCursor3D() override {}
double CursorPosition[3];
double CursorValue;
@@ -69,7 +69,7 @@ protected:
int RequestData(vtkInformation *request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
private:
vtkImageCursor3D(const vtkImageCursor3D&) VTK_DELETE_FUNCTION;
diff --git a/Imaging/Hybrid/vtkImageRectilinearWipe.h b/Imaging/Hybrid/vtkImageRectilinearWipe.h
index 76d89e2250870f37fa6ad0214e520813fda986a6..ccac3e21de1e09021c331bd7a726438a0d4699d1 100644
--- a/Imaging/Hybrid/vtkImageRectilinearWipe.h
+++ b/Imaging/Hybrid/vtkImageRectilinearWipe.h
@@ -63,7 +63,7 @@ class VTKIMAGINGHYBRID_EXPORT vtkImageRectilinearWipe : public vtkThreadedImageA
public:
static vtkImageRectilinearWipe *New();
vtkTypeMacro(vtkImageRectilinearWipe,vtkThreadedImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -128,14 +128,14 @@ public:
protected:
vtkImageRectilinearWipe();
- ~vtkImageRectilinearWipe() VTK_OVERRIDE {}
+ ~vtkImageRectilinearWipe() override {}
void ThreadedRequestData(vtkInformation *request,
vtkInformationVector **inputVector,
vtkInformationVector *outputVector,
vtkImageData ***inData,
vtkImageData **outData,
- int extent[6], int threadId) VTK_OVERRIDE;
+ int extent[6], int threadId) override;
int Position[2];
int Wipe;
diff --git a/Imaging/Hybrid/vtkImageToPoints.h b/Imaging/Hybrid/vtkImageToPoints.h
index 566caeab3a86b86f67181646d11d824695cecc08..135ceda6608d121601dc06fc4da14f3585d20767 100644
--- a/Imaging/Hybrid/vtkImageToPoints.h
+++ b/Imaging/Hybrid/vtkImageToPoints.h
@@ -39,7 +39,7 @@ class VTKIMAGINGHYBRID_EXPORT vtkImageToPoints :
public:
static vtkImageToPoints *New();
vtkTypeMacro(vtkImageToPoints,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -62,22 +62,22 @@ public:
protected:
vtkImageToPoints();
- ~vtkImageToPoints() VTK_OVERRIDE;
+ ~vtkImageToPoints() override;
int RequestInformation(vtkInformation *request,
vtkInformationVector **inInfo,
- vtkInformationVector *outInfo) VTK_OVERRIDE;
+ vtkInformationVector *outInfo) override;
int RequestUpdateExtent(vtkInformation *request,
vtkInformationVector **inInfo,
- vtkInformationVector *outInfo) VTK_OVERRIDE;
+ vtkInformationVector *outInfo) override;
int RequestData(vtkInformation *request,
vtkInformationVector **inInfo,
- vtkInformationVector *outInfo) VTK_OVERRIDE;
+ vtkInformationVector *outInfo) override;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
- int FillOutputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
+ int FillOutputPortInformation(int port, vtkInformation *info) override;
int OutputPointsPrecision;
diff --git a/Imaging/Hybrid/vtkPointLoad.h b/Imaging/Hybrid/vtkPointLoad.h
index 18a5abb4bacc079d9d757bb96a8758fec2c780df..f2babca9c7731d565537822d4ae941190dae1546 100644
--- a/Imaging/Hybrid/vtkPointLoad.h
+++ b/Imaging/Hybrid/vtkPointLoad.h
@@ -37,7 +37,7 @@ class VTKIMAGINGHYBRID_EXPORT vtkPointLoad : public vtkImageAlgorithm
{
public:
vtkTypeMacro(vtkPointLoad,vtkImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct with ModelBounds=(-1,1,-1,1,-1,1), SampleDimensions=(50,50,50),
@@ -96,12 +96,12 @@ public:
protected:
vtkPointLoad();
- ~vtkPointLoad() VTK_OVERRIDE {}
+ ~vtkPointLoad() override {}
int RequestInformation (vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
- void ExecuteDataWithInformation(vtkDataObject *, vtkInformation *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
+ void ExecuteDataWithInformation(vtkDataObject *, vtkInformation *) override;
double LoadValue;
double PoissonsRatio;
diff --git a/Imaging/Hybrid/vtkSampleFunction.h b/Imaging/Hybrid/vtkSampleFunction.h
index 39b403e71cab2d811e4da9d5facefa03dc7841f2..de89fb06b266c2b506dff9aea231de2de5b493ba 100644
--- a/Imaging/Hybrid/vtkSampleFunction.h
+++ b/Imaging/Hybrid/vtkSampleFunction.h
@@ -40,7 +40,7 @@ class VTKIMAGINGHYBRID_EXPORT vtkSampleFunction : public vtkImageAlgorithm
{
public:
vtkTypeMacro(vtkSampleFunction,vtkImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct with ModelBounds=(-1,1,-1,1,-1,1), SampleDimensions=(50,50,50),
@@ -158,7 +158,7 @@ public:
/**
* Return the MTime also considering the implicit function.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
protected:
/**
@@ -170,14 +170,14 @@ protected:
*/
vtkSampleFunction();
- ~vtkSampleFunction() VTK_OVERRIDE;
+ ~vtkSampleFunction() override;
- void ReportReferences(vtkGarbageCollector*) VTK_OVERRIDE;
+ void ReportReferences(vtkGarbageCollector*) override;
- void ExecuteDataWithInformation(vtkDataObject *, vtkInformation *) VTK_OVERRIDE;
+ void ExecuteDataWithInformation(vtkDataObject *, vtkInformation *) override;
int RequestInformation (vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
void Cap(vtkDataArray *s);
int OutputScalarType;
diff --git a/Imaging/Hybrid/vtkShepardMethod.h b/Imaging/Hybrid/vtkShepardMethod.h
index 28517e4ea70883c3c4c5cd455d7737bc16ab475e..c55c7668f8e0288aa656ac52c5385797c3c11c37 100644
--- a/Imaging/Hybrid/vtkShepardMethod.h
+++ b/Imaging/Hybrid/vtkShepardMethod.h
@@ -88,7 +88,7 @@ public:
* Standard type and print methods.
*/
vtkTypeMacro(vtkShepardMethod,vtkImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
@@ -164,19 +164,19 @@ public:
protected:
vtkShepardMethod();
- ~vtkShepardMethod() VTK_OVERRIDE {}
+ ~vtkShepardMethod() override {}
int RequestInformation (vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
// see vtkAlgorithm for details
int RequestData(vtkInformation *request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
// see algorithm for more info
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
int SampleDimensions[3];
double MaximumDistance;
diff --git a/Imaging/Hybrid/vtkSliceCubes.h b/Imaging/Hybrid/vtkSliceCubes.h
index 01d156b8443c5dfe067579f5a2935f70f7168adf..ca024424ad59fa67bd37798b496334fc6d602486 100644
--- a/Imaging/Hybrid/vtkSliceCubes.h
+++ b/Imaging/Hybrid/vtkSliceCubes.h
@@ -59,7 +59,7 @@ class VTKIMAGINGHYBRID_EXPORT vtkSliceCubes : public vtkObject
public:
static vtkSliceCubes *New();
vtkTypeMacro(vtkSliceCubes,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
// methods to make it look like a filter
void Write() {this->Update();};
@@ -100,7 +100,7 @@ public:
protected:
vtkSliceCubes();
- ~vtkSliceCubes() VTK_OVERRIDE;
+ ~vtkSliceCubes() override;
void Execute();
diff --git a/Imaging/Hybrid/vtkSurfaceReconstructionFilter.h b/Imaging/Hybrid/vtkSurfaceReconstructionFilter.h
index 6fb0d61fab251de94245c80dee0a2f479ab8d0dc..cfbd9bfb4cc98b9789c35964999f99fc4e5280b3 100644
--- a/Imaging/Hybrid/vtkSurfaceReconstructionFilter.h
+++ b/Imaging/Hybrid/vtkSurfaceReconstructionFilter.h
@@ -35,7 +35,7 @@ class VTKIMAGINGHYBRID_EXPORT vtkSurfaceReconstructionFilter : public vtkImageAl
{
public:
vtkTypeMacro(vtkSurfaceReconstructionFilter,vtkImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct with NeighborhoodSize=20.
@@ -66,19 +66,19 @@ public:
protected:
vtkSurfaceReconstructionFilter();
- ~vtkSurfaceReconstructionFilter() VTK_OVERRIDE {}
+ ~vtkSurfaceReconstructionFilter() override {}
int RequestInformation (vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
int RequestData (vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
int NeighborhoodSize;
double SampleSpacing;
- int FillInputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
+ int FillInputPortInformation(int, vtkInformation*) override;
private:
vtkSurfaceReconstructionFilter(const vtkSurfaceReconstructionFilter&) VTK_DELETE_FUNCTION;
diff --git a/Imaging/Hybrid/vtkTriangularTexture.h b/Imaging/Hybrid/vtkTriangularTexture.h
index c84f16a5265c0c6be0914aeab731523b6d064532..43711af5b43b3465381e2da20d2a78504c76cedd 100644
--- a/Imaging/Hybrid/vtkTriangularTexture.h
+++ b/Imaging/Hybrid/vtkTriangularTexture.h
@@ -38,7 +38,7 @@ class VTKIMAGINGHYBRID_EXPORT vtkTriangularTexture : public vtkImageAlgorithm
{
public:
vtkTypeMacro(vtkTriangularTexture,vtkImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Instantiate object with XSize and YSize = 64; the texture pattern =1
@@ -83,10 +83,10 @@ public:
protected:
vtkTriangularTexture();
- ~vtkTriangularTexture() VTK_OVERRIDE {}
+ ~vtkTriangularTexture() override {}
- int RequestInformation (vtkInformation *, vtkInformationVector**, vtkInformationVector *) VTK_OVERRIDE;
- void ExecuteDataWithInformation(vtkDataObject *data, vtkInformation *outInfo) VTK_OVERRIDE;
+ int RequestInformation (vtkInformation *, vtkInformationVector**, vtkInformationVector *) override;
+ void ExecuteDataWithInformation(vtkDataObject *data, vtkInformation *outInfo) override;
int XSize;
int YSize;
diff --git a/Imaging/Hybrid/vtkVoxelModeller.h b/Imaging/Hybrid/vtkVoxelModeller.h
index 155a3bddbd40b7fadc427f3a183e6de0fb0de0e8..132234c9af0746b8da68c002714889f1a8e957b6 100644
--- a/Imaging/Hybrid/vtkVoxelModeller.h
+++ b/Imaging/Hybrid/vtkVoxelModeller.h
@@ -38,7 +38,7 @@ class VTKIMAGINGHYBRID_EXPORT vtkVoxelModeller : public vtkImageAlgorithm
{
public:
vtkTypeMacro(vtkVoxelModeller,vtkImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct an instance of vtkVoxelModeller with its sample dimensions
@@ -127,19 +127,19 @@ public:
protected:
vtkVoxelModeller();
- ~vtkVoxelModeller() VTK_OVERRIDE {}
+ ~vtkVoxelModeller() override {}
int RequestInformation (vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
// see vtkAlgorithm for details
int RequestData(vtkInformation *request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
// see algorithm for more info
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
int SampleDimensions[3];
double MaximumDistance;
diff --git a/Imaging/Math/vtkImageDivergence.h b/Imaging/Math/vtkImageDivergence.h
index 96c924596b76f7fe15a789d55d1ac84c20f3f0d5..26d5dfca70dd981e1450e91856e57b2a807fe9fa 100644
--- a/Imaging/Math/vtkImageDivergence.h
+++ b/Imaging/Math/vtkImageDivergence.h
@@ -38,16 +38,16 @@ public:
protected:
vtkImageDivergence();
- ~vtkImageDivergence() VTK_OVERRIDE {}
+ ~vtkImageDivergence() override {}
int RequestUpdateExtent(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
int RequestInformation (vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
void ThreadedExecute (vtkImageData *inData, vtkImageData *outData,
- int ext[6], int id) VTK_OVERRIDE;
+ int ext[6], int id) override;
private:
vtkImageDivergence(const vtkImageDivergence&) VTK_DELETE_FUNCTION;
diff --git a/Imaging/Math/vtkImageDotProduct.h b/Imaging/Math/vtkImageDotProduct.h
index d59d0c1074273289085c48343f2b650adc7103d0..c99f81f77a9a485811943e0c71688fb2596f236a 100644
--- a/Imaging/Math/vtkImageDotProduct.h
+++ b/Imaging/Math/vtkImageDotProduct.h
@@ -42,18 +42,18 @@ public:
protected:
vtkImageDotProduct();
- ~vtkImageDotProduct() VTK_OVERRIDE {}
+ ~vtkImageDotProduct() override {}
int RequestInformation (vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
void ThreadedRequestData(vtkInformation *request,
vtkInformationVector **inputVector,
vtkInformationVector *outputVector,
vtkImageData ***inData,
vtkImageData **outData,
- int extent[6], int threadId) VTK_OVERRIDE;
+ int extent[6], int threadId) override;
private:
vtkImageDotProduct(const vtkImageDotProduct&) VTK_DELETE_FUNCTION;
diff --git a/Imaging/Math/vtkImageLogarithmicScale.h b/Imaging/Math/vtkImageLogarithmicScale.h
index fed297fda36ccd1581665b20dfde0489e3173306..920efc44a1004c0a4b0e9e02c37a9c2b1ee60425 100644
--- a/Imaging/Math/vtkImageLogarithmicScale.h
+++ b/Imaging/Math/vtkImageLogarithmicScale.h
@@ -33,7 +33,7 @@ class VTKIMAGINGMATH_EXPORT vtkImageLogarithmicScale : public vtkThreadedImageAl
public:
static vtkImageLogarithmicScale *New();
vtkTypeMacro(vtkImageLogarithmicScale,vtkThreadedImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -45,12 +45,12 @@ public:
protected:
vtkImageLogarithmicScale();
- ~vtkImageLogarithmicScale() VTK_OVERRIDE {}
+ ~vtkImageLogarithmicScale() override {}
double Constant;
void ThreadedExecute (vtkImageData *inData, vtkImageData *outData,
- int outExt[6], int id) VTK_OVERRIDE;
+ int outExt[6], int id) override;
private:
vtkImageLogarithmicScale(const vtkImageLogarithmicScale&) VTK_DELETE_FUNCTION;
void operator=(const vtkImageLogarithmicScale&) VTK_DELETE_FUNCTION;
diff --git a/Imaging/Math/vtkImageLogic.h b/Imaging/Math/vtkImageLogic.h
index c838a9316e4ae7fa2f3159518a93461729b7ae79..21628b808753b2490232c7c80f8b46123cbf95a4 100644
--- a/Imaging/Math/vtkImageLogic.h
+++ b/Imaging/Math/vtkImageLogic.h
@@ -44,7 +44,7 @@ class VTKIMAGINGMATH_EXPORT vtkImageLogic : public vtkThreadedImageAlgorithm
public:
static vtkImageLogic *New();
vtkTypeMacro(vtkImageLogic,vtkThreadedImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -80,7 +80,7 @@ public:
protected:
vtkImageLogic();
- ~vtkImageLogic() VTK_OVERRIDE {}
+ ~vtkImageLogic() override {}
int Operation;
double OutputTrueValue;
@@ -89,8 +89,8 @@ protected:
vtkInformationVector** inputVector,
vtkInformationVector* outputVector,
vtkImageData ***inData, vtkImageData **outData,
- int ext[6], int id) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int ext[6], int id) override;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
private:
vtkImageLogic(const vtkImageLogic&) VTK_DELETE_FUNCTION;
diff --git a/Imaging/Math/vtkImageMagnitude.h b/Imaging/Math/vtkImageMagnitude.h
index 0ae46355ef0f184942aad4967593a8f53d666aa3..cfb59ddf5a9b68917957f6abfb35ed12e36441d7 100644
--- a/Imaging/Math/vtkImageMagnitude.h
+++ b/Imaging/Math/vtkImageMagnitude.h
@@ -34,13 +34,13 @@ public:
protected:
vtkImageMagnitude();
- ~vtkImageMagnitude() VTK_OVERRIDE {}
+ ~vtkImageMagnitude() override {}
int RequestInformation (vtkInformation *, vtkInformationVector**,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
void ThreadedExecute (vtkImageData *inData, vtkImageData *outData,
- int outExt[6], int id) VTK_OVERRIDE;
+ int outExt[6], int id) override;
private:
vtkImageMagnitude(const vtkImageMagnitude&) VTK_DELETE_FUNCTION;
diff --git a/Imaging/Math/vtkImageMaskBits.h b/Imaging/Math/vtkImageMaskBits.h
index 2dad8a863f1d2730b0161a56884b9a169d8a790d..3d0d3eba3f49a921af10037e5ae85531a9f3fb9c 100644
--- a/Imaging/Math/vtkImageMaskBits.h
+++ b/Imaging/Math/vtkImageMaskBits.h
@@ -33,7 +33,7 @@ class VTKIMAGINGMATH_EXPORT vtkImageMaskBits : public vtkThreadedImageAlgorithm
public:
static vtkImageMaskBits *New();
vtkTypeMacro(vtkImageMaskBits,vtkThreadedImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -64,10 +64,10 @@ public:
protected:
vtkImageMaskBits();
- ~vtkImageMaskBits() VTK_OVERRIDE {}
+ ~vtkImageMaskBits() override {}
void ThreadedExecute (vtkImageData *inData, vtkImageData *outData,
- int ext[6], int id) VTK_OVERRIDE;
+ int ext[6], int id) override;
unsigned int Masks[4];
int Operation;
diff --git a/Imaging/Math/vtkImageMathematics.h b/Imaging/Math/vtkImageMathematics.h
index 39150c881d1dfac8d01d4b5e476613703b82a619..c865beec714b7a482eb6cce5c36e539cd707fa87 100644
--- a/Imaging/Math/vtkImageMathematics.h
+++ b/Imaging/Math/vtkImageMathematics.h
@@ -57,7 +57,7 @@ class VTKIMAGINGMATH_EXPORT vtkImageMathematics : public vtkThreadedImageAlgorit
public:
static vtkImageMathematics *New();
vtkTypeMacro(vtkImageMathematics,vtkThreadedImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -216,7 +216,7 @@ public:
protected:
vtkImageMathematics();
- ~vtkImageMathematics() VTK_OVERRIDE {}
+ ~vtkImageMathematics() override {}
int Operation;
double ConstantK;
@@ -225,16 +225,16 @@ protected:
int RequestInformation (vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
void ThreadedRequestData(vtkInformation *request,
vtkInformationVector **inputVector,
vtkInformationVector *outputVector,
vtkImageData ***inData,
vtkImageData **outData,
- int extent[6], int threadId) VTK_OVERRIDE;
+ int extent[6], int threadId) override;
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
private:
vtkImageMathematics(const vtkImageMathematics&) VTK_DELETE_FUNCTION;
diff --git a/Imaging/Math/vtkImageWeightedSum.h b/Imaging/Math/vtkImageWeightedSum.h
index 17d56d6476ff6cdeb8f49236c91907abbf83d902..4e0a36e2ea00992cb4b171208ce988e194f6ffb9 100644
--- a/Imaging/Math/vtkImageWeightedSum.h
+++ b/Imaging/Math/vtkImageWeightedSum.h
@@ -37,7 +37,7 @@ class VTKIMAGINGMATH_EXPORT vtkImageWeightedSum : public vtkThreadedImageAlgorit
public:
static vtkImageWeightedSum *New();
vtkTypeMacro(vtkImageWeightedSum,vtkThreadedImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -72,7 +72,7 @@ public:
protected:
vtkImageWeightedSum();
- ~vtkImageWeightedSum() VTK_OVERRIDE;
+ ~vtkImageWeightedSum() override;
// Array to hold all the weights
vtkDoubleArray *Weights;
@@ -82,14 +82,14 @@ protected:
int RequestInformation (vtkInformation * vtkNotUsed(request),
vtkInformationVector** vtkNotUsed( inputVector ),
- vtkInformationVector *outputVector) VTK_OVERRIDE;
+ vtkInformationVector *outputVector) override;
void ThreadedRequestData (vtkInformation* request,
vtkInformationVector** inputVector,
vtkInformationVector* outputVector,
vtkImageData ***inData, vtkImageData **outData,
- int ext[6], int id) VTK_OVERRIDE;
- int FillInputPortInformation(int i, vtkInformation* info) VTK_OVERRIDE;
+ int ext[6], int id) override;
+ int FillInputPortInformation(int i, vtkInformation* info) override;
private:
vtkImageWeightedSum(const vtkImageWeightedSum&) VTK_DELETE_FUNCTION;
diff --git a/Imaging/Morphological/vtkImageConnectivityFilter.h b/Imaging/Morphological/vtkImageConnectivityFilter.h
index 47fe1f895200ba0606ac022ff078a8da7a07f23a..d39ba8e00d37412944254460c3bacf82d106c11c 100644
--- a/Imaging/Morphological/vtkImageConnectivityFilter.h
+++ b/Imaging/Morphological/vtkImageConnectivityFilter.h
@@ -108,7 +108,7 @@ class VTKIMAGINGMORPHOLOGICAL_EXPORT vtkImageConnectivityFilter :
public:
static vtkImageConnectivityFilter *New();
vtkTypeMacro(vtkImageConnectivityFilter, vtkImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Enum constants for SetLabelMode().
@@ -295,7 +295,7 @@ public:
protected:
vtkImageConnectivityFilter();
- ~vtkImageConnectivityFilter() VTK_OVERRIDE;
+ ~vtkImageConnectivityFilter() override;
int LabelMode;
int ExtractionMode;
@@ -314,13 +314,13 @@ protected:
void ComputeInputUpdateExtent(int inExt[6], int outExt[6]);
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
int RequestInformation(
- vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
int RequestUpdateExtent(
- vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
int RequestData(
- vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
private:
vtkImageConnectivityFilter(const vtkImageConnectivityFilter&) VTK_DELETE_FUNCTION;
diff --git a/Imaging/Morphological/vtkImageConnector.h b/Imaging/Morphological/vtkImageConnector.h
index 8d6064932b5d3f130b5a14e00f03a7f6b21a5f5a..7544f62ef15a95ea2d5f2dc3a40557e9d8d4672b 100644
--- a/Imaging/Morphological/vtkImageConnector.h
+++ b/Imaging/Morphological/vtkImageConnector.h
@@ -53,7 +53,7 @@ public:
static vtkImageConnector *New();
vtkTypeMacro(vtkImageConnector,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
vtkImageConnectorSeed *NewSeed(int index[3], void *ptr);
void AddSeed(vtkImageConnectorSeed *seed);
@@ -82,7 +82,7 @@ public:
protected:
vtkImageConnector();
- ~vtkImageConnector() VTK_OVERRIDE;
+ ~vtkImageConnector() override;
unsigned char ConnectedValue;
unsigned char UnconnectedValue;
diff --git a/Imaging/Morphological/vtkImageContinuousDilate3D.h b/Imaging/Morphological/vtkImageContinuousDilate3D.h
index 4b59c474c38125b348f800a7e96f37af0acbb7f8..7d3c51be2ad3f9a8ff2f9841cf11e7b1357817c5 100644
--- a/Imaging/Morphological/vtkImageContinuousDilate3D.h
+++ b/Imaging/Morphological/vtkImageContinuousDilate3D.h
@@ -41,7 +41,7 @@ public:
*/
static vtkImageContinuousDilate3D *New();
vtkTypeMacro(vtkImageContinuousDilate3D,vtkImageSpatialAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
@@ -52,7 +52,7 @@ public:
protected:
vtkImageContinuousDilate3D();
- ~vtkImageContinuousDilate3D() VTK_OVERRIDE;
+ ~vtkImageContinuousDilate3D() override;
vtkImageEllipsoidSource *Ellipse;
@@ -60,10 +60,10 @@ protected:
vtkInformationVector **inputVector,
vtkInformationVector *outputVector,
vtkImageData ***inData, vtkImageData **outData,
- int extent[6], int id) VTK_OVERRIDE;
+ int extent[6], int id) override;
int RequestData(vtkInformation *request,
vtkInformationVector **inputVector,
- vtkInformationVector *outputVector) VTK_OVERRIDE;
+ vtkInformationVector *outputVector) override;
private:
vtkImageContinuousDilate3D(const vtkImageContinuousDilate3D&) VTK_DELETE_FUNCTION;
diff --git a/Imaging/Morphological/vtkImageContinuousErode3D.h b/Imaging/Morphological/vtkImageContinuousErode3D.h
index e7735ef311db253f92e798d91fd707abb2a818fc..73eaea317f89b1bcf3809398feeeb7d8730369f6 100644
--- a/Imaging/Morphological/vtkImageContinuousErode3D.h
+++ b/Imaging/Morphological/vtkImageContinuousErode3D.h
@@ -40,7 +40,7 @@ public:
*/
static vtkImageContinuousErode3D *New();
vtkTypeMacro(vtkImageContinuousErode3D,vtkImageSpatialAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
@@ -51,7 +51,7 @@ public:
protected:
vtkImageContinuousErode3D();
- ~vtkImageContinuousErode3D() VTK_OVERRIDE;
+ ~vtkImageContinuousErode3D() override;
vtkImageEllipsoidSource *Ellipse;
@@ -59,10 +59,10 @@ protected:
vtkInformationVector **inputVector,
vtkInformationVector *outputVector,
vtkImageData ***inData, vtkImageData **outData,
- int extent[6], int id) VTK_OVERRIDE;
+ int extent[6], int id) override;
int RequestData(vtkInformation *request,
vtkInformationVector **inputVector,
- vtkInformationVector *outputVector) VTK_OVERRIDE;
+ vtkInformationVector *outputVector) override;
private:
vtkImageContinuousErode3D(const vtkImageContinuousErode3D&) VTK_DELETE_FUNCTION;
diff --git a/Imaging/Morphological/vtkImageDilateErode3D.h b/Imaging/Morphological/vtkImageDilateErode3D.h
index 505fba1f4744e1a2605d3e89e2c5c0894ca19216..20f630e54ba21916817b218d615169cc035b890a 100644
--- a/Imaging/Morphological/vtkImageDilateErode3D.h
+++ b/Imaging/Morphological/vtkImageDilateErode3D.h
@@ -42,7 +42,7 @@ public:
*/
static vtkImageDilateErode3D *New();
vtkTypeMacro(vtkImageDilateErode3D,vtkImageSpatialAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
@@ -64,7 +64,7 @@ public:
protected:
vtkImageDilateErode3D();
- ~vtkImageDilateErode3D() VTK_OVERRIDE;
+ ~vtkImageDilateErode3D() override;
vtkImageEllipsoidSource *Ellipse;
double DilateValue;
@@ -74,10 +74,10 @@ protected:
vtkInformationVector **inputVector,
vtkInformationVector *outputVector,
vtkImageData ***inData, vtkImageData **outData,
- int extent[6], int id) VTK_OVERRIDE;
+ int extent[6], int id) override;
int RequestData(vtkInformation *request,
vtkInformationVector **inputVector,
- vtkInformationVector *outputVector) VTK_OVERRIDE;
+ vtkInformationVector *outputVector) override;
private:
vtkImageDilateErode3D(const vtkImageDilateErode3D&) VTK_DELETE_FUNCTION;
diff --git a/Imaging/Morphological/vtkImageIslandRemoval2D.h b/Imaging/Morphological/vtkImageIslandRemoval2D.h
index d4557b3fdc624a33e31d74bc0335a1d8627b3e1d..20844cdc83253859caa9cf2a16b4fa0a284df3fe 100644
--- a/Imaging/Morphological/vtkImageIslandRemoval2D.h
+++ b/Imaging/Morphological/vtkImageIslandRemoval2D.h
@@ -45,7 +45,7 @@ public:
*/
static vtkImageIslandRemoval2D *New();
vtkTypeMacro(vtkImageIslandRemoval2D,vtkImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -83,7 +83,7 @@ public:
protected:
vtkImageIslandRemoval2D();
- ~vtkImageIslandRemoval2D()VTK_OVERRIDE {}
+ ~vtkImageIslandRemoval2D() override {}
int AreaThreshold;
int SquareNeighborhood;
@@ -92,7 +92,7 @@ protected:
int RequestData(vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
private:
vtkImageIslandRemoval2D(const vtkImageIslandRemoval2D&) VTK_DELETE_FUNCTION;
diff --git a/Imaging/Morphological/vtkImageNonMaximumSuppression.h b/Imaging/Morphological/vtkImageNonMaximumSuppression.h
index 83de2c80b4e91d674dbb13b3d4b00b43535d49c6..c134baa34e9627e8baa9d500c086b0c621bd3cd1 100644
--- a/Imaging/Morphological/vtkImageNonMaximumSuppression.h
+++ b/Imaging/Morphological/vtkImageNonMaximumSuppression.h
@@ -39,7 +39,7 @@ class VTKIMAGINGMORPHOLOGICAL_EXPORT vtkImageNonMaximumSuppression : public vtkT
public:
static vtkImageNonMaximumSuppression *New();
vtkTypeMacro(vtkImageNonMaximumSuppression,vtkThreadedImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -69,25 +69,25 @@ public:
protected:
vtkImageNonMaximumSuppression();
- ~vtkImageNonMaximumSuppression()VTK_OVERRIDE {}
+ ~vtkImageNonMaximumSuppression() override {}
int HandleBoundaries;
int Dimensionality;
int RequestInformation (vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
int RequestUpdateExtent(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
void ThreadedRequestData(vtkInformation *request,
vtkInformationVector **inputVector,
vtkInformationVector *outputVector,
vtkImageData ***inData,
vtkImageData **outData,
- int extent[6], int threadId) VTK_OVERRIDE;
+ int extent[6], int threadId) override;
private:
vtkImageNonMaximumSuppression(const vtkImageNonMaximumSuppression&) VTK_DELETE_FUNCTION;
diff --git a/Imaging/Morphological/vtkImageOpenClose3D.cxx b/Imaging/Morphological/vtkImageOpenClose3D.cxx
index 2f68c346dd7fdfdbdfe7402480b1e9e9ff128787..17cfd68d9259c1ea1690d43a1defa93f430bb81d 100644
--- a/Imaging/Morphological/vtkImageOpenClose3D.cxx
+++ b/Imaging/Morphological/vtkImageOpenClose3D.cxx
@@ -39,7 +39,7 @@ public:
// the execute
void Execute(vtkObject *caller,
- unsigned long event, void* vtkNotUsed(v)) VTK_OVERRIDE
+ unsigned long event, void* vtkNotUsed(v)) override
{
vtkAlgorithm *alg = vtkAlgorithm::SafeDownCast(caller);
if (event == vtkCommand::ProgressEvent && alg)
diff --git a/Imaging/Morphological/vtkImageOpenClose3D.h b/Imaging/Morphological/vtkImageOpenClose3D.h
index b53288de05e6a50fb001b2684801b82f1e5358dc..212dc8fe5784d167c33861ccd7696ffda485af1a 100644
--- a/Imaging/Morphological/vtkImageOpenClose3D.h
+++ b/Imaging/Morphological/vtkImageOpenClose3D.h
@@ -48,27 +48,27 @@ public:
*/
static vtkImageOpenClose3D *New();
vtkTypeMacro(vtkImageOpenClose3D,vtkImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
* This method considers the sub filters MTimes when computing this objects
* modified time.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
//@{
/**
* Turn debugging output on. (in sub filters also)
*/
- void DebugOn() VTK_OVERRIDE;
- void DebugOff() VTK_OVERRIDE;
+ void DebugOn() override;
+ void DebugOff() override;
//@}
/**
* Pass modified message to sub filters.
*/
- void Modified() VTK_OVERRIDE;
+ void Modified() override;
// Forward Source messages to filter1
@@ -108,7 +108,7 @@ public:
*/
int ProcessRequest(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
/**
* Override to send the request to internal pipeline.
@@ -118,16 +118,16 @@ public:
vtkInformationVector** inInfoVec,
vtkInformationVector* outInfoVec,
int requestFromOutputPort,
- vtkMTimeType* mtime) VTK_OVERRIDE;
+ vtkMTimeType* mtime) override;
protected:
vtkImageOpenClose3D();
- ~vtkImageOpenClose3D() VTK_OVERRIDE;
+ ~vtkImageOpenClose3D() override;
vtkImageDilateErode3D *Filter0;
vtkImageDilateErode3D *Filter1;
- void ReportReferences(vtkGarbageCollector*) VTK_OVERRIDE;
+ void ReportReferences(vtkGarbageCollector*) override;
private:
vtkImageOpenClose3D(const vtkImageOpenClose3D&) VTK_DELETE_FUNCTION;
void operator=(const vtkImageOpenClose3D&) VTK_DELETE_FUNCTION;
diff --git a/Imaging/Morphological/vtkImageSeedConnectivity.h b/Imaging/Morphological/vtkImageSeedConnectivity.h
index 396c1c6d34061eeb3ab86f69b73c101dac28af4d..bc091624be54c37898d46156017d00957f3afb16 100644
--- a/Imaging/Morphological/vtkImageSeedConnectivity.h
+++ b/Imaging/Morphological/vtkImageSeedConnectivity.h
@@ -42,7 +42,7 @@ class VTKIMAGINGMORPHOLOGICAL_EXPORT vtkImageSeedConnectivity : public vtkImageA
public:
static vtkImageSeedConnectivity *New();
vtkTypeMacro(vtkImageSeedConnectivity,vtkImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -95,7 +95,7 @@ public:
protected:
vtkImageSeedConnectivity();
- ~vtkImageSeedConnectivity() VTK_OVERRIDE;
+ ~vtkImageSeedConnectivity() override;
unsigned char InputConnectValue;
unsigned char OutputConnectedValue;
@@ -104,8 +104,8 @@ protected:
vtkImageConnector *Connector;
int Dimensionality;
- int RequestUpdateExtent(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestUpdateExtent(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
private:
vtkImageSeedConnectivity(const vtkImageSeedConnectivity&) VTK_DELETE_FUNCTION;
diff --git a/Imaging/Morphological/vtkImageSkeleton2D.h b/Imaging/Morphological/vtkImageSkeleton2D.h
index 94c7b4263ddb21936146601ded144e4121bcd4fd..532a2589d248c9749e3f29d7c2967d88249b4002 100644
--- a/Imaging/Morphological/vtkImageSkeleton2D.h
+++ b/Imaging/Morphological/vtkImageSkeleton2D.h
@@ -38,7 +38,7 @@ class VTKIMAGINGMORPHOLOGICAL_EXPORT vtkImageSkeleton2D : public vtkImageIterate
public:
static vtkImageSkeleton2D *New();
vtkTypeMacro(vtkImageSkeleton2D,vtkImageIterateFilter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -52,16 +52,16 @@ public:
/**
* Sets the number of cycles in the erosion.
*/
- void SetNumberOfIterations(int num) VTK_OVERRIDE;
+ void SetNumberOfIterations(int num) override;
protected:
vtkImageSkeleton2D();
- ~vtkImageSkeleton2D()VTK_OVERRIDE {}
+ ~vtkImageSkeleton2D() override {}
int Prune;
int IterativeRequestUpdateExtent(vtkInformation* in,
- vtkInformation* out) VTK_OVERRIDE;
+ vtkInformation* out) override;
void ThreadedRequestData(
vtkInformation* request,
vtkInformationVector** inputVector,
@@ -69,7 +69,7 @@ protected:
vtkImageData ***inDataV,
vtkImageData **outDataV,
int outExt[6],
- int id) VTK_OVERRIDE;
+ int id) override;
private:
vtkImageSkeleton2D(const vtkImageSkeleton2D&) VTK_DELETE_FUNCTION;
void operator=(const vtkImageSkeleton2D&) VTK_DELETE_FUNCTION;
diff --git a/Imaging/Morphological/vtkImageThresholdConnectivity.h b/Imaging/Morphological/vtkImageThresholdConnectivity.h
index 23f275f6df92d46c3461ca0d4d0a1d61998f0fb3..5d4a8479731ef47b16aff2ec392b46cf4b7030ae 100644
--- a/Imaging/Morphological/vtkImageThresholdConnectivity.h
+++ b/Imaging/Morphological/vtkImageThresholdConnectivity.h
@@ -46,7 +46,7 @@ class VTKIMAGINGMORPHOLOGICAL_EXPORT vtkImageThresholdConnectivity :
public:
static vtkImageThresholdConnectivity *New();
vtkTypeMacro(vtkImageThresholdConnectivity, vtkImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -168,7 +168,7 @@ public:
/**
* Override the MTime to account for the seed points.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
//@{
/**
@@ -180,7 +180,7 @@ public:
protected:
vtkImageThresholdConnectivity();
- ~vtkImageThresholdConnectivity() VTK_OVERRIDE;
+ ~vtkImageThresholdConnectivity() override;
double UpperThreshold;
double LowerThreshold;
@@ -206,11 +206,11 @@ protected:
void ComputeInputUpdateExtent(int inExt[6], int outExt[6]);
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
int RequestUpdateExtent(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
int RequestData(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
private:
vtkImageThresholdConnectivity(const vtkImageThresholdConnectivity&) VTK_DELETE_FUNCTION;
diff --git a/Imaging/Sources/vtkImageCanvasSource2D.h b/Imaging/Sources/vtkImageCanvasSource2D.h
index 5eb9158a616e9c58a7191f46fc5fac1204e960a8..4361557f09ab1ffd1e7b5c41ce767233e9663e05 100644
--- a/Imaging/Sources/vtkImageCanvasSource2D.h
+++ b/Imaging/Sources/vtkImageCanvasSource2D.h
@@ -36,7 +36,7 @@ public:
static vtkImageCanvasSource2D *New();
vtkTypeMacro(vtkImageCanvasSource2D,vtkImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -173,7 +173,7 @@ protected:
// Destructor: Deleting a vtkImageCanvasSource2D automatically deletes the
// associated vtkImageData. However, since the data is reference counted,
// it may not actually be deleted.
- ~vtkImageCanvasSource2D() VTK_OVERRIDE;
+ ~vtkImageCanvasSource2D() override;
vtkImageData *ImageData;
int WholeExtent[6];
@@ -185,10 +185,10 @@ protected:
int RequestInformation (vtkInformation *,
vtkInformationVector**,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
int RequestData (vtkInformation *,
vtkInformationVector**,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
private:
vtkImageCanvasSource2D(const vtkImageCanvasSource2D&) VTK_DELETE_FUNCTION;
diff --git a/Imaging/Sources/vtkImageEllipsoidSource.h b/Imaging/Sources/vtkImageEllipsoidSource.h
index f787854b98fc2d77818a7f4024f01d472c8e3635..532c98f23c0e41dd771533e5a660c1f9df91f820 100644
--- a/Imaging/Sources/vtkImageEllipsoidSource.h
+++ b/Imaging/Sources/vtkImageEllipsoidSource.h
@@ -32,7 +32,7 @@ class VTKIMAGINGSOURCES_EXPORT vtkImageEllipsoidSource : public vtkImageAlgorith
public:
static vtkImageEllipsoidSource *New();
vtkTypeMacro(vtkImageEllipsoidSource,vtkImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -107,7 +107,7 @@ public:
protected:
vtkImageEllipsoidSource();
- ~vtkImageEllipsoidSource() VTK_OVERRIDE;
+ ~vtkImageEllipsoidSource() override;
int WholeExtent[6];
double Center[3];
@@ -118,10 +118,10 @@ protected:
int RequestInformation (vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
int RequestData(vtkInformation *,
- vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector **, vtkInformationVector *) override;
private:
vtkImageEllipsoidSource(const vtkImageEllipsoidSource&) VTK_DELETE_FUNCTION;
diff --git a/Imaging/Sources/vtkImageGaussianSource.h b/Imaging/Sources/vtkImageGaussianSource.h
index 5f6b13f4e9f40218b482a126f5d5eb3b94714f6f..972c97a2b207e8a3f2dabb8c4278c85eb99c04ec 100644
--- a/Imaging/Sources/vtkImageGaussianSource.h
+++ b/Imaging/Sources/vtkImageGaussianSource.h
@@ -31,7 +31,7 @@ class VTKIMAGINGSOURCES_EXPORT vtkImageGaussianSource : public vtkImageAlgorithm
public:
static vtkImageGaussianSource *New();
vtkTypeMacro(vtkImageGaussianSource,vtkImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Set/Get the extent of the whole output image.
@@ -65,15 +65,15 @@ public:
protected:
vtkImageGaussianSource();
- ~vtkImageGaussianSource()VTK_OVERRIDE {}
+ ~vtkImageGaussianSource() override {}
double StandardDeviation;
int WholeExtent[6];
double Center[3];
double Maximum;
- int RequestInformation (vtkInformation *, vtkInformationVector**, vtkInformationVector *) VTK_OVERRIDE;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestInformation (vtkInformation *, vtkInformationVector**, vtkInformationVector *) override;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
private:
vtkImageGaussianSource(const vtkImageGaussianSource&) VTK_DELETE_FUNCTION;
void operator=(const vtkImageGaussianSource&) VTK_DELETE_FUNCTION;
diff --git a/Imaging/Sources/vtkImageGridSource.h b/Imaging/Sources/vtkImageGridSource.h
index e44b7c4db0ee90243707d28b06e22463c002de71..e516e957722e366d01fe6783f77cd46e9fa5aa43 100644
--- a/Imaging/Sources/vtkImageGridSource.h
+++ b/Imaging/Sources/vtkImageGridSource.h
@@ -31,7 +31,7 @@ class VTKIMAGINGSOURCES_EXPORT vtkImageGridSource : public vtkImageAlgorithm
public:
static vtkImageGridSource *New();
vtkTypeMacro(vtkImageGridSource,vtkImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -111,7 +111,7 @@ public:
protected:
vtkImageGridSource();
- ~vtkImageGridSource()VTK_OVERRIDE {}
+ ~vtkImageGridSource() override {}
int GridSpacing[3];
int GridOrigin[3];
@@ -127,8 +127,8 @@ protected:
int RequestInformation (vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
- void ExecuteDataWithInformation(vtkDataObject *data, vtkInformation* outInfo) VTK_OVERRIDE;
+ vtkInformationVector*) override;
+ void ExecuteDataWithInformation(vtkDataObject *data, vtkInformation* outInfo) override;
private:
vtkImageGridSource(const vtkImageGridSource&) VTK_DELETE_FUNCTION;
diff --git a/Imaging/Sources/vtkImageMandelbrotSource.h b/Imaging/Sources/vtkImageMandelbrotSource.h
index 01d28549fa96a0c5b158d09a09e790059cc35d27..5ea3bc5e420fe4be9fba86e81b8c7887954cd600 100644
--- a/Imaging/Sources/vtkImageMandelbrotSource.h
+++ b/Imaging/Sources/vtkImageMandelbrotSource.h
@@ -38,7 +38,7 @@ class VTKIMAGINGSOURCES_EXPORT vtkImageMandelbrotSource : public vtkImageAlgorit
public:
static vtkImageMandelbrotSource *New();
vtkTypeMacro(vtkImageMandelbrotSource,vtkImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -139,7 +139,7 @@ public:
protected:
vtkImageMandelbrotSource();
- ~vtkImageMandelbrotSource() VTK_OVERRIDE;
+ ~vtkImageMandelbrotSource() override;
int ProjectionAxes[3];
@@ -164,11 +164,11 @@ protected:
// see vtkAlgorithm for details
int RequestData(vtkInformation *request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
int RequestInformation (vtkInformation *,
vtkInformationVector**,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
double EvaluateSet(double p[4]);
private:
vtkImageMandelbrotSource(const vtkImageMandelbrotSource&) VTK_DELETE_FUNCTION;
diff --git a/Imaging/Sources/vtkImageNoiseSource.h b/Imaging/Sources/vtkImageNoiseSource.h
index e3db26afca51d12a05918b5236c4a6636465f8d7..7dc812cb42aa9a6736f2a9fa4664ddeeb1e2013c 100644
--- a/Imaging/Sources/vtkImageNoiseSource.h
+++ b/Imaging/Sources/vtkImageNoiseSource.h
@@ -37,7 +37,7 @@ class VTKIMAGINGSOURCES_EXPORT vtkImageNoiseSource : public vtkImageAlgorithm
public:
static vtkImageNoiseSource *New();
vtkTypeMacro(vtkImageNoiseSource,vtkImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -63,14 +63,14 @@ public:
protected:
vtkImageNoiseSource();
- ~vtkImageNoiseSource()VTK_OVERRIDE {}
+ ~vtkImageNoiseSource() override {}
double Minimum;
double Maximum;
int WholeExtent[6];
- int RequestInformation (vtkInformation *, vtkInformationVector**, vtkInformationVector *) VTK_OVERRIDE;
- void ExecuteDataWithInformation(vtkDataObject *data, vtkInformation* outInfo) VTK_OVERRIDE;
+ int RequestInformation (vtkInformation *, vtkInformationVector**, vtkInformationVector *) override;
+ void ExecuteDataWithInformation(vtkDataObject *data, vtkInformation* outInfo) override;
private:
vtkImageNoiseSource(const vtkImageNoiseSource&) VTK_DELETE_FUNCTION;
void operator=(const vtkImageNoiseSource&) VTK_DELETE_FUNCTION;
diff --git a/Imaging/Sources/vtkImageSinusoidSource.h b/Imaging/Sources/vtkImageSinusoidSource.h
index fe5d07bc1ad38c54e53607cf03ec7e07e64a9964..e0d6794d870690dd673952ef970b48595f966874 100644
--- a/Imaging/Sources/vtkImageSinusoidSource.h
+++ b/Imaging/Sources/vtkImageSinusoidSource.h
@@ -31,7 +31,7 @@ class VTKIMAGINGSOURCES_EXPORT vtkImageSinusoidSource : public vtkImageAlgorithm
public:
static vtkImageSinusoidSource *New();
vtkTypeMacro(vtkImageSinusoidSource,vtkImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Set/Get the extent of the whole output image.
@@ -75,7 +75,7 @@ public:
protected:
vtkImageSinusoidSource();
- ~vtkImageSinusoidSource()VTK_OVERRIDE {}
+ ~vtkImageSinusoidSource() override {}
int WholeExtent[6];
double Direction[3];
@@ -83,8 +83,8 @@ protected:
double Phase;
double Amplitude;
- int RequestInformation (vtkInformation *, vtkInformationVector**, vtkInformationVector *) VTK_OVERRIDE;
- void ExecuteDataWithInformation(vtkDataObject *data, vtkInformation* outInfo) VTK_OVERRIDE;
+ int RequestInformation (vtkInformation *, vtkInformationVector**, vtkInformationVector *) override;
+ void ExecuteDataWithInformation(vtkDataObject *data, vtkInformation* outInfo) override;
private:
vtkImageSinusoidSource(const vtkImageSinusoidSource&) VTK_DELETE_FUNCTION;
void operator=(const vtkImageSinusoidSource&) VTK_DELETE_FUNCTION;
diff --git a/Imaging/Statistics/vtkImageAccumulate.h b/Imaging/Statistics/vtkImageAccumulate.h
index 857a6583d4c74106c0aaaeabb8a5d8958760dd97..77f73c26846af6826afc5ad3aa74fcda5269543d 100644
--- a/Imaging/Statistics/vtkImageAccumulate.h
+++ b/Imaging/Statistics/vtkImageAccumulate.h
@@ -47,7 +47,7 @@ class VTKIMAGINGSTATISTICS_EXPORT vtkImageAccumulate : public vtkImageAlgorithm
public:
static vtkImageAccumulate *New();
vtkTypeMacro(vtkImageAccumulate,vtkImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -138,7 +138,7 @@ public:
protected:
vtkImageAccumulate();
- ~vtkImageAccumulate() VTK_OVERRIDE;
+ ~vtkImageAccumulate() override;
double ComponentSpacing[3];
double ComponentOrigin[3];
@@ -146,13 +146,13 @@ protected:
int RequestUpdateExtent(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
int RequestInformation (vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
int RequestData(vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
int IgnoreZero;
double Min[3];
@@ -163,7 +163,7 @@ protected:
int ReverseStencil;
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
private:
vtkImageAccumulate(const vtkImageAccumulate&) VTK_DELETE_FUNCTION;
diff --git a/Imaging/Statistics/vtkImageHistogram.h b/Imaging/Statistics/vtkImageHistogram.h
index 344cbac461c3bf79ca41392728c0eafe8629d902..8609a87c0329001887eea5b268717eeb11a3d109 100644
--- a/Imaging/Statistics/vtkImageHistogram.h
+++ b/Imaging/Statistics/vtkImageHistogram.h
@@ -45,7 +45,7 @@ public:
static vtkImageHistogram *New();
vtkTypeMacro(vtkImageHistogram,vtkThreadedImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Scale types for the histogram image.
@@ -193,24 +193,24 @@ public:
vtkInformationVector **inputVector,
vtkInformationVector *outputVector,
vtkImageData ***inData,
- vtkImageData **outData, int ext[6], int id) VTK_OVERRIDE;
+ vtkImageData **outData, int ext[6], int id) override;
protected:
vtkImageHistogram();
- ~vtkImageHistogram() VTK_OVERRIDE;
+ ~vtkImageHistogram() override;
int RequestUpdateExtent(vtkInformation *vtkNotUsed(request),
vtkInformationVector **inInfo,
- vtkInformationVector *vtkNotUsed(outInfo)) VTK_OVERRIDE;
+ vtkInformationVector *vtkNotUsed(outInfo)) override;
int RequestInformation(vtkInformation *vtkNotUsed(request),
vtkInformationVector **inInfo,
- vtkInformationVector *vtkNotUsed(outInfo)) VTK_OVERRIDE;
+ vtkInformationVector *vtkNotUsed(outInfo)) override;
int RequestData(vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
- int FillOutputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
+ int FillOutputPortInformation(int port, vtkInformation *info) override;
/**
* Compute the range of the data. The GetScalarRange() function of
diff --git a/Imaging/Statistics/vtkImageHistogramStatistics.h b/Imaging/Statistics/vtkImageHistogramStatistics.h
index 0a13d33c7878c79411885a2d09f4b7d1dab175fb..957f020e56751daaddd134d144914eccf77955c8 100644
--- a/Imaging/Statistics/vtkImageHistogramStatistics.h
+++ b/Imaging/Statistics/vtkImageHistogramStatistics.h
@@ -44,7 +44,7 @@ public:
static vtkImageHistogramStatistics *New();
vtkTypeMacro(vtkImageHistogramStatistics,vtkImageHistogram);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Get the minimum value present in the image. This value is computed
@@ -115,11 +115,11 @@ public:
protected:
vtkImageHistogramStatistics();
- ~vtkImageHistogramStatistics() VTK_OVERRIDE;
+ ~vtkImageHistogramStatistics() override;
int RequestData(vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
double Minimum;
double Maximum;
diff --git a/Imaging/Stencil/vtkImageStencil.h b/Imaging/Stencil/vtkImageStencil.h
index 4ffd389b5e880e61ff54a3419284224c0802508a..def9a066bbc15134e690e9c280b8b51f9b5965b2 100644
--- a/Imaging/Stencil/vtkImageStencil.h
+++ b/Imaging/Stencil/vtkImageStencil.h
@@ -33,7 +33,7 @@ class VTKIMAGINGSTENCIL_EXPORT vtkImageStencil : public vtkThreadedImageAlgorith
public:
static vtkImageStencil *New();
vtkTypeMacro(vtkImageStencil, vtkThreadedImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -93,18 +93,18 @@ public:
protected:
vtkImageStencil();
- ~vtkImageStencil() VTK_OVERRIDE;
+ ~vtkImageStencil() override;
void ThreadedRequestData(vtkInformation *request,
vtkInformationVector **inputVector,
vtkInformationVector *outputVector,
vtkImageData ***inData, vtkImageData **outData,
- int extent[6], int id) VTK_OVERRIDE;
+ int extent[6], int id) override;
int ReverseStencil;
double BackgroundColor[4];
- int FillInputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
+ int FillInputPortInformation(int, vtkInformation*) override;
private:
vtkImageStencil(const vtkImageStencil&) VTK_DELETE_FUNCTION;
diff --git a/Imaging/Stencil/vtkImageStencilToImage.h b/Imaging/Stencil/vtkImageStencilToImage.h
index 6d8b0fd64f3d46b568f1c78bb76044633d7fb935..2a89de26d0e755cd7fe7ec5af21f701f90f16cad 100644
--- a/Imaging/Stencil/vtkImageStencilToImage.h
+++ b/Imaging/Stencil/vtkImageStencilToImage.h
@@ -36,7 +36,7 @@ class VTKIMAGINGSTENCIL_EXPORT vtkImageStencilToImage : public vtkImageAlgorithm
public:
static vtkImageStencilToImage *New();
vtkTypeMacro(vtkImageStencilToImage, vtkImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -79,21 +79,21 @@ public:
protected:
vtkImageStencilToImage();
- ~vtkImageStencilToImage() VTK_OVERRIDE;
+ ~vtkImageStencilToImage() override;
int RequestInformation(vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
int RequestData(vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
double OutsideValue;
double InsideValue;
int OutputScalarType;
- int FillInputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
+ int FillInputPortInformation(int, vtkInformation*) override;
private:
vtkImageStencilToImage(const vtkImageStencilToImage&) VTK_DELETE_FUNCTION;
diff --git a/Imaging/Stencil/vtkImageToImageStencil.h b/Imaging/Stencil/vtkImageToImageStencil.h
index 7d363e51fb229be88aa0fc8dcd5547b35af69f0a..df98779aaff7acacef2919b176a5bb17d5e83d10 100644
--- a/Imaging/Stencil/vtkImageToImageStencil.h
+++ b/Imaging/Stencil/vtkImageToImageStencil.h
@@ -37,7 +37,7 @@ class VTKIMAGINGSTENCIL_EXPORT vtkImageToImageStencil : public vtkImageStencilAl
public:
static vtkImageToImageStencil *New();
vtkTypeMacro(vtkImageToImageStencil, vtkImageStencilAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -74,12 +74,12 @@ public:
protected:
vtkImageToImageStencil();
- ~vtkImageToImageStencil() VTK_OVERRIDE;
+ ~vtkImageToImageStencil() override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int RequestInformation(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int RequestUpdateExtent(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int RequestInformation(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int RequestUpdateExtent(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int FillInputPortInformation(int, vtkInformation*) override;
double UpperThreshold;
double LowerThreshold;
diff --git a/Imaging/Stencil/vtkImplicitFunctionToImageStencil.h b/Imaging/Stencil/vtkImplicitFunctionToImageStencil.h
index 23d263a06658ad51a03636298b53254ee0442993..a012211a6d3c1de0af9eb4f6d62264fb65074b42 100644
--- a/Imaging/Stencil/vtkImplicitFunctionToImageStencil.h
+++ b/Imaging/Stencil/vtkImplicitFunctionToImageStencil.h
@@ -37,7 +37,7 @@ class VTKIMAGINGSTENCIL_EXPORT vtkImplicitFunctionToImageStencil : public vtkIma
public:
static vtkImplicitFunctionToImageStencil *New();
vtkTypeMacro(vtkImplicitFunctionToImageStencil, vtkImageStencilSource);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -58,14 +58,14 @@ public:
/**
* Override GetMTime() to account for the implicit function.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
protected:
vtkImplicitFunctionToImageStencil();
- ~vtkImplicitFunctionToImageStencil() VTK_OVERRIDE;
+ ~vtkImplicitFunctionToImageStencil() override;
int RequestData(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
vtkImplicitFunction *Input;
double Threshold;
diff --git a/Imaging/Stencil/vtkLassoStencilSource.h b/Imaging/Stencil/vtkLassoStencilSource.h
index db50b8c1d6ec90b2aec838bb48688ef3b6e402f3..e4b6655b84f02dc815d8479c42da9d1450d61949 100644
--- a/Imaging/Stencil/vtkLassoStencilSource.h
+++ b/Imaging/Stencil/vtkLassoStencilSource.h
@@ -42,7 +42,7 @@ class VTKIMAGINGSTENCIL_EXPORT vtkLassoStencilSource : public vtkImageStencilSou
public:
static vtkLassoStencilSource *New();
vtkTypeMacro(vtkLassoStencilSource, vtkImageStencilSource);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
enum {
POLYGON = 0,
@@ -98,14 +98,14 @@ public:
/**
* Overload GetMTime() to include the timestamp on the points.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
protected:
vtkLassoStencilSource();
- ~vtkLassoStencilSource() VTK_OVERRIDE;
+ ~vtkLassoStencilSource() override;
int RequestData(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
int Shape;
int SliceOrientation;
diff --git a/Imaging/Stencil/vtkPolyDataToImageStencil.h b/Imaging/Stencil/vtkPolyDataToImageStencil.h
index 4306325c08515d9f7cc8518e5a5fca423825cf3c..418f89a950d359137dbfdd668b88f66332ea77be 100644
--- a/Imaging/Stencil/vtkPolyDataToImageStencil.h
+++ b/Imaging/Stencil/vtkPolyDataToImageStencil.h
@@ -75,7 +75,7 @@ class VTKIMAGINGSTENCIL_EXPORT vtkPolyDataToImageStencil :
public:
static vtkPolyDataToImageStencil* New();
vtkTypeMacro(vtkPolyDataToImageStencil, vtkImageStencilSource);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -99,7 +99,7 @@ public:
protected:
vtkPolyDataToImageStencil();
- ~vtkPolyDataToImageStencil() VTK_OVERRIDE;
+ ~vtkPolyDataToImageStencil() override;
void ThreadedExecute(vtkImageStencilData *output,
int extent[6], int threadId);
@@ -111,9 +111,9 @@ protected:
double z, double thickness);
int RequestData(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
- int FillInputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
+ int FillInputPortInformation(int, vtkInformation*) override;
/**
* The tolerance distance for favoring the inside of the stencil
diff --git a/Imaging/Stencil/vtkROIStencilSource.h b/Imaging/Stencil/vtkROIStencilSource.h
index f60dbe0ee5ef35b2e0a01646bbda2ad898f272db..6801fba876fdc334d613d76bc65a38338b67c172 100644
--- a/Imaging/Stencil/vtkROIStencilSource.h
+++ b/Imaging/Stencil/vtkROIStencilSource.h
@@ -38,7 +38,7 @@ class VTKIMAGINGSTENCIL_EXPORT vtkROIStencilSource : public vtkImageStencilSourc
public:
static vtkROIStencilSource *New();
vtkTypeMacro(vtkROIStencilSource, vtkImageStencilSource);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
enum {
BOX = 0,
@@ -74,10 +74,10 @@ public:
protected:
vtkROIStencilSource();
- ~vtkROIStencilSource() VTK_OVERRIDE;
+ ~vtkROIStencilSource() override;
int RequestData(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
int Shape;
double Bounds[6];
diff --git a/Infovis/Core/vtkAddMembershipArray.h b/Infovis/Core/vtkAddMembershipArray.h
index 425b3b9054a43051fd64a5070a6a516f29e3373d..0a2cafb652a9e408d12c1e16d1304c29330fead9 100644
--- a/Infovis/Core/vtkAddMembershipArray.h
+++ b/Infovis/Core/vtkAddMembershipArray.h
@@ -41,7 +41,7 @@ class VTKINFOVISCORE_EXPORT vtkAddMembershipArray : public vtkPassInputTypeAlgor
public:
static vtkAddMembershipArray* New();
vtkTypeMacro(vtkAddMembershipArray,vtkPassInputTypeAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
enum
{
@@ -78,14 +78,14 @@ public:
protected:
vtkAddMembershipArray();
- ~vtkAddMembershipArray() VTK_OVERRIDE;
+ ~vtkAddMembershipArray() override;
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
int RequestData(
vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
int FieldType;
char* OutputArrayName;
diff --git a/Infovis/Core/vtkAdjacencyMatrixToEdgeTable.h b/Infovis/Core/vtkAdjacencyMatrixToEdgeTable.h
index 024d72520444aeabc3245ee67ee9f625c97c238b..c2c22758708a0a38009fb9806fdb5600230a88c0 100644
--- a/Infovis/Core/vtkAdjacencyMatrixToEdgeTable.h
+++ b/Infovis/Core/vtkAdjacencyMatrixToEdgeTable.h
@@ -41,7 +41,7 @@ class VTKINFOVISCORE_EXPORT vtkAdjacencyMatrixToEdgeTable : public vtkTableAlgor
public:
static vtkAdjacencyMatrixToEdgeTable* New();
vtkTypeMacro(vtkAdjacencyMatrixToEdgeTable, vtkTableAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -82,14 +82,14 @@ public:
protected:
vtkAdjacencyMatrixToEdgeTable();
- ~vtkAdjacencyMatrixToEdgeTable() VTK_OVERRIDE;
+ ~vtkAdjacencyMatrixToEdgeTable() override;
- int FillInputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
+ int FillInputPortInformation(int, vtkInformation*) override;
int RequestData(
vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
vtkIdType SourceDimension;
char* ValueArrayName;
diff --git a/Infovis/Core/vtkArrayNorm.h b/Infovis/Core/vtkArrayNorm.h
index 778ca74870704c164dde9b8c00136a85d313ec35..0c4aafff586a521ae543cf6d22fce83764685988 100644
--- a/Infovis/Core/vtkArrayNorm.h
+++ b/Infovis/Core/vtkArrayNorm.h
@@ -46,7 +46,7 @@ class VTKINFOVISCORE_EXPORT vtkArrayNorm : public vtkArrayDataAlgorithm
public:
static vtkArrayNorm* New();
vtkTypeMacro(vtkArrayNorm, vtkArrayDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -84,12 +84,12 @@ public:
protected:
vtkArrayNorm();
- ~vtkArrayNorm() VTK_OVERRIDE;
+ ~vtkArrayNorm() override;
int RequestData(
vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
private:
vtkArrayNorm(const vtkArrayNorm&) VTK_DELETE_FUNCTION;
diff --git a/Infovis/Core/vtkArrayToTable.h b/Infovis/Core/vtkArrayToTable.h
index 5d16d2eed8426d68052308f474a2839466a249cc..5dfa97fcfff04513facd84b1bddcd203373b982f 100644
--- a/Infovis/Core/vtkArrayToTable.h
+++ b/Infovis/Core/vtkArrayToTable.h
@@ -39,18 +39,18 @@ class VTKINFOVISCORE_EXPORT vtkArrayToTable : public vtkTableAlgorithm
public:
static vtkArrayToTable* New();
vtkTypeMacro(vtkArrayToTable, vtkTableAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkArrayToTable();
- ~vtkArrayToTable() VTK_OVERRIDE;
+ ~vtkArrayToTable() override;
- int FillInputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
+ int FillInputPortInformation(int, vtkInformation*) override;
int RequestData(
vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
private:
vtkArrayToTable(const vtkArrayToTable&) VTK_DELETE_FUNCTION;
diff --git a/Infovis/Core/vtkCollapseGraph.h b/Infovis/Core/vtkCollapseGraph.h
index 4f02c870953ab10a7d52788f3dbe70355fb38ec6..5747454bb5897825b40afea9b9ab4a150f567fe6 100644
--- a/Infovis/Core/vtkCollapseGraph.h
+++ b/Infovis/Core/vtkCollapseGraph.h
@@ -51,7 +51,7 @@ class VTKINFOVISCORE_EXPORT vtkCollapseGraph : public vtkGraphAlgorithm
public:
static vtkCollapseGraph* New();
vtkTypeMacro(vtkCollapseGraph,vtkGraphAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/// Convenience function provided for setting the graph input.
void SetGraphConnection(vtkAlgorithmOutput*);
@@ -60,14 +60,14 @@ public:
protected:
vtkCollapseGraph();
- ~vtkCollapseGraph() VTK_OVERRIDE;
+ ~vtkCollapseGraph() override;
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
int RequestData(
vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
private:
vtkCollapseGraph(const vtkCollapseGraph&) VTK_DELETE_FUNCTION;
diff --git a/Infovis/Core/vtkCollapseVerticesByArray.h b/Infovis/Core/vtkCollapseVerticesByArray.h
index 3015caf7d7307c652deec73687d6c85df2409936..489729d53e6b9b536062355fa1dde4130eddd53e 100644
--- a/Infovis/Core/vtkCollapseVerticesByArray.h
+++ b/Infovis/Core/vtkCollapseVerticesByArray.h
@@ -41,7 +41,7 @@ public:
static vtkCollapseVerticesByArray* New();
vtkTypeMacro(vtkCollapseVerticesByArray, vtkGraphAlgorithm);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
//@{
/**
@@ -113,19 +113,19 @@ public:
protected:
vtkCollapseVerticesByArray();
- ~vtkCollapseVerticesByArray() VTK_OVERRIDE;
+ ~vtkCollapseVerticesByArray() override;
/**
* Pipeline function.
*/
int RequestData(vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
/**
* Pipeline function.
*/
- int FillOutputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillOutputPortInformation(int port, vtkInformation* info) override;
/**
diff --git a/Infovis/Core/vtkContinuousScatterplot.h b/Infovis/Core/vtkContinuousScatterplot.h
index 7f4b11bb1043e4dd8f7c54f79e135c3e2a763149..f05a8a163a00ea3c6a8ac003a3227d5d38195b9f 100644
--- a/Infovis/Core/vtkContinuousScatterplot.h
+++ b/Infovis/Core/vtkContinuousScatterplot.h
@@ -177,7 +177,7 @@ class VTKINFOVISCORE_EXPORT vtkContinuousScatterplot : public vtkImageAlgorithm
public:
static vtkContinuousScatterplot* New();
vtkTypeMacro(vtkContinuousScatterplot, vtkImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Get the tolerance used when comparing floating point numbers for equality.
@@ -205,12 +205,12 @@ protected:
vtkContinuousScatterplot();
// Configure input port to accept only vtkUnstructuredGrid.
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
// Configure out port to be a vtkImageData data set.
- int FillOutputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillOutputPortInformation(int port, vtkInformation* info) override;
int RequestData(
- vtkInformation*, vtkInformationVector**, vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformation*, vtkInformationVector**, vtkInformationVector*) override;
// Set the tolerance used when comparing floating numbers for equality.
double Epsilon;
diff --git a/Infovis/Core/vtkDataObjectToTable.h b/Infovis/Core/vtkDataObjectToTable.h
index 895ea251f7301d71ebbef9eeb96ae0f3954165ce..318adcddf6b4af600ad49eb1ce251932fa9c2cda 100644
--- a/Infovis/Core/vtkDataObjectToTable.h
+++ b/Infovis/Core/vtkDataObjectToTable.h
@@ -37,7 +37,7 @@ class VTKINFOVISCORE_EXPORT vtkDataObjectToTable : public vtkTableAlgorithm
public:
static vtkDataObjectToTable* New();
vtkTypeMacro(vtkDataObjectToTable,vtkTableAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
enum
{
@@ -59,14 +59,14 @@ public:
protected:
vtkDataObjectToTable();
- ~vtkDataObjectToTable() VTK_OVERRIDE;
+ ~vtkDataObjectToTable() override;
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
int RequestData(
vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
int FieldType;
diff --git a/Infovis/Core/vtkDotProductSimilarity.h b/Infovis/Core/vtkDotProductSimilarity.h
index a25147a7a156d8f447ddeaf2499a6ad00c1887d6..1075dfc9615ef843b01e24ff2c1997cd9822d06d 100644
--- a/Infovis/Core/vtkDotProductSimilarity.h
+++ b/Infovis/Core/vtkDotProductSimilarity.h
@@ -66,7 +66,7 @@ class VTKINFOVISCORE_EXPORT vtkDotProductSimilarity : public vtkTableAlgorithm
public:
static vtkDotProductSimilarity* New();
vtkTypeMacro(vtkDotProductSimilarity, vtkTableAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -149,14 +149,14 @@ public:
protected:
vtkDotProductSimilarity();
- ~vtkDotProductSimilarity() VTK_OVERRIDE;
+ ~vtkDotProductSimilarity() override;
- int FillInputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
+ int FillInputPortInformation(int, vtkInformation*) override;
int RequestData(
vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
private:
vtkDotProductSimilarity(const vtkDotProductSimilarity&) VTK_DELETE_FUNCTION;
diff --git a/Infovis/Core/vtkEdgeCenters.h b/Infovis/Core/vtkEdgeCenters.h
index 86addeef7a1a5da9390597f06d5a399ff0eb6baf..f1015bbc2a87ee031819ad45a4f1f0e640036cc9 100644
--- a/Infovis/Core/vtkEdgeCenters.h
+++ b/Infovis/Core/vtkEdgeCenters.h
@@ -42,7 +42,7 @@ class VTKINFOVISCORE_EXPORT vtkEdgeCenters : public vtkPolyDataAlgorithm
{
public:
vtkTypeMacro(vtkEdgeCenters,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct object with vertex cell generation turned off.
@@ -60,10 +60,10 @@ public:
protected:
vtkEdgeCenters();
- ~vtkEdgeCenters()VTK_OVERRIDE {}
+ ~vtkEdgeCenters() override {}
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
int VertexCells;
private:
diff --git a/Infovis/Core/vtkExpandSelectedGraph.h b/Infovis/Core/vtkExpandSelectedGraph.h
index b5d8cd673f008c1493b2d943bf141d119dbd4ad8..1fa7ee4e06b4df8b0d7c92b95dfc8daaf433353b 100644
--- a/Infovis/Core/vtkExpandSelectedGraph.h
+++ b/Infovis/Core/vtkExpandSelectedGraph.h
@@ -48,7 +48,7 @@ class VTKINFOVISCORE_EXPORT vtkExpandSelectedGraph : public vtkSelectionAlgorith
public:
static vtkExpandSelectedGraph* New();
vtkTypeMacro(vtkExpandSelectedGraph,vtkSelectionAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* A convenience method for setting the second input (i.e. the graph).
@@ -58,7 +58,7 @@ public:
/**
* Specify the first vtkSelection input and the second vtkGraph input.
*/
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
//@{
/**
@@ -101,12 +101,12 @@ public:
protected:
vtkExpandSelectedGraph();
- ~vtkExpandSelectedGraph() VTK_OVERRIDE;
+ ~vtkExpandSelectedGraph() override;
int RequestData(
vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
void Expand(vtkIdTypeArray*,vtkGraph*);
diff --git a/Infovis/Core/vtkExtractSelectedGraph.h b/Infovis/Core/vtkExtractSelectedGraph.h
index f3eafaf1a2e43232ff7730dbde20acd7c7c51008..ec48b2e438b1af29c42b9891e9e89989c2e97546 100644
--- a/Infovis/Core/vtkExtractSelectedGraph.h
+++ b/Infovis/Core/vtkExtractSelectedGraph.h
@@ -48,7 +48,7 @@ class VTKINFOVISCORE_EXPORT vtkExtractSelectedGraph : public vtkGraphAlgorithm
public:
static vtkExtractSelectedGraph* New();
vtkTypeMacro(vtkExtractSelectedGraph,vtkGraphAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* A convenience method for setting the second input (i.e. the selection).
@@ -74,21 +74,21 @@ public:
/**
* Specify the first vtkGraph input and the second vtkSelection input.
*/
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
protected:
vtkExtractSelectedGraph();
- ~vtkExtractSelectedGraph() VTK_OVERRIDE;
+ ~vtkExtractSelectedGraph() override;
int RequestData(
vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
int RequestDataObject(
vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
bool RemoveIsolatedVertices;
diff --git a/Infovis/Core/vtkExtractSelectedTree.h b/Infovis/Core/vtkExtractSelectedTree.h
index 71e851779ac51e435693870edefc4dfcb67fc39f..39da84b30f1c4af733d15c2cd4d23ba63d645a73 100644
--- a/Infovis/Core/vtkExtractSelectedTree.h
+++ b/Infovis/Core/vtkExtractSelectedTree.h
@@ -40,22 +40,22 @@ class VTKINFOVISCORE_EXPORT vtkExtractSelectedTree : public vtkTreeAlgorithm
public:
static vtkExtractSelectedTree* New();
vtkTypeMacro(vtkExtractSelectedTree,vtkTreeAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* A convenience method for setting the second input (i.e. the selection).
*/
void SetSelectionConnection(vtkAlgorithmOutput* in);
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
protected:
vtkExtractSelectedTree();
- ~vtkExtractSelectedTree() VTK_OVERRIDE;
+ ~vtkExtractSelectedTree() override;
int RequestData(
vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
int BuildTree(vtkTree * inputTree, vtkIdTypeArray * list, vtkMutableDirectedGraph * builder);
diff --git a/Infovis/Core/vtkGenerateIndexArray.h b/Infovis/Core/vtkGenerateIndexArray.h
index ed2d12b94aea6b1ed2e484635f75172a0dc92883..3b2311f9a6970ab35da727d3af689003a364cacd 100644
--- a/Infovis/Core/vtkGenerateIndexArray.h
+++ b/Infovis/Core/vtkGenerateIndexArray.h
@@ -54,7 +54,7 @@ public:
static vtkGenerateIndexArray *New();
vtkTypeMacro(vtkGenerateIndexArray, vtkDataObjectAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -100,22 +100,22 @@ public:
protected:
vtkGenerateIndexArray();
- ~vtkGenerateIndexArray() VTK_OVERRIDE;
+ ~vtkGenerateIndexArray() override;
int ProcessRequest(
vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
int RequestDataObject(
vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
int RequestData(
vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
char* ArrayName;
int FieldType;
diff --git a/Infovis/Core/vtkGraphHierarchicalBundleEdges.h b/Infovis/Core/vtkGraphHierarchicalBundleEdges.h
index 1d16db3e2ba5a9bd489b278dece664e74f961ab4..dfec4cd18f86847deb7c23b8d2b2bf56760a8f5a 100644
--- a/Infovis/Core/vtkGraphHierarchicalBundleEdges.h
+++ b/Infovis/Core/vtkGraphHierarchicalBundleEdges.h
@@ -64,7 +64,7 @@ public:
static vtkGraphHierarchicalBundleEdges *New();
vtkTypeMacro(vtkGraphHierarchicalBundleEdges,vtkGraphAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -92,11 +92,11 @@ public:
/**
* Set the input type of the algorithm to vtkGraph.
*/
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
protected:
vtkGraphHierarchicalBundleEdges();
- ~vtkGraphHierarchicalBundleEdges()VTK_OVERRIDE {}
+ ~vtkGraphHierarchicalBundleEdges() override {}
double BundlingStrength;
bool DirectMapping;
@@ -104,7 +104,7 @@ protected:
/**
* Convert the vtkGraph into vtkPolyData.
*/
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
private:
vtkGraphHierarchicalBundleEdges(const vtkGraphHierarchicalBundleEdges&) VTK_DELETE_FUNCTION;
diff --git a/Infovis/Core/vtkGroupLeafVertices.h b/Infovis/Core/vtkGroupLeafVertices.h
index c272ca6adb298ce5e357cf67ff2da1d3c11c7d0a..60ae5502ee2ba5c4fec6d9b570c50967c54a06d7 100644
--- a/Infovis/Core/vtkGroupLeafVertices.h
+++ b/Infovis/Core/vtkGroupLeafVertices.h
@@ -37,7 +37,7 @@ class VTKINFOVISCORE_EXPORT vtkGroupLeafVertices : public vtkTreeAlgorithm
public:
static vtkGroupLeafVertices* New();
vtkTypeMacro(vtkGroupLeafVertices,vtkTreeAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -54,12 +54,12 @@ public:
protected:
vtkGroupLeafVertices();
- ~vtkGroupLeafVertices() VTK_OVERRIDE;
+ ~vtkGroupLeafVertices() override;
int RequestData(
vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
char* GroupDomain;
diff --git a/Infovis/Core/vtkKCoreDecomposition.h b/Infovis/Core/vtkKCoreDecomposition.h
index aff1ae498e17a57e09fd90fc353623c6264b6c6d..588ecc18c80ff5cb2afa1acffe6f83bccdcea221 100644
--- a/Infovis/Core/vtkKCoreDecomposition.h
+++ b/Infovis/Core/vtkKCoreDecomposition.h
@@ -52,7 +52,7 @@ public:
static vtkKCoreDecomposition *New();
vtkTypeMacro(vtkKCoreDecomposition, vtkGraphAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -99,9 +99,9 @@ public:
protected:
vtkKCoreDecomposition();
- ~vtkKCoreDecomposition() VTK_OVERRIDE;
+ ~vtkKCoreDecomposition() override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
private:
diff --git a/Infovis/Core/vtkMergeColumns.h b/Infovis/Core/vtkMergeColumns.h
index 309bee8831f79ba23ff1e3219a1e922293bc5b24..4d262ea98fbbd2665218ee76563dedc115aea848 100644
--- a/Infovis/Core/vtkMergeColumns.h
+++ b/Infovis/Core/vtkMergeColumns.h
@@ -50,7 +50,7 @@ class VTKINFOVISCORE_EXPORT vtkMergeColumns : public vtkTableAlgorithm
public:
static vtkMergeColumns* New();
vtkTypeMacro(vtkMergeColumns,vtkTableAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -62,14 +62,14 @@ public:
protected:
vtkMergeColumns();
- ~vtkMergeColumns() VTK_OVERRIDE;
+ ~vtkMergeColumns() override;
char* MergedColumnName;
int RequestData(
vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
private:
vtkMergeColumns(const vtkMergeColumns&) VTK_DELETE_FUNCTION;
diff --git a/Infovis/Core/vtkMergeGraphs.h b/Infovis/Core/vtkMergeGraphs.h
index d84b7cbba7cac098ee274d795f29e24c5c1f6d68..698d9153cf7e2c6c185c7e67630e07bfa02131dd 100644
--- a/Infovis/Core/vtkMergeGraphs.h
+++ b/Infovis/Core/vtkMergeGraphs.h
@@ -60,7 +60,7 @@ class VTKINFOVISCORE_EXPORT vtkMergeGraphs : public vtkGraphAlgorithm
public:
static vtkMergeGraphs* New();
vtkTypeMacro(vtkMergeGraphs,vtkGraphAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* This is the core functionality of the algorithm. Adds edges
@@ -99,14 +99,14 @@ public:
protected:
vtkMergeGraphs();
- ~vtkMergeGraphs() VTK_OVERRIDE;
+ ~vtkMergeGraphs() override;
int RequestData(
vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
bool UseEdgeWindow;
char* EdgeWindowArrayName;
diff --git a/Infovis/Core/vtkMergeTables.h b/Infovis/Core/vtkMergeTables.h
index 351803d665e8dc43e37845158f7fe81844ff1b51..37b165cbb58ede3dd410967c95a0ffd714e95cc9 100644
--- a/Infovis/Core/vtkMergeTables.h
+++ b/Infovis/Core/vtkMergeTables.h
@@ -47,7 +47,7 @@ class VTKINFOVISCORE_EXPORT vtkMergeTables : public vtkTableAlgorithm
public:
static vtkMergeTables* New();
vtkTypeMacro(vtkMergeTables,vtkTableAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -92,7 +92,7 @@ public:
protected:
vtkMergeTables();
- ~vtkMergeTables() VTK_OVERRIDE;
+ ~vtkMergeTables() override;
bool MergeColumnsByName;
bool PrefixAllButMerged;
@@ -102,7 +102,7 @@ protected:
int RequestData(
vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
private:
vtkMergeTables(const vtkMergeTables&) VTK_DELETE_FUNCTION;
diff --git a/Infovis/Core/vtkMutableGraphHelper.h b/Infovis/Core/vtkMutableGraphHelper.h
index 064e5f9556eaadd918dc5e653e8005f84be50612..3aa6ac503c1f079f150b081f1bbdd066c048bf50 100644
--- a/Infovis/Core/vtkMutableGraphHelper.h
+++ b/Infovis/Core/vtkMutableGraphHelper.h
@@ -49,7 +49,7 @@ class VTKINFOVISCORE_EXPORT vtkMutableGraphHelper : public vtkObject
public:
static vtkMutableGraphHelper *New();
vtkTypeMacro(vtkMutableGraphHelper, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -95,7 +95,7 @@ public:
protected:
vtkMutableGraphHelper();
- ~vtkMutableGraphHelper() VTK_OVERRIDE;
+ ~vtkMutableGraphHelper() override;
vtkGetObjectMacro(InternalGraph, vtkGraph);
void SetInternalGraph(vtkGraph* g);
diff --git a/Infovis/Core/vtkNetworkHierarchy.h b/Infovis/Core/vtkNetworkHierarchy.h
index 5853ecf8841a65a04e9f908a88e472bdacaf3b35..972d22d62544cd3469ee7d2376608cdf700a6877 100644
--- a/Infovis/Core/vtkNetworkHierarchy.h
+++ b/Infovis/Core/vtkNetworkHierarchy.h
@@ -50,21 +50,21 @@ public:
vtkSetStringMacro(IPArrayName);
//@}
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkNetworkHierarchy();
- ~vtkNetworkHierarchy() VTK_OVERRIDE;
+ ~vtkNetworkHierarchy() override;
int RequestData(
vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
int FillOutputPortInformation(
- int vtkNotUsed(port), vtkInformation* info) VTK_OVERRIDE;
+ int vtkNotUsed(port), vtkInformation* info) override;
int FillInputPortInformation(
- int vtkNotUsed(port), vtkInformation* info) VTK_OVERRIDE;
+ int vtkNotUsed(port), vtkInformation* info) override;
private:
vtkNetworkHierarchy(const vtkNetworkHierarchy&) VTK_DELETE_FUNCTION;
diff --git a/Infovis/Core/vtkPipelineGraphSource.h b/Infovis/Core/vtkPipelineGraphSource.h
index 8da04621aebf0f4522e30b1b9cfd661676258a9e..1ae6f4fd9ad61233ee6a4ea4f69ac1a53f834142 100644
--- a/Infovis/Core/vtkPipelineGraphSource.h
+++ b/Infovis/Core/vtkPipelineGraphSource.h
@@ -33,7 +33,7 @@ class VTKINFOVISCORE_EXPORT vtkPipelineGraphSource : public vtkDirectedGraphAlgo
public:
static vtkPipelineGraphSource* New();
vtkTypeMacro(vtkPipelineGraphSource,vtkDirectedGraphAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
void AddSink(vtkObject* object);
void RemoveSink(vtkObject* object);
@@ -51,12 +51,12 @@ public:
protected:
vtkPipelineGraphSource();
- ~vtkPipelineGraphSource() VTK_OVERRIDE;
+ ~vtkPipelineGraphSource() override;
int RequestData(
vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
vtkCollection* Sinks;
diff --git a/Infovis/Core/vtkPruneTreeFilter.h b/Infovis/Core/vtkPruneTreeFilter.h
index 97507e2f363d42e5812d6c7a4b1caaf0ce485e69..d37912feab3e2630a22a6efe1abb2010e8c5f332 100644
--- a/Infovis/Core/vtkPruneTreeFilter.h
+++ b/Infovis/Core/vtkPruneTreeFilter.h
@@ -40,7 +40,7 @@ class VTKINFOVISCORE_EXPORT vtkPruneTreeFilter : public vtkTreeAlgorithm
public:
static vtkPruneTreeFilter* New();
vtkTypeMacro(vtkPruneTreeFilter,vtkTreeAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -61,7 +61,7 @@ public:
protected:
vtkPruneTreeFilter();
- ~vtkPruneTreeFilter() VTK_OVERRIDE;
+ ~vtkPruneTreeFilter() override;
vtkIdType ParentVertex;
bool ShouldPruneParentVertex;
@@ -69,7 +69,7 @@ protected:
int RequestData(
vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
private:
vtkPruneTreeFilter(const vtkPruneTreeFilter&) VTK_DELETE_FUNCTION;
diff --git a/Infovis/Core/vtkRandomGraphSource.h b/Infovis/Core/vtkRandomGraphSource.h
index 65d3babe8bd16e3b43f39649ccab492c17b10c0b..19758a1d63097401f963a56b89bd32fb6ead15a5 100644
--- a/Infovis/Core/vtkRandomGraphSource.h
+++ b/Infovis/Core/vtkRandomGraphSource.h
@@ -43,7 +43,7 @@ class VTKINFOVISCORE_EXPORT vtkRandomGraphSource : public vtkGraphAlgorithm
public:
static vtkRandomGraphSource* New();
vtkTypeMacro(vtkRandomGraphSource,vtkGraphAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -176,7 +176,7 @@ public:
protected:
vtkRandomGraphSource();
- ~vtkRandomGraphSource() VTK_OVERRIDE;
+ ~vtkRandomGraphSource() override;
int NumberOfVertices;
int NumberOfEdges;
double EdgeProbability;
@@ -195,14 +195,14 @@ protected:
int RequestData(
vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
/**
* Creates directed or undirected output based on Directed flag.
*/
int RequestDataObject(vtkInformation*,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
private:
vtkRandomGraphSource(const vtkRandomGraphSource&) VTK_DELETE_FUNCTION;
diff --git a/Infovis/Core/vtkReduceTable.h b/Infovis/Core/vtkReduceTable.h
index 1aa31f5c89872142f08b150ad74784e3457a47c4..594a6639585bbfadf8138e8f7c05b1a2880c08b1 100644
--- a/Infovis/Core/vtkReduceTable.h
+++ b/Infovis/Core/vtkReduceTable.h
@@ -50,7 +50,7 @@ class VTKINFOVISCORE_EXPORT vtkReduceTable : public vtkTableAlgorithm
public:
static vtkReduceTable* New();
vtkTypeMacro(vtkReduceTable,vtkTableAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -105,12 +105,12 @@ public:
protected:
vtkReduceTable();
- ~vtkReduceTable() VTK_OVERRIDE;
+ ~vtkReduceTable() override;
int RequestData(
vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
/**
* Initialize the output table to have the same types of columns as
diff --git a/Infovis/Core/vtkRemoveHiddenData.h b/Infovis/Core/vtkRemoveHiddenData.h
index 27021f64616ad1e037b213debbc3bf061948d75c..1caa390e747718ecd9eab5883b61871fd5d552d1 100644
--- a/Infovis/Core/vtkRemoveHiddenData.h
+++ b/Infovis/Core/vtkRemoveHiddenData.h
@@ -47,22 +47,22 @@ class VTKINFOVISCORE_EXPORT vtkRemoveHiddenData : public vtkPassInputTypeAlgorit
public:
static vtkRemoveHiddenData *New();
vtkTypeMacro(vtkRemoveHiddenData, vtkPassInputTypeAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkRemoveHiddenData();
- ~vtkRemoveHiddenData() VTK_OVERRIDE;
+ ~vtkRemoveHiddenData() override;
/**
* Convert the vtkGraph into vtkPolyData.
*/
int RequestData(
- vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
/**
* Set the input type of the algorithm to vtkGraph.
*/
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
private:
vtkRemoveHiddenData(const vtkRemoveHiddenData&) VTK_DELETE_FUNCTION;
diff --git a/Infovis/Core/vtkRemoveIsolatedVertices.h b/Infovis/Core/vtkRemoveIsolatedVertices.h
index 2cc982f7666676dc1a343e53c519a6e8a9099759..52a54c9017447328b36f96edd5ad7e135065ec53 100644
--- a/Infovis/Core/vtkRemoveIsolatedVertices.h
+++ b/Infovis/Core/vtkRemoveIsolatedVertices.h
@@ -38,16 +38,16 @@ class VTKINFOVISCORE_EXPORT vtkRemoveIsolatedVertices : public vtkGraphAlgorithm
public:
static vtkRemoveIsolatedVertices* New();
vtkTypeMacro(vtkRemoveIsolatedVertices,vtkGraphAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkRemoveIsolatedVertices();
- ~vtkRemoveIsolatedVertices() VTK_OVERRIDE;
+ ~vtkRemoveIsolatedVertices() override;
int RequestData(
vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
private:
vtkRemoveIsolatedVertices(const vtkRemoveIsolatedVertices&) VTK_DELETE_FUNCTION;
diff --git a/Infovis/Core/vtkSparseArrayToTable.h b/Infovis/Core/vtkSparseArrayToTable.h
index 8e7c37e9c2cb8b4daf10ccb1607e35f13b0870f1..69eff98dbef0ac3562cdb1585e4f931a54f0eff4 100644
--- a/Infovis/Core/vtkSparseArrayToTable.h
+++ b/Infovis/Core/vtkSparseArrayToTable.h
@@ -49,7 +49,7 @@ class VTKINFOVISCORE_EXPORT vtkSparseArrayToTable : public vtkTableAlgorithm
public:
static vtkSparseArrayToTable* New();
vtkTypeMacro(vtkSparseArrayToTable, vtkTableAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -62,14 +62,14 @@ public:
protected:
vtkSparseArrayToTable();
- ~vtkSparseArrayToTable() VTK_OVERRIDE;
+ ~vtkSparseArrayToTable() override;
- int FillInputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
+ int FillInputPortInformation(int, vtkInformation*) override;
int RequestData(
vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
char* ValueColumn;
diff --git a/Infovis/Core/vtkStreamGraph.h b/Infovis/Core/vtkStreamGraph.h
index a27b71145d53551e508824d682c070ffef673091..5bccd65ac7543b47e6b3cb9605f498fe32780044 100644
--- a/Infovis/Core/vtkStreamGraph.h
+++ b/Infovis/Core/vtkStreamGraph.h
@@ -51,7 +51,7 @@ class VTKINFOVISCORE_EXPORT vtkStreamGraph : public vtkGraphAlgorithm
public:
static vtkStreamGraph* New();
vtkTypeMacro(vtkStreamGraph,vtkGraphAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -84,12 +84,12 @@ public:
protected:
vtkStreamGraph();
- ~vtkStreamGraph() VTK_OVERRIDE;
+ ~vtkStreamGraph() override;
int RequestData(
vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
vtkMutableGraphHelper* CurrentGraph;
vtkMergeGraphs* MergeGraphs;
diff --git a/Infovis/Core/vtkStringToCategory.h b/Infovis/Core/vtkStringToCategory.h
index 8469c604dab02df8c278f34e2164a92c89c31fc6..454b9555fae3bd0cd5f23a2b1c35d64ee6b04daa 100644
--- a/Infovis/Core/vtkStringToCategory.h
+++ b/Infovis/Core/vtkStringToCategory.h
@@ -47,7 +47,7 @@ class VTKINFOVISCORE_EXPORT vtkStringToCategory : public vtkDataObjectAlgorithm
public:
static vtkStringToCategory* New();
vtkTypeMacro(vtkStringToCategory,vtkDataObjectAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -62,25 +62,25 @@ public:
*/
int ProcessRequest(vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
protected:
vtkStringToCategory();
- ~vtkStringToCategory() VTK_OVERRIDE;
+ ~vtkStringToCategory() override;
/**
* Creates the same output type as the input type.
*/
int RequestDataObject(vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
int RequestData(
vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
- int FillOutputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillOutputPortInformation(int port, vtkInformation* info) override;
char *CategoryArrayName;
diff --git a/Infovis/Core/vtkStringToNumeric.h b/Infovis/Core/vtkStringToNumeric.h
index 70c2a322332a76a9829936680327ba3d8e5d55cd..bcfa2860b74d65b61e215a79cf450f795b9e24cc 100644
--- a/Infovis/Core/vtkStringToNumeric.h
+++ b/Infovis/Core/vtkStringToNumeric.h
@@ -37,7 +37,7 @@ class VTKINFOVISCORE_EXPORT vtkStringToNumeric : public vtkDataObjectAlgorithm
public:
static vtkStringToNumeric* New();
vtkTypeMacro(vtkStringToNumeric,vtkDataObjectAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -144,18 +144,18 @@ public:
*/
int ProcessRequest(vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
protected:
vtkStringToNumeric();
- ~vtkStringToNumeric() VTK_OVERRIDE;
+ ~vtkStringToNumeric() override;
/**
* Creates the same output type as the input type.
*/
int RequestDataObject(vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
/**
* Tries to convert string arrays to integer or double arrays.
@@ -184,7 +184,7 @@ protected:
int RequestData(
vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
private:
vtkStringToNumeric(const vtkStringToNumeric&) VTK_DELETE_FUNCTION;
diff --git a/Infovis/Core/vtkTableToArray.h b/Infovis/Core/vtkTableToArray.h
index fdf8d7bb6d877e7a316255d7eb2c8dda0d2d7b5b..efe9f69270b49dd1b35d2a8ca2fae96af364b7af 100644
--- a/Infovis/Core/vtkTableToArray.h
+++ b/Infovis/Core/vtkTableToArray.h
@@ -49,7 +49,7 @@ class VTKINFOVISCORE_EXPORT vtkTableToArray : public vtkArrayDataAlgorithm
public:
static vtkTableToArray* New();
vtkTypeMacro(vtkTableToArray, vtkArrayDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Reset the list of input table columns that will be mapped to columns
@@ -73,14 +73,14 @@ public:
protected:
vtkTableToArray();
- ~vtkTableToArray() VTK_OVERRIDE;
+ ~vtkTableToArray() override;
- int FillInputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
+ int FillInputPortInformation(int, vtkInformation*) override;
int RequestData(
vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
private:
vtkTableToArray(const vtkTableToArray&) VTK_DELETE_FUNCTION;
diff --git a/Infovis/Core/vtkTableToGraph.h b/Infovis/Core/vtkTableToGraph.h
index 5a12b0bfe17a238a5abc3cc8348a3310642f15a8..e81046fbc694cce748622f728b272170270c3553 100644
--- a/Infovis/Core/vtkTableToGraph.h
+++ b/Infovis/Core/vtkTableToGraph.h
@@ -79,7 +79,7 @@ class VTKINFOVISCORE_EXPORT vtkTableToGraph : public vtkGraphAlgorithm
public:
static vtkTableToGraph* New();
vtkTypeMacro(vtkTableToGraph,vtkGraphAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Add a vertex to the link graph. Specify the column name, the domain name
@@ -128,7 +128,7 @@ public:
/**
* Get the current modified time.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
/**
* A convenience method for setting the vertex table input. This
@@ -141,24 +141,24 @@ public:
protected:
vtkTableToGraph();
- ~vtkTableToGraph() VTK_OVERRIDE;
+ ~vtkTableToGraph() override;
/**
* Validate that the link graph is in the appropriate format.
*/
int ValidateLinkGraph();
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
int RequestData(
vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
int RequestDataObject(
vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
bool Directed;
vtkMutableDirectedGraph* LinkGraph;
diff --git a/Infovis/Core/vtkTableToSparseArray.h b/Infovis/Core/vtkTableToSparseArray.h
index c03e7dfcb9013509deed7242297298074ba77e0d..0d85a40983141b2a69cb06ed2a97ef38a1e580f6 100644
--- a/Infovis/Core/vtkTableToSparseArray.h
+++ b/Infovis/Core/vtkTableToSparseArray.h
@@ -57,7 +57,7 @@ class VTKINFOVISCORE_EXPORT vtkTableToSparseArray : public vtkArrayDataAlgorithm
public:
static vtkTableToSparseArray* New();
vtkTypeMacro(vtkTableToSparseArray, vtkArrayDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -86,14 +86,14 @@ public:
protected:
vtkTableToSparseArray();
- ~vtkTableToSparseArray() VTK_OVERRIDE;
+ ~vtkTableToSparseArray() override;
- int FillInputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
+ int FillInputPortInformation(int, vtkInformation*) override;
int RequestData(
vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
private:
vtkTableToSparseArray(const vtkTableToSparseArray&) VTK_DELETE_FUNCTION;
diff --git a/Infovis/Core/vtkTableToTreeFilter.h b/Infovis/Core/vtkTableToTreeFilter.h
index 6f15849767f4df9db8ef0042efa24c2f07e70556..3cb725b4397e3757a10502a00f8f7ce72a929545 100644
--- a/Infovis/Core/vtkTableToTreeFilter.h
+++ b/Infovis/Core/vtkTableToTreeFilter.h
@@ -40,21 +40,21 @@ class VTKINFOVISCORE_EXPORT vtkTableToTreeFilter : public vtkTreeAlgorithm
public:
static vtkTableToTreeFilter* New();
vtkTypeMacro(vtkTableToTreeFilter,vtkTreeAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkTableToTreeFilter();
- ~vtkTableToTreeFilter() VTK_OVERRIDE;
+ ~vtkTableToTreeFilter() override;
int RequestData(
vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
int FillOutputPortInformation(
- int vtkNotUsed(port), vtkInformation* info) VTK_OVERRIDE;
+ int vtkNotUsed(port), vtkInformation* info) override;
int FillInputPortInformation(
- int vtkNotUsed(port), vtkInformation* info) VTK_OVERRIDE;
+ int vtkNotUsed(port), vtkInformation* info) override;
private:
vtkTableToTreeFilter(const vtkTableToTreeFilter&) VTK_DELETE_FUNCTION;
diff --git a/Infovis/Core/vtkThresholdGraph.h b/Infovis/Core/vtkThresholdGraph.h
index 7e0ff024bf04182ebef4fc35a8fea4098f8b4f82..479152bf54b99e1264941a5ece4415370a2c919f 100644
--- a/Infovis/Core/vtkThresholdGraph.h
+++ b/Infovis/Core/vtkThresholdGraph.h
@@ -34,7 +34,7 @@ public:
static vtkThresholdGraph* New();
vtkTypeMacro(vtkThresholdGraph, vtkGraphAlgorithm);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
//@{
/**
@@ -57,11 +57,11 @@ public:
protected:
vtkThresholdGraph();
- ~vtkThresholdGraph() VTK_OVERRIDE;
+ ~vtkThresholdGraph() override;
int RequestData(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
private:
diff --git a/Infovis/Core/vtkThresholdTable.h b/Infovis/Core/vtkThresholdTable.h
index 37cb3dd1ef01173cced588a5156eee8d61d21170..9b1efca95faa1583ba840fc4de4c47d7338671af 100644
--- a/Infovis/Core/vtkThresholdTable.h
+++ b/Infovis/Core/vtkThresholdTable.h
@@ -39,7 +39,7 @@ class VTKINFOVISCORE_EXPORT vtkThresholdTable : public vtkTableAlgorithm
public:
static vtkThresholdTable* New();
vtkTypeMacro(vtkThresholdTable, vtkTableAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
enum {
ACCEPT_LESS_THAN = 0,
@@ -125,12 +125,12 @@ public:
protected:
vtkThresholdTable();
- ~vtkThresholdTable() VTK_OVERRIDE;
+ ~vtkThresholdTable() override;
int RequestData(
vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
vtkVariant MinValue;
vtkVariant MaxValue;
diff --git a/Infovis/Core/vtkTransferAttributes.h b/Infovis/Core/vtkTransferAttributes.h
index 54c18ea54627bdfca33aa4690b105c9ac18faf30..6d2df12e73d30da36f45202ee21c2aed25465eed 100644
--- a/Infovis/Core/vtkTransferAttributes.h
+++ b/Infovis/Core/vtkTransferAttributes.h
@@ -55,7 +55,7 @@ public:
static vtkTransferAttributes *New();
vtkTypeMacro(vtkTransferAttributes,vtkPassInputTypeAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -114,11 +114,11 @@ public:
/**
* Set the input type of the algorithm to vtkGraph.
*/
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
protected:
vtkTransferAttributes();
- ~vtkTransferAttributes() VTK_OVERRIDE;
+ ~vtkTransferAttributes() override;
bool DirectMapping;
char* SourceArrayName;
@@ -131,7 +131,7 @@ protected:
/**
* Convert the vtkGraph into vtkPolyData.
*/
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
private:
vtkTransferAttributes(const vtkTransferAttributes&) VTK_DELETE_FUNCTION;
diff --git a/Infovis/Core/vtkTransposeMatrix.h b/Infovis/Core/vtkTransposeMatrix.h
index cc584d2176bd4b6bda6c97c5298ea3a8a83a10e4..7ea7b3bddcf260ff09ea337025dc199f68274b71 100644
--- a/Infovis/Core/vtkTransposeMatrix.h
+++ b/Infovis/Core/vtkTransposeMatrix.h
@@ -38,16 +38,16 @@ class VTKINFOVISCORE_EXPORT vtkTransposeMatrix : public vtkArrayDataAlgorithm
public:
static vtkTransposeMatrix* New();
vtkTypeMacro(vtkTransposeMatrix, vtkArrayDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkTransposeMatrix();
- ~vtkTransposeMatrix() VTK_OVERRIDE;
+ ~vtkTransposeMatrix() override;
int RequestData(
vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
private:
vtkTransposeMatrix(const vtkTransposeMatrix&) VTK_DELETE_FUNCTION;
diff --git a/Infovis/Core/vtkTreeDifferenceFilter.h b/Infovis/Core/vtkTreeDifferenceFilter.h
index 0eb60cf786fc60393ba0ce6c3efd1465dfb2e134..10222d61b31bd7deeda0e4bdf7a7ff2a4d947a8f 100644
--- a/Infovis/Core/vtkTreeDifferenceFilter.h
+++ b/Infovis/Core/vtkTreeDifferenceFilter.h
@@ -43,7 +43,7 @@ class VTKINFOVISCORE_EXPORT vtkTreeDifferenceFilter : public vtkGraphAlgorithm
public:
static vtkTreeDifferenceFilter* New();
vtkTypeMacro(vtkTreeDifferenceFilter,vtkGraphAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -93,14 +93,14 @@ public:
protected:
vtkTreeDifferenceFilter();
- ~vtkTreeDifferenceFilter() VTK_OVERRIDE;
+ ~vtkTreeDifferenceFilter() override;
int RequestData(
vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
/**
* Populate VertexMap and EdgeMap with meaningful values. These maps
diff --git a/Infovis/Core/vtkTreeFieldAggregator.h b/Infovis/Core/vtkTreeFieldAggregator.h
index f47ac14290187b1db5b072a636a654fba3a7cf78..3ae77a5a22ddcf90c780ff46cb64eede27417142 100644
--- a/Infovis/Core/vtkTreeFieldAggregator.h
+++ b/Infovis/Core/vtkTreeFieldAggregator.h
@@ -47,7 +47,7 @@ public:
static vtkTreeFieldAggregator *New();
vtkTypeMacro(vtkTreeFieldAggregator,vtkTreeAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -86,9 +86,9 @@ public:
protected:
vtkTreeFieldAggregator();
- ~vtkTreeFieldAggregator() VTK_OVERRIDE;
+ ~vtkTreeFieldAggregator() override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
private:
char* Field;
diff --git a/Infovis/Core/vtkTreeLevelsFilter.h b/Infovis/Core/vtkTreeLevelsFilter.h
index b684bb0529962d81349eae4142891443ebd14ec2..4872082b6ee687fd6f70b3117477185246a69851 100644
--- a/Infovis/Core/vtkTreeLevelsFilter.h
+++ b/Infovis/Core/vtkTreeLevelsFilter.h
@@ -43,13 +43,13 @@ class VTKINFOVISCORE_EXPORT vtkTreeLevelsFilter : public vtkTreeAlgorithm
public:
static vtkTreeLevelsFilter *New();
vtkTypeMacro(vtkTreeLevelsFilter,vtkTreeAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkTreeLevelsFilter();
- ~vtkTreeLevelsFilter()VTK_OVERRIDE {}
+ ~vtkTreeLevelsFilter() override {}
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
private:
vtkTreeLevelsFilter(const vtkTreeLevelsFilter&) VTK_DELETE_FUNCTION;
diff --git a/Infovis/Core/vtkVertexDegree.h b/Infovis/Core/vtkVertexDegree.h
index 9731be701253c921377a5f4f3d68b92e95bac209..fd7ae6203f2f5967b274a48862b086042224b76d 100644
--- a/Infovis/Core/vtkVertexDegree.h
+++ b/Infovis/Core/vtkVertexDegree.h
@@ -39,7 +39,7 @@ public:
static vtkVertexDegree *New();
vtkTypeMacro(vtkVertexDegree, vtkGraphAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -51,9 +51,9 @@ public:
protected:
vtkVertexDegree();
- ~vtkVertexDegree() VTK_OVERRIDE;
+ ~vtkVertexDegree() override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
private:
diff --git a/Infovis/Layout/vtkArcParallelEdgeStrategy.h b/Infovis/Layout/vtkArcParallelEdgeStrategy.h
index 13ba45b0a3b673941378d426461070ea6a2b90d6..803dbd2c61503b6f49a412269ec3f9d059cc1ba5 100644
--- a/Infovis/Layout/vtkArcParallelEdgeStrategy.h
+++ b/Infovis/Layout/vtkArcParallelEdgeStrategy.h
@@ -38,13 +38,13 @@ class VTKINFOVISLAYOUT_EXPORT vtkArcParallelEdgeStrategy : public vtkEdgeLayoutS
public:
static vtkArcParallelEdgeStrategy* New();
vtkTypeMacro(vtkArcParallelEdgeStrategy,vtkEdgeLayoutStrategy);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* This is the layout method where the graph that was
* set in SetGraph() is laid out.
*/
- void Layout() VTK_OVERRIDE;
+ void Layout() override;
//@{
/**
@@ -56,7 +56,7 @@ public:
protected:
vtkArcParallelEdgeStrategy();
- ~vtkArcParallelEdgeStrategy() VTK_OVERRIDE;
+ ~vtkArcParallelEdgeStrategy() override;
int NumberOfSubdivisions;
diff --git a/Infovis/Layout/vtkAreaLayout.h b/Infovis/Layout/vtkAreaLayout.h
index d58bb97245a705abbd7e658129f6512ac12f7a42..04363eaa7467a770272a7ae11a2a383cd78875c0 100644
--- a/Infovis/Layout/vtkAreaLayout.h
+++ b/Infovis/Layout/vtkAreaLayout.h
@@ -48,7 +48,7 @@ class VTKINFOVISLAYOUT_EXPORT vtkAreaLayout : public vtkTreeAlgorithm
public:
static vtkAreaLayout *New();
vtkTypeMacro(vtkAreaLayout,vtkTreeAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* The array name to use for retrieving the relative size of each vertex.
@@ -89,7 +89,7 @@ public:
/**
* Get the modification time of the layout algorithm.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
/**
* Get the vertex whose area contains the point, or return -1
@@ -104,14 +104,14 @@ public:
protected:
vtkAreaLayout();
- ~vtkAreaLayout() VTK_OVERRIDE;
+ ~vtkAreaLayout() override;
char* AreaArrayName;
bool EdgeRoutingPoints;
char* EdgeRoutingPointsArrayName;
vtkAreaLayoutStrategy* LayoutStrategy;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
private:
diff --git a/Infovis/Layout/vtkAreaLayoutStrategy.h b/Infovis/Layout/vtkAreaLayoutStrategy.h
index 6d01c63c3b497d32c1948de8e8661b4d1f517ea2..6b1faf963649a59a1695d2e7e478a472e0f402af 100644
--- a/Infovis/Layout/vtkAreaLayoutStrategy.h
+++ b/Infovis/Layout/vtkAreaLayoutStrategy.h
@@ -49,7 +49,7 @@ class VTKINFOVISLAYOUT_EXPORT vtkAreaLayoutStrategy : public vtkObject
{
public:
vtkTypeMacro(vtkAreaLayoutStrategy,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Perform the layout of the input tree, and store the sector
@@ -87,7 +87,7 @@ public:
protected:
vtkAreaLayoutStrategy();
- ~vtkAreaLayoutStrategy() VTK_OVERRIDE;
+ ~vtkAreaLayoutStrategy() override;
double ShrinkPercentage;
diff --git a/Infovis/Layout/vtkAssignCoordinates.h b/Infovis/Layout/vtkAssignCoordinates.h
index 3ab0f6b9a6d8c6c4af66ae526f4a0423b3fbb735..d58e1f676d7e078085d4b2fbcc191f29cca60ac9 100644
--- a/Infovis/Layout/vtkAssignCoordinates.h
+++ b/Infovis/Layout/vtkAssignCoordinates.h
@@ -40,7 +40,7 @@ public:
static vtkAssignCoordinates *New();
vtkTypeMacro(vtkAssignCoordinates, vtkPassInputTypeAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -75,10 +75,10 @@ public:
protected:
vtkAssignCoordinates();
- ~vtkAssignCoordinates() VTK_OVERRIDE;
+ ~vtkAssignCoordinates() override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
private:
diff --git a/Infovis/Layout/vtkAssignCoordinatesLayoutStrategy.h b/Infovis/Layout/vtkAssignCoordinatesLayoutStrategy.h
index 62c6ce19de7c78e580abb47552da680bb0ce62fd..c7d5fef8d89c0a9800a12af63180eb0e1f5a67b5 100644
--- a/Infovis/Layout/vtkAssignCoordinatesLayoutStrategy.h
+++ b/Infovis/Layout/vtkAssignCoordinatesLayoutStrategy.h
@@ -39,7 +39,7 @@ class VTKINFOVISLAYOUT_EXPORT vtkAssignCoordinatesLayoutStrategy : public vtkGra
public:
static vtkAssignCoordinatesLayoutStrategy *New();
vtkTypeMacro(vtkAssignCoordinatesLayoutStrategy, vtkGraphLayoutStrategy);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -68,11 +68,11 @@ public:
/**
* Perform the random layout.
*/
- void Layout() VTK_OVERRIDE;
+ void Layout() override;
protected:
vtkAssignCoordinatesLayoutStrategy();
- ~vtkAssignCoordinatesLayoutStrategy() VTK_OVERRIDE;
+ ~vtkAssignCoordinatesLayoutStrategy() override;
vtkSmartPointer<vtkAssignCoordinates> AssignCoordinates;
diff --git a/Infovis/Layout/vtkAttributeClustering2DLayoutStrategy.h b/Infovis/Layout/vtkAttributeClustering2DLayoutStrategy.h
index 067ef7aee65d4beadb25d514c9818e311cdd9603..af9e6aa0b009f0e310910350617869fc725fb246 100644
--- a/Infovis/Layout/vtkAttributeClustering2DLayoutStrategy.h
+++ b/Infovis/Layout/vtkAttributeClustering2DLayoutStrategy.h
@@ -49,7 +49,7 @@ public:
static vtkAttributeClustering2DLayoutStrategy *New();
vtkTypeMacro(vtkAttributeClustering2DLayoutStrategy, vtkGraphLayoutStrategy);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -132,7 +132,7 @@ public:
* This strategy sets up some data structures
* for faster processing of each Layout() call
*/
- void Initialize() VTK_OVERRIDE;
+ void Initialize() override;
/**
* This is the layout method where the graph that was
@@ -141,17 +141,17 @@ public:
* graph. If you have an iterative layout please implement
* the IsLayoutComplete() method.
*/
- void Layout() VTK_OVERRIDE;
+ void Layout() override;
/**
* I'm an iterative layout so this method lets the caller
* know if I'm done laying out the graph
*/
- int IsLayoutComplete() VTK_OVERRIDE {return this->LayoutComplete;}
+ int IsLayoutComplete() override {return this->LayoutComplete;}
protected:
vtkAttributeClustering2DLayoutStrategy();
- ~vtkAttributeClustering2DLayoutStrategy() VTK_OVERRIDE;
+ ~vtkAttributeClustering2DLayoutStrategy() override;
int MaxNumberOfIterations; //Maximum number of iterations.
float InitialTemperature;
diff --git a/Infovis/Layout/vtkBoxLayoutStrategy.h b/Infovis/Layout/vtkBoxLayoutStrategy.h
index 1922c2fb6255c078d7a6efbb40803ec8084ed549..44e2ef47485b2c290a2ad4ed86b3d715cd325f38 100644
--- a/Infovis/Layout/vtkBoxLayoutStrategy.h
+++ b/Infovis/Layout/vtkBoxLayoutStrategy.h
@@ -41,7 +41,7 @@ public:
static vtkBoxLayoutStrategy *New();
vtkTypeMacro(vtkBoxLayoutStrategy,vtkTreeMapLayoutStrategy);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Perform the layout of a tree and place the results as 4-tuples in
@@ -50,11 +50,11 @@ public:
void Layout(
vtkTree* inputTree,
vtkDataArray* coordsArray,
- vtkDataArray* sizeArray) VTK_OVERRIDE;
+ vtkDataArray* sizeArray) override;
protected:
vtkBoxLayoutStrategy();
- ~vtkBoxLayoutStrategy() VTK_OVERRIDE;
+ ~vtkBoxLayoutStrategy() override;
private:
diff --git a/Infovis/Layout/vtkCirclePackFrontChainLayoutStrategy.h b/Infovis/Layout/vtkCirclePackFrontChainLayoutStrategy.h
index 1261d56993a4877676bbede41de05f3568ee0065..b0cde3d9e4d2fdae25e1498115f06470843bc3f4 100644
--- a/Infovis/Layout/vtkCirclePackFrontChainLayoutStrategy.h
+++ b/Infovis/Layout/vtkCirclePackFrontChainLayoutStrategy.h
@@ -56,7 +56,7 @@ public:
static vtkCirclePackFrontChainLayoutStrategy *New();
vtkTypeMacro(vtkCirclePackFrontChainLayoutStrategy,vtkCirclePackLayoutStrategy);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Perform the layout of the input tree, and store the circle
@@ -64,7 +64,7 @@ public:
* (Xcenter, Ycenter, Radius).
*/
void Layout(vtkTree *inputTree, vtkDataArray *areaArray,
- vtkDataArray* sizeArray) VTK_OVERRIDE;
+ vtkDataArray* sizeArray) override;
//@{
/**
@@ -79,7 +79,7 @@ public:
protected:
vtkCirclePackFrontChainLayoutStrategy();
- ~vtkCirclePackFrontChainLayoutStrategy() VTK_OVERRIDE;
+ ~vtkCirclePackFrontChainLayoutStrategy() override;
char * CirclesFieldName;
int Width;
diff --git a/Infovis/Layout/vtkCirclePackLayout.h b/Infovis/Layout/vtkCirclePackLayout.h
index afdbe07b34dcb25e09ef48c773c1125a0e9213c4..5af359bbae43b8983c5efbf92a0401b3b9a71bfc 100644
--- a/Infovis/Layout/vtkCirclePackLayout.h
+++ b/Infovis/Layout/vtkCirclePackLayout.h
@@ -59,7 +59,7 @@ public:
static vtkCirclePackLayout *New();
vtkTypeMacro(vtkCirclePackLayout,vtkTreeAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -104,16 +104,16 @@ public:
/**
* Get the modification time of the layout algorithm.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
protected:
vtkCirclePackLayout();
- ~vtkCirclePackLayout() VTK_OVERRIDE;
+ ~vtkCirclePackLayout() override;
char * CirclesFieldName;
vtkCirclePackLayoutStrategy* LayoutStrategy;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
private:
diff --git a/Infovis/Layout/vtkCirclePackLayoutStrategy.h b/Infovis/Layout/vtkCirclePackLayoutStrategy.h
index 1b9808fd5a4fd2068d2e9dcfddc33999f9685cc8..c0a7d60556f9a5c7801180eb17cf7157c374e7cc 100644
--- a/Infovis/Layout/vtkCirclePackLayoutStrategy.h
+++ b/Infovis/Layout/vtkCirclePackLayoutStrategy.h
@@ -50,7 +50,7 @@ class VTKINFOVISLAYOUT_EXPORT vtkCirclePackLayoutStrategy : public vtkObject
{
public:
vtkTypeMacro(vtkCirclePackLayoutStrategy,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Perform the layout of the input tree, and store the circle
@@ -65,7 +65,7 @@ public:
protected:
vtkCirclePackLayoutStrategy();
- ~vtkCirclePackLayoutStrategy() VTK_OVERRIDE;
+ ~vtkCirclePackLayoutStrategy() override;
private:
vtkCirclePackLayoutStrategy(const vtkCirclePackLayoutStrategy&) VTK_DELETE_FUNCTION;
diff --git a/Infovis/Layout/vtkCirclePackToPolyData.h b/Infovis/Layout/vtkCirclePackToPolyData.h
index f6b3f0c067e2c73a3557d0007189a26725eadc84..1145e59e0a62c94fb84997150749995b92ea7a26 100644
--- a/Infovis/Layout/vtkCirclePackToPolyData.h
+++ b/Infovis/Layout/vtkCirclePackToPolyData.h
@@ -40,7 +40,7 @@ public:
static vtkCirclePackToPolyData *New();
vtkTypeMacro(vtkCirclePackToPolyData,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* The field containing triples of the form (Xcenter, Ycenter, Radius).
@@ -60,15 +60,15 @@ public:
vtkGetMacro(Resolution, unsigned int);
//@}
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
protected:
vtkCirclePackToPolyData();
- ~vtkCirclePackToPolyData() VTK_OVERRIDE;
+ ~vtkCirclePackToPolyData() override;
unsigned int Resolution;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
private:
vtkCirclePackToPolyData(const vtkCirclePackToPolyData&) VTK_DELETE_FUNCTION;
void operator=(const vtkCirclePackToPolyData&) VTK_DELETE_FUNCTION;
diff --git a/Infovis/Layout/vtkCircularLayoutStrategy.h b/Infovis/Layout/vtkCircularLayoutStrategy.h
index cd933cc41fd9d2be291e3ad12315e3e08b7f8de9..dadecefd58bfd5282b6571ae627ec36c96a0998e 100644
--- a/Infovis/Layout/vtkCircularLayoutStrategy.h
+++ b/Infovis/Layout/vtkCircularLayoutStrategy.h
@@ -37,16 +37,16 @@ public:
static vtkCircularLayoutStrategy *New();
vtkTypeMacro(vtkCircularLayoutStrategy, vtkGraphLayoutStrategy);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Perform the layout.
*/
- void Layout() VTK_OVERRIDE;
+ void Layout() override;
protected:
vtkCircularLayoutStrategy();
- ~vtkCircularLayoutStrategy() VTK_OVERRIDE;
+ ~vtkCircularLayoutStrategy() override;
private:
vtkCircularLayoutStrategy(const vtkCircularLayoutStrategy&) VTK_DELETE_FUNCTION;
diff --git a/Infovis/Layout/vtkClustering2DLayoutStrategy.h b/Infovis/Layout/vtkClustering2DLayoutStrategy.h
index 95848246e46682456d85e1b54340229ee8bce222..5334ea9dd7511d65dd6426bbfe9e05a6519176dd 100644
--- a/Infovis/Layout/vtkClustering2DLayoutStrategy.h
+++ b/Infovis/Layout/vtkClustering2DLayoutStrategy.h
@@ -49,7 +49,7 @@ public:
static vtkClustering2DLayoutStrategy *New();
vtkTypeMacro(vtkClustering2DLayoutStrategy, vtkGraphLayoutStrategy);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -123,7 +123,7 @@ public:
* This strategy sets up some data structures
* for faster processing of each Layout() call
*/
- void Initialize() VTK_OVERRIDE;
+ void Initialize() override;
/**
* This is the layout method where the graph that was
@@ -132,17 +132,17 @@ public:
* graph. If you have an iterative layout please implement
* the IsLayoutComplete() method.
*/
- void Layout() VTK_OVERRIDE;
+ void Layout() override;
/**
* I'm an iterative layout so this method lets the caller
* know if I'm done laying out the graph
*/
- int IsLayoutComplete() VTK_OVERRIDE {return this->LayoutComplete;}
+ int IsLayoutComplete() override {return this->LayoutComplete;}
protected:
vtkClustering2DLayoutStrategy();
- ~vtkClustering2DLayoutStrategy() VTK_OVERRIDE;
+ ~vtkClustering2DLayoutStrategy() override;
int MaxNumberOfIterations; //Maximum number of iterations.
float InitialTemperature;
diff --git a/Infovis/Layout/vtkCommunity2DLayoutStrategy.h b/Infovis/Layout/vtkCommunity2DLayoutStrategy.h
index c86cf1c0c3e33939f2952e86e164936ab1ac5593..2c36622f992b16abe94aa79c0ca093300c489d9f 100644
--- a/Infovis/Layout/vtkCommunity2DLayoutStrategy.h
+++ b/Infovis/Layout/vtkCommunity2DLayoutStrategy.h
@@ -50,7 +50,7 @@ public:
static vtkCommunity2DLayoutStrategy *New();
vtkTypeMacro(vtkCommunity2DLayoutStrategy, vtkGraphLayoutStrategy);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -125,7 +125,7 @@ public:
* This strategy sets up some data structures
* for faster processing of each Layout() call
*/
- void Initialize() VTK_OVERRIDE;
+ void Initialize() override;
/**
* This is the layout method where the graph that was
@@ -134,13 +134,13 @@ public:
* graph. If you have an iterative layout please implement
* the IsLayoutComplete() method.
*/
- void Layout() VTK_OVERRIDE;
+ void Layout() override;
/**
* I'm an iterative layout so this method lets the caller
* know if I'm done laying out the graph
*/
- int IsLayoutComplete() VTK_OVERRIDE {return this->LayoutComplete;}
+ int IsLayoutComplete() override {return this->LayoutComplete;}
//@{
/**
@@ -163,7 +163,7 @@ public:
protected:
vtkCommunity2DLayoutStrategy();
- ~vtkCommunity2DLayoutStrategy() VTK_OVERRIDE;
+ ~vtkCommunity2DLayoutStrategy() override;
int MaxNumberOfIterations; //Maximum number of iterations.
float InitialTemperature;
diff --git a/Infovis/Layout/vtkConeLayoutStrategy.h b/Infovis/Layout/vtkConeLayoutStrategy.h
index e2169035256e5bc11fb03049b243c16a5a0ffbf7..b313ecc3328d9fcc17be7911baf975fb25ddf48d 100644
--- a/Infovis/Layout/vtkConeLayoutStrategy.h
+++ b/Infovis/Layout/vtkConeLayoutStrategy.h
@@ -57,7 +57,7 @@ public:
static vtkConeLayoutStrategy *New();
vtkTypeMacro(vtkConeLayoutStrategy, vtkGraphLayoutStrategy);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -100,11 +100,11 @@ public:
/**
* Perform the layout.
*/
- void Layout() VTK_OVERRIDE;
+ void Layout() override;
protected:
vtkConeLayoutStrategy();
- ~vtkConeLayoutStrategy() VTK_OVERRIDE;
+ ~vtkConeLayoutStrategy() override;
/**
* Helper operations for tree layout. Layout is performed
diff --git a/Infovis/Layout/vtkConstrained2DLayoutStrategy.h b/Infovis/Layout/vtkConstrained2DLayoutStrategy.h
index 601568dfa7c72474a2c7c142db5a43151d774ff7..7f613383257af8562b3396ef739f8001953c801f 100644
--- a/Infovis/Layout/vtkConstrained2DLayoutStrategy.h
+++ b/Infovis/Layout/vtkConstrained2DLayoutStrategy.h
@@ -54,7 +54,7 @@ public:
static vtkConstrained2DLayoutStrategy *New();
vtkTypeMacro(vtkConstrained2DLayoutStrategy, vtkGraphLayoutStrategy);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -129,7 +129,7 @@ public:
* This strategy sets up some data structures
* for faster processing of each Layout() call
*/
- void Initialize() VTK_OVERRIDE;
+ void Initialize() override;
/**
* This is the layout method where the graph that was
@@ -138,13 +138,13 @@ public:
* graph. If you have an iterative layout please implement
* the IsLayoutComplete() method.
*/
- void Layout() VTK_OVERRIDE;
+ void Layout() override;
/**
* I'm an iterative layout so this method lets the caller
* know if I'm done laying out the graph
*/
- int IsLayoutComplete() VTK_OVERRIDE {return this->LayoutComplete;}
+ int IsLayoutComplete() override {return this->LayoutComplete;}
//@{
/**
@@ -157,7 +157,7 @@ public:
protected:
vtkConstrained2DLayoutStrategy();
- ~vtkConstrained2DLayoutStrategy() VTK_OVERRIDE;
+ ~vtkConstrained2DLayoutStrategy() override;
int MaxNumberOfIterations; //Maximum number of iterations.
float InitialTemperature;
diff --git a/Infovis/Layout/vtkCosmicTreeLayoutStrategy.h b/Infovis/Layout/vtkCosmicTreeLayoutStrategy.h
index ee74bbe0d7101c1b9cb0ca96be6fcdcada805fd8..8661ed3fc15712560e59990bd60745d5543e6a76 100644
--- a/Infovis/Layout/vtkCosmicTreeLayoutStrategy.h
+++ b/Infovis/Layout/vtkCosmicTreeLayoutStrategy.h
@@ -42,13 +42,13 @@ class VTKINFOVISLAYOUT_EXPORT vtkCosmicTreeLayoutStrategy : public vtkGraphLayou
{
public:
static vtkCosmicTreeLayoutStrategy* New();
- void PrintSelf( ostream& os, vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf( ostream& os, vtkIndent indent ) override;
vtkTypeMacro(vtkCosmicTreeLayoutStrategy,vtkGraphLayoutStrategy);
/**
* Perform the layout.
*/
- void Layout() VTK_OVERRIDE;
+ void Layout() override;
//@{
/**
@@ -113,7 +113,7 @@ protected:
};
vtkCosmicTreeLayoutStrategy();
- ~vtkCosmicTreeLayoutStrategy() VTK_OVERRIDE;
+ ~vtkCosmicTreeLayoutStrategy() override;
/**
* Recursive routine used to lay out tree nodes. Called from Layout().
diff --git a/Infovis/Layout/vtkEdgeLayout.h b/Infovis/Layout/vtkEdgeLayout.h
index 345ba6cced728811fd06acea9c4718a2095e07b3..84db8ae9ea2534ace163f17a0a506a16a69323fb 100644
--- a/Infovis/Layout/vtkEdgeLayout.h
+++ b/Infovis/Layout/vtkEdgeLayout.h
@@ -40,7 +40,7 @@ class VTKINFOVISLAYOUT_EXPORT vtkEdgeLayout : public vtkGraphAlgorithm
public:
static vtkEdgeLayout *New();
vtkTypeMacro(vtkEdgeLayout, vtkGraphAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -53,11 +53,11 @@ public:
/**
* Get the modification time of the layout algorithm.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
protected:
vtkEdgeLayout();
- ~vtkEdgeLayout() VTK_OVERRIDE;
+ ~vtkEdgeLayout() override;
vtkEdgeLayoutStrategy* LayoutStrategy;
@@ -73,7 +73,7 @@ protected:
int RequestData(
vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
private:
diff --git a/Infovis/Layout/vtkEdgeLayoutStrategy.h b/Infovis/Layout/vtkEdgeLayoutStrategy.h
index 87b71c04b67331ba07504a6176f12d9e17bc3095..d8a736def47084b5ae971d685e83208dde86696e 100644
--- a/Infovis/Layout/vtkEdgeLayoutStrategy.h
+++ b/Infovis/Layout/vtkEdgeLayoutStrategy.h
@@ -37,7 +37,7 @@ class VTKINFOVISLAYOUT_EXPORT vtkEdgeLayoutStrategy : public vtkObject
{
public:
vtkTypeMacro(vtkEdgeLayoutStrategy,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Setting the graph for the layout strategy
@@ -67,7 +67,7 @@ public:
protected:
vtkEdgeLayoutStrategy();
- ~vtkEdgeLayoutStrategy() VTK_OVERRIDE;
+ ~vtkEdgeLayoutStrategy() override;
vtkGraph *Graph;
char *EdgeWeightArrayName;
diff --git a/Infovis/Layout/vtkFast2DLayoutStrategy.h b/Infovis/Layout/vtkFast2DLayoutStrategy.h
index 2adb7c21b10b0487a370484537121ba94b90d6d7..ecda90a88d9af35d5852b0c1eda0dcf0bb8e4ffd 100644
--- a/Infovis/Layout/vtkFast2DLayoutStrategy.h
+++ b/Infovis/Layout/vtkFast2DLayoutStrategy.h
@@ -49,7 +49,7 @@ public:
static vtkFast2DLayoutStrategy *New();
vtkTypeMacro(vtkFast2DLayoutStrategy, vtkGraphLayoutStrategy);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -123,7 +123,7 @@ public:
* This strategy sets up some data structures
* for faster processing of each Layout() call
*/
- void Initialize() VTK_OVERRIDE;
+ void Initialize() override;
/**
* This is the layout method where the graph that was
@@ -132,17 +132,17 @@ public:
* graph. If you have an iterative layout please implement
* the IsLayoutComplete() method.
*/
- void Layout() VTK_OVERRIDE;
+ void Layout() override;
/**
* I'm an iterative layout so this method lets the caller
* know if I'm done laying out the graph
*/
- int IsLayoutComplete() VTK_OVERRIDE {return this->LayoutComplete;}
+ int IsLayoutComplete() override {return this->LayoutComplete;}
protected:
vtkFast2DLayoutStrategy();
- ~vtkFast2DLayoutStrategy() VTK_OVERRIDE;
+ ~vtkFast2DLayoutStrategy() override;
int MaxNumberOfIterations; //Maximum number of iterations.
float InitialTemperature;
diff --git a/Infovis/Layout/vtkForceDirectedLayoutStrategy.h b/Infovis/Layout/vtkForceDirectedLayoutStrategy.h
index 267c9d9d170f38648a59207282b984287887d585..ad30c07c46aa60b6f214281b05ccb0d9365ca7bb 100644
--- a/Infovis/Layout/vtkForceDirectedLayoutStrategy.h
+++ b/Infovis/Layout/vtkForceDirectedLayoutStrategy.h
@@ -43,7 +43,7 @@ public:
static vtkForceDirectedLayoutStrategy *New();
vtkTypeMacro(vtkForceDirectedLayoutStrategy, vtkGraphLayoutStrategy);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -141,7 +141,7 @@ public:
* This strategy sets up some data structures
* for faster processing of each Layout() call
*/
- void Initialize() VTK_OVERRIDE;
+ void Initialize() override;
/**
* This is the layout method where the graph that was
@@ -150,17 +150,17 @@ public:
* graph. If you have an iterative layout please implement
* the IsLayoutComplete() method.
*/
- void Layout() VTK_OVERRIDE;
+ void Layout() override;
/**
* I'm an iterative layout so this method lets the caller
* know if I'm done laying out the graph
*/
- int IsLayoutComplete() VTK_OVERRIDE {return this->LayoutComplete;}
+ int IsLayoutComplete() override {return this->LayoutComplete;}
protected:
vtkForceDirectedLayoutStrategy();
- ~vtkForceDirectedLayoutStrategy() VTK_OVERRIDE;
+ ~vtkForceDirectedLayoutStrategy() override;
double GraphBounds[6];
int AutomaticBoundsComputation; //Boolean controls automatic bounds calc.
diff --git a/Infovis/Layout/vtkGeoEdgeStrategy.h b/Infovis/Layout/vtkGeoEdgeStrategy.h
index 83191980f321b6908d41da9b4b35e3ee399fe944..509310e7ebdd1d46adbc29b9dd14805f6f5843f1 100644
--- a/Infovis/Layout/vtkGeoEdgeStrategy.h
+++ b/Infovis/Layout/vtkGeoEdgeStrategy.h
@@ -38,7 +38,7 @@ class VTKINFOVISLAYOUT_EXPORT vtkGeoEdgeStrategy : public vtkEdgeLayoutStrategy
public:
static vtkGeoEdgeStrategy *New();
vtkTypeMacro(vtkGeoEdgeStrategy,vtkEdgeLayoutStrategy);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -74,11 +74,11 @@ public:
/**
* Perform the layout.
*/
- void Layout() VTK_OVERRIDE;
+ void Layout() override;
protected:
vtkGeoEdgeStrategy();
- ~vtkGeoEdgeStrategy() VTK_OVERRIDE {}
+ ~vtkGeoEdgeStrategy() override {}
double GlobeRadius;
double ExplodeFactor;
diff --git a/Infovis/Layout/vtkGeoMath.h b/Infovis/Layout/vtkGeoMath.h
index 307cb0b044d8d01963e84546ee79acf355d7e773..4baca04981ae8ee8efe8d3c237b8b972a960df95 100644
--- a/Infovis/Layout/vtkGeoMath.h
+++ b/Infovis/Layout/vtkGeoMath.h
@@ -36,7 +36,7 @@ class VTKINFOVISLAYOUT_EXPORT vtkGeoMath : public vtkObject
public:
static vtkGeoMath *New();
vtkTypeMacro(vtkGeoMath, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Returns the average radius of the earth in meters.
@@ -58,7 +58,7 @@ public:
protected:
vtkGeoMath();
- ~vtkGeoMath() VTK_OVERRIDE;
+ ~vtkGeoMath() override;
private:
vtkGeoMath(const vtkGeoMath&) VTK_DELETE_FUNCTION;
diff --git a/Infovis/Layout/vtkGraphLayout.h b/Infovis/Layout/vtkGraphLayout.h
index 976fddbc17c92aa77c728aaad7e7e90f7e6dcabb..4c01d04477ee71bb2b3f6bb09ebb25b8e458705b 100644
--- a/Infovis/Layout/vtkGraphLayout.h
+++ b/Infovis/Layout/vtkGraphLayout.h
@@ -46,7 +46,7 @@ class VTKINFOVISLAYOUT_EXPORT vtkGraphLayout : public vtkGraphAlgorithm
public:
static vtkGraphLayout *New();
vtkTypeMacro(vtkGraphLayout, vtkGraphAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -64,7 +64,7 @@ public:
/**
* Get the modification time of the layout algorithm.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
//@{
/**
@@ -96,7 +96,7 @@ public:
protected:
vtkGraphLayout();
- ~vtkGraphLayout() VTK_OVERRIDE;
+ ~vtkGraphLayout() override;
vtkGraphLayoutStrategy* LayoutStrategy;
@@ -106,7 +106,7 @@ protected:
*/
vtkEventForwarderCommand *EventForwarder;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
private:
diff --git a/Infovis/Layout/vtkGraphLayoutStrategy.h b/Infovis/Layout/vtkGraphLayoutStrategy.h
index ea953da41058355c618763a0052d7cb72d841f47..b5b8a1ab1a3a5a7b2affaa6d76df11ec77f55fda 100644
--- a/Infovis/Layout/vtkGraphLayoutStrategy.h
+++ b/Infovis/Layout/vtkGraphLayoutStrategy.h
@@ -46,7 +46,7 @@ class VTKINFOVISLAYOUT_EXPORT vtkGraphLayoutStrategy : public vtkObject
{
public:
vtkTypeMacro(vtkGraphLayoutStrategy,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Setting the graph for the layout strategy
@@ -94,7 +94,7 @@ public:
protected:
vtkGraphLayoutStrategy();
- ~vtkGraphLayoutStrategy() VTK_OVERRIDE;
+ ~vtkGraphLayoutStrategy() override;
vtkGraph *Graph;
char *EdgeWeightField;
diff --git a/Infovis/Layout/vtkIncrementalForceLayout.h b/Infovis/Layout/vtkIncrementalForceLayout.h
index b430425cf393ca8d0e9a7f86c9637d2fa837b713..9b65516eb468ff976023a9dd3d28adea1163b534 100644
--- a/Infovis/Layout/vtkIncrementalForceLayout.h
+++ b/Infovis/Layout/vtkIncrementalForceLayout.h
@@ -40,7 +40,7 @@ class VTKINFOVISLAYOUT_EXPORT vtkIncrementalForceLayout : public vtkObject
{
public:
vtkTypeMacro(vtkIncrementalForceLayout, vtkObject);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
static vtkIncrementalForceLayout* New();
//@{
@@ -139,7 +139,7 @@ public:
protected:
vtkIncrementalForceLayout();
- ~vtkIncrementalForceLayout() VTK_OVERRIDE;
+ ~vtkIncrementalForceLayout() override;
vtkGraph* Graph;
class Implementation;
diff --git a/Infovis/Layout/vtkKCoreLayout.h b/Infovis/Layout/vtkKCoreLayout.h
index 5e2a86f51a5583a18338541a9945b05babf5c00e..e3249e54a8e7f871a0bc78262f8e25929a360414 100644
--- a/Infovis/Layout/vtkKCoreLayout.h
+++ b/Infovis/Layout/vtkKCoreLayout.h
@@ -61,15 +61,15 @@ class VTKINFOVISLAYOUT_EXPORT vtkKCoreLayout : public vtkGraphAlgorithm
public:
static vtkKCoreLayout* New();
vtkTypeMacro(vtkKCoreLayout,vtkGraphAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/// Convenience function provided for setting the graph input.
void SetGraphConnection(vtkAlgorithmOutput*);
vtkKCoreLayout();
- ~vtkKCoreLayout() VTK_OVERRIDE;
+ ~vtkKCoreLayout() override;
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
//@{
/**
@@ -160,7 +160,7 @@ public:
//@}
- int RequestData(vtkInformation*, vtkInformationVector**, vtkInformationVector*) VTK_OVERRIDE;
+ int RequestData(vtkInformation*, vtkInformationVector**, vtkInformationVector*) override;
protected:
char * KCoreLabelArrayName;
diff --git a/Infovis/Layout/vtkPassThroughEdgeStrategy.h b/Infovis/Layout/vtkPassThroughEdgeStrategy.h
index 89b953d6586185523b50ef302685a33ca0b2cdb4..c148f3eb15ed3778ba260b6da821e05e2ea0de2a 100644
--- a/Infovis/Layout/vtkPassThroughEdgeStrategy.h
+++ b/Infovis/Layout/vtkPassThroughEdgeStrategy.h
@@ -36,17 +36,17 @@ class VTKINFOVISLAYOUT_EXPORT vtkPassThroughEdgeStrategy : public vtkEdgeLayoutS
public:
static vtkPassThroughEdgeStrategy* New();
vtkTypeMacro(vtkPassThroughEdgeStrategy,vtkEdgeLayoutStrategy);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* This is the layout method where the graph that was
* set in SetGraph() is laid out.
*/
- void Layout() VTK_OVERRIDE;
+ void Layout() override;
protected:
vtkPassThroughEdgeStrategy();
- ~vtkPassThroughEdgeStrategy() VTK_OVERRIDE;
+ ~vtkPassThroughEdgeStrategy() override;
private:
vtkPassThroughEdgeStrategy(const vtkPassThroughEdgeStrategy&) VTK_DELETE_FUNCTION;
diff --git a/Infovis/Layout/vtkPassThroughLayoutStrategy.h b/Infovis/Layout/vtkPassThroughLayoutStrategy.h
index af994714116892a36d2f8eb4c54aa878fa88aa3b..18ed81d07dd4427bc4b98e74f83d15865a5f2d5e 100644
--- a/Infovis/Layout/vtkPassThroughLayoutStrategy.h
+++ b/Infovis/Layout/vtkPassThroughLayoutStrategy.h
@@ -39,14 +39,14 @@ public:
static vtkPassThroughLayoutStrategy *New();
vtkTypeMacro(vtkPassThroughLayoutStrategy, vtkGraphLayoutStrategy);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* This strategy sets up some data structures
* for faster processing of each Layout() call
*/
- void Initialize() VTK_OVERRIDE;
+ void Initialize() override;
/**
* This is the layout method where the graph that was
@@ -55,17 +55,17 @@ public:
* graph. If you have an iterative layout please implement
* the IsLayoutComplete() method.
*/
- void Layout() VTK_OVERRIDE;
+ void Layout() override;
/**
* I'm an iterative layout so this method lets the caller
* know if I'm done laying out the graph
*/
- int IsLayoutComplete() VTK_OVERRIDE {return 1;}
+ int IsLayoutComplete() override {return 1;}
protected:
vtkPassThroughLayoutStrategy();
- ~vtkPassThroughLayoutStrategy() VTK_OVERRIDE;
+ ~vtkPassThroughLayoutStrategy() override;
private:
diff --git a/Infovis/Layout/vtkPerturbCoincidentVertices.h b/Infovis/Layout/vtkPerturbCoincidentVertices.h
index d32dfc59562330c6f286078697845502c43da405..d328d3c8376109b6e46b2d6f1c4121b922446404 100644
--- a/Infovis/Layout/vtkPerturbCoincidentVertices.h
+++ b/Infovis/Layout/vtkPerturbCoincidentVertices.h
@@ -43,7 +43,7 @@ class VTKINFOVISLAYOUT_EXPORT vtkPerturbCoincidentVertices : public vtkGraphAlgo
public:
static vtkPerturbCoincidentVertices* New();
vtkTypeMacro(vtkPerturbCoincidentVertices,vtkGraphAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -55,12 +55,12 @@ public:
protected:
vtkPerturbCoincidentVertices();
- ~vtkPerturbCoincidentVertices() VTK_OVERRIDE;
+ ~vtkPerturbCoincidentVertices() override;
int RequestData(
vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
private:
diff --git a/Infovis/Layout/vtkRandomLayoutStrategy.h b/Infovis/Layout/vtkRandomLayoutStrategy.h
index 0d61e55010640abdc678671c6e804a3b6622dd0a..d3b4ce916029812af41ac6de90392271d91ddb7d 100644
--- a/Infovis/Layout/vtkRandomLayoutStrategy.h
+++ b/Infovis/Layout/vtkRandomLayoutStrategy.h
@@ -41,7 +41,7 @@ public:
static vtkRandomLayoutStrategy *New();
vtkTypeMacro(vtkRandomLayoutStrategy, vtkGraphLayoutStrategy);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -88,16 +88,16 @@ public:
/**
* Set the graph to layout.
*/
- void SetGraph(vtkGraph *graph) VTK_OVERRIDE;
+ void SetGraph(vtkGraph *graph) override;
/**
* Perform the random layout.
*/
- void Layout() VTK_OVERRIDE;
+ void Layout() override;
protected:
vtkRandomLayoutStrategy();
- ~vtkRandomLayoutStrategy() VTK_OVERRIDE;
+ ~vtkRandomLayoutStrategy() override;
int RandomSeed;
double GraphBounds[6];
diff --git a/Infovis/Layout/vtkSimple2DLayoutStrategy.h b/Infovis/Layout/vtkSimple2DLayoutStrategy.h
index b92153ef506d7b1fea4c53efeaa3c18797ad04a5..9f532c62046101b6d874bb8754a6ee00bccac5bc 100644
--- a/Infovis/Layout/vtkSimple2DLayoutStrategy.h
+++ b/Infovis/Layout/vtkSimple2DLayoutStrategy.h
@@ -46,7 +46,7 @@ public:
static vtkSimple2DLayoutStrategy *New();
vtkTypeMacro(vtkSimple2DLayoutStrategy, vtkGraphLayoutStrategy);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -132,7 +132,7 @@ public:
* This strategy sets up some data structures
* for faster processing of each Layout() call
*/
- void Initialize() VTK_OVERRIDE;
+ void Initialize() override;
/**
* This is the layout method where the graph that was
@@ -141,17 +141,17 @@ public:
* graph. If you have an iterative layout please implement
* the IsLayoutComplete() method.
*/
- void Layout() VTK_OVERRIDE;
+ void Layout() override;
/**
* I'm an iterative layout so this method lets the caller
* know if I'm done laying out the graph
*/
- int IsLayoutComplete() VTK_OVERRIDE {return this->LayoutComplete;}
+ int IsLayoutComplete() override {return this->LayoutComplete;}
protected:
vtkSimple2DLayoutStrategy();
- ~vtkSimple2DLayoutStrategy() VTK_OVERRIDE;
+ ~vtkSimple2DLayoutStrategy() override;
int MaxNumberOfIterations; //Maximum number of iterations.
float InitialTemperature;
diff --git a/Infovis/Layout/vtkSimple3DCirclesStrategy.h b/Infovis/Layout/vtkSimple3DCirclesStrategy.h
index 27350f01730e8ae2ad9d2143203f1345cb4f3bf9..7b9f80260a56142e21598cc066a6e2af56cb1702 100644
--- a/Infovis/Layout/vtkSimple3DCirclesStrategy.h
+++ b/Infovis/Layout/vtkSimple3DCirclesStrategy.h
@@ -54,7 +54,7 @@ class VTKINFOVISLAYOUT_EXPORT vtkSimple3DCirclesStrategy : public vtkGraphLayout
public:
static vtkSimple3DCirclesStrategy * New();
vtkTypeMacro(vtkSimple3DCirclesStrategy,vtkGraphLayoutStrategy);
- void PrintSelf( ostream& os, vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf( ostream& os, vtkIndent indent ) override;
enum
{
@@ -168,15 +168,15 @@ public:
/**
* Standard layout method
*/
- void Layout( void ) VTK_OVERRIDE;
+ void Layout( void ) override;
/**
* Set graph (warning: HierarchicalOrder and HierarchicalLayers will set to zero. These reference counts will be decreased!)
*/
- void SetGraph( vtkGraph * graph ) VTK_OVERRIDE;
+ void SetGraph( vtkGraph * graph ) override;
protected:
vtkSimple3DCirclesStrategy( void );
- ~vtkSimple3DCirclesStrategy( void ) VTK_OVERRIDE;
+ ~vtkSimple3DCirclesStrategy( void ) override;
inline void Transform( double Local[], double Global[] );
diff --git a/Infovis/Layout/vtkSliceAndDiceLayoutStrategy.h b/Infovis/Layout/vtkSliceAndDiceLayoutStrategy.h
index bffa0cd173e4188f9ee862a3b2f6ba0ef0d4d5d1..dd3dc1d2768217ddd2d24c4b64905187991848f8 100644
--- a/Infovis/Layout/vtkSliceAndDiceLayoutStrategy.h
+++ b/Infovis/Layout/vtkSliceAndDiceLayoutStrategy.h
@@ -43,7 +43,7 @@ public:
static vtkSliceAndDiceLayoutStrategy *New();
vtkTypeMacro(vtkSliceAndDiceLayoutStrategy,vtkTreeMapLayoutStrategy);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Perform the layout of a tree and place the results as 4-tuples in
@@ -52,11 +52,11 @@ public:
void Layout(
vtkTree* inputTree,
vtkDataArray* coordsArray,
- vtkDataArray* sizeArray) VTK_OVERRIDE;
+ vtkDataArray* sizeArray) override;
protected:
vtkSliceAndDiceLayoutStrategy();
- ~vtkSliceAndDiceLayoutStrategy() VTK_OVERRIDE;
+ ~vtkSliceAndDiceLayoutStrategy() override;
private:
vtkSliceAndDiceLayoutStrategy(const vtkSliceAndDiceLayoutStrategy&) VTK_DELETE_FUNCTION;
diff --git a/Infovis/Layout/vtkSpanTreeLayoutStrategy.h b/Infovis/Layout/vtkSpanTreeLayoutStrategy.h
index b55800b00cd8b722da6973ed3e1e0574e7d93d3e..3092180e2771832e77410f7dc730465411441275 100644
--- a/Infovis/Layout/vtkSpanTreeLayoutStrategy.h
+++ b/Infovis/Layout/vtkSpanTreeLayoutStrategy.h
@@ -71,7 +71,7 @@ public:
static vtkSpanTreeLayoutStrategy *New();
vtkTypeMacro(vtkSpanTreeLayoutStrategy, vtkGraphLayoutStrategy);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -89,11 +89,11 @@ public:
/**
* Perform the layout.
*/
- void Layout() VTK_OVERRIDE;
+ void Layout() override;
protected:
vtkSpanTreeLayoutStrategy();
- ~vtkSpanTreeLayoutStrategy() VTK_OVERRIDE;
+ ~vtkSpanTreeLayoutStrategy() override;
vtkGraphLayoutStrategy *TreeLayout;
bool DepthFirstSpanningTree;
diff --git a/Infovis/Layout/vtkSplineGraphEdges.h b/Infovis/Layout/vtkSplineGraphEdges.h
index f464b969f7176ea0847e44720f984c396d4f36a6..d7d764b9ddc20822ba17a4b201b74a5c87dcac44 100644
--- a/Infovis/Layout/vtkSplineGraphEdges.h
+++ b/Infovis/Layout/vtkSplineGraphEdges.h
@@ -41,7 +41,7 @@ class VTKINFOVISLAYOUT_EXPORT vtkSplineGraphEdges : public vtkGraphAlgorithm
public:
static vtkSplineGraphEdges *New();
vtkTypeMacro(vtkSplineGraphEdges,vtkGraphAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -77,14 +77,14 @@ public:
protected:
vtkSplineGraphEdges();
- ~vtkSplineGraphEdges() VTK_OVERRIDE;
+ ~vtkSplineGraphEdges() override;
int RequestData(
vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
void GeneratePoints(vtkGraph* g, vtkIdType e);
void GenerateBSpline(vtkGraph* g, vtkIdType e);
diff --git a/Infovis/Layout/vtkSquarifyLayoutStrategy.h b/Infovis/Layout/vtkSquarifyLayoutStrategy.h
index 75860d58de6b28ad12bb8e07d8e9deb6d0703d1f..3bfddb8800ef0260d383cae9b9e976ceaf87514c 100644
--- a/Infovis/Layout/vtkSquarifyLayoutStrategy.h
+++ b/Infovis/Layout/vtkSquarifyLayoutStrategy.h
@@ -47,7 +47,7 @@ class VTKINFOVISLAYOUT_EXPORT vtkSquarifyLayoutStrategy : public vtkTreeMapLayou
public:
static vtkSquarifyLayoutStrategy *New();
vtkTypeMacro(vtkSquarifyLayoutStrategy,vtkTreeMapLayoutStrategy);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Perform the layout of a tree and place the results as 4-tuples in
@@ -56,11 +56,11 @@ public:
void Layout(
vtkTree* inputTree,
vtkDataArray* coordsArray,
- vtkDataArray* sizeArray) VTK_OVERRIDE;
+ vtkDataArray* sizeArray) override;
protected:
vtkSquarifyLayoutStrategy();
- ~vtkSquarifyLayoutStrategy() VTK_OVERRIDE;
+ ~vtkSquarifyLayoutStrategy() override;
private:
diff --git a/Infovis/Layout/vtkStackedTreeLayoutStrategy.h b/Infovis/Layout/vtkStackedTreeLayoutStrategy.h
index 74974ff900d0dc98840d8140ce371e7a3c292264..804ec304ffa4c9a975163ef8c17ca55c3a8fb928 100644
--- a/Infovis/Layout/vtkStackedTreeLayoutStrategy.h
+++ b/Infovis/Layout/vtkStackedTreeLayoutStrategy.h
@@ -49,7 +49,7 @@ class VTKINFOVISLAYOUT_EXPORT vtkStackedTreeLayoutStrategy :
public:
static vtkStackedTreeLayoutStrategy* New();
vtkTypeMacro(vtkStackedTreeLayoutStrategy,vtkAreaLayoutStrategy);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Perform the layout of the input tree, and store the sector
@@ -58,14 +58,14 @@ public:
* in a data array.
*/
void Layout(vtkTree *inputTree, vtkDataArray *sectorArray,
- vtkDataArray* sizeArray) VTK_OVERRIDE;
+ vtkDataArray* sizeArray) override;
/**
* Fill edgeRoutingTree with points suitable for routing edges of
* an overlaid graph.
*/
void LayoutEdgePoints(vtkTree *inputTree, vtkDataArray *sectorArray,
- vtkDataArray* sizeArray, vtkTree *edgeRoutingTree) VTK_OVERRIDE;
+ vtkDataArray* sizeArray, vtkTree *edgeRoutingTree) override;
//@{
/**
@@ -138,11 +138,11 @@ public:
/**
* Returns the vertex id that contains pnt (or -1 if no one contains it).
*/
- vtkIdType FindVertex(vtkTree* tree, vtkDataArray* array, float pnt[2]) VTK_OVERRIDE;
+ vtkIdType FindVertex(vtkTree* tree, vtkDataArray* array, float pnt[2]) override;
protected:
vtkStackedTreeLayoutStrategy();
- ~vtkStackedTreeLayoutStrategy() VTK_OVERRIDE;
+ ~vtkStackedTreeLayoutStrategy() override;
float InteriorRadius;
float RingThickness;
diff --git a/Infovis/Layout/vtkTreeLayoutStrategy.h b/Infovis/Layout/vtkTreeLayoutStrategy.h
index 5e8566abe4c4d483c24111c21034daab0bf886f3..863cb51cd71219dbc9bf31705cb3ff1a8e4a718f 100644
--- a/Infovis/Layout/vtkTreeLayoutStrategy.h
+++ b/Infovis/Layout/vtkTreeLayoutStrategy.h
@@ -52,12 +52,12 @@ public:
static vtkTreeLayoutStrategy *New();
vtkTypeMacro(vtkTreeLayoutStrategy, vtkGraphLayoutStrategy);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Perform the tree layout.
*/
- void Layout() VTK_OVERRIDE;
+ void Layout() override;
//@{
/**
@@ -132,7 +132,7 @@ public:
protected:
vtkTreeLayoutStrategy();
- ~vtkTreeLayoutStrategy() VTK_OVERRIDE;
+ ~vtkTreeLayoutStrategy() override;
double Angle;
bool Radial;
diff --git a/Infovis/Layout/vtkTreeMapLayout.h b/Infovis/Layout/vtkTreeMapLayout.h
index 74c7a2925c6fa8aff4bf1c111655b7f4d128a6f2..b4199dd8abd9b0b0d6935729d3fb7b2404d0bfb8 100644
--- a/Infovis/Layout/vtkTreeMapLayout.h
+++ b/Infovis/Layout/vtkTreeMapLayout.h
@@ -54,7 +54,7 @@ public:
static vtkTreeMapLayout *New();
vtkTypeMacro(vtkTreeMapLayout,vtkTreeAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -94,16 +94,16 @@ public:
/**
* Get the modification time of the layout algorithm.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
protected:
vtkTreeMapLayout();
- ~vtkTreeMapLayout() VTK_OVERRIDE;
+ ~vtkTreeMapLayout() override;
char * RectanglesFieldName;
vtkTreeMapLayoutStrategy* LayoutStrategy;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
private:
diff --git a/Infovis/Layout/vtkTreeMapLayoutStrategy.h b/Infovis/Layout/vtkTreeMapLayoutStrategy.h
index 1274fbed45b53f3ed67ceca7668baf8b806dd396..d5403ee0ef39cc5db7f4898bc968b0c5e88563a8 100644
--- a/Infovis/Layout/vtkTreeMapLayoutStrategy.h
+++ b/Infovis/Layout/vtkTreeMapLayoutStrategy.h
@@ -49,17 +49,17 @@ class VTKINFOVISLAYOUT_EXPORT vtkTreeMapLayoutStrategy : public vtkAreaLayoutStr
{
public:
vtkTypeMacro(vtkTreeMapLayoutStrategy, vtkAreaLayoutStrategy);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Find the vertex at a certain location, or -1 if none found.
*/
vtkIdType FindVertex(
- vtkTree* tree, vtkDataArray* areaArray, float pnt[2]) VTK_OVERRIDE;
+ vtkTree* tree, vtkDataArray* areaArray, float pnt[2]) override;
protected:
vtkTreeMapLayoutStrategy();
- ~vtkTreeMapLayoutStrategy() VTK_OVERRIDE;
+ ~vtkTreeMapLayoutStrategy() override;
void AddBorder( float *boxInfo);
private:
vtkTreeMapLayoutStrategy(const vtkTreeMapLayoutStrategy&) VTK_DELETE_FUNCTION;
diff --git a/Infovis/Layout/vtkTreeMapToPolyData.h b/Infovis/Layout/vtkTreeMapToPolyData.h
index e99dfdf5d5a6c4ab0a941122f3596b62372a6957..858427a541b944506fce58b0fea3f031a379b50b 100644
--- a/Infovis/Layout/vtkTreeMapToPolyData.h
+++ b/Infovis/Layout/vtkTreeMapToPolyData.h
@@ -38,7 +38,7 @@ class VTKINFOVISLAYOUT_EXPORT vtkTreeMapToPolyData : public vtkPolyDataAlgorithm
public:
static vtkTreeMapToPolyData *New();
vtkTypeMacro(vtkTreeMapToPolyData,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* The field containing quadruples of the form (min x, max x, min y, max y)
@@ -74,16 +74,16 @@ public:
vtkSetMacro(AddNormals, bool);
//@}
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
protected:
vtkTreeMapToPolyData();
- ~vtkTreeMapToPolyData() VTK_OVERRIDE;
+ ~vtkTreeMapToPolyData() override;
double LevelDeltaZ;
bool AddNormals;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
private:
vtkTreeMapToPolyData(const vtkTreeMapToPolyData&) VTK_DELETE_FUNCTION;
void operator=(const vtkTreeMapToPolyData&) VTK_DELETE_FUNCTION;
diff --git a/Infovis/Layout/vtkTreeOrbitLayoutStrategy.h b/Infovis/Layout/vtkTreeOrbitLayoutStrategy.h
index 767501ebdfdcd965a9b4745088d68a2b02a2eb7c..fe8338a2320cceb9824b401f4a39f94ce197ce14 100644
--- a/Infovis/Layout/vtkTreeOrbitLayoutStrategy.h
+++ b/Infovis/Layout/vtkTreeOrbitLayoutStrategy.h
@@ -36,12 +36,12 @@ public:
static vtkTreeOrbitLayoutStrategy *New();
vtkTypeMacro(vtkTreeOrbitLayoutStrategy, vtkGraphLayoutStrategy);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Perform the orbital layout.
*/
- void Layout() VTK_OVERRIDE;
+ void Layout() override;
//@{
/**
@@ -76,7 +76,7 @@ public:
protected:
vtkTreeOrbitLayoutStrategy();
- ~vtkTreeOrbitLayoutStrategy() VTK_OVERRIDE;
+ ~vtkTreeOrbitLayoutStrategy() override;
void OrbitChildren(vtkTree *t, vtkPoints *p, vtkIdType parent, double radius);
diff --git a/Infovis/Layout/vtkTreeRingToPolyData.h b/Infovis/Layout/vtkTreeRingToPolyData.h
index 7a81801c5039c8c2186ae6c14d4529925558732e..3543bf0dae18b6aa27875ca9f1e6f0090f404795 100644
--- a/Infovis/Layout/vtkTreeRingToPolyData.h
+++ b/Infovis/Layout/vtkTreeRingToPolyData.h
@@ -41,7 +41,7 @@ public:
static vtkTreeRingToPolyData *New();
vtkTypeMacro(vtkTreeRingToPolyData,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* The field containing quadruples of the form (start angle, end angle,
@@ -61,15 +61,15 @@ public:
vtkGetMacro(ShrinkPercentage, double);
//@}
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
protected:
vtkTreeRingToPolyData();
- ~vtkTreeRingToPolyData() VTK_OVERRIDE;
+ ~vtkTreeRingToPolyData() override;
double ShrinkPercentage;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
private:
vtkTreeRingToPolyData(const vtkTreeRingToPolyData&) VTK_DELETE_FUNCTION;
void operator=(const vtkTreeRingToPolyData&) VTK_DELETE_FUNCTION;
diff --git a/Interaction/Image/vtkImageViewer.cxx b/Interaction/Image/vtkImageViewer.cxx
index a8a185846f83907e0d07d55f8865e8c991653c91..792453516a703cbd3f5ed4cf938a0c68ad38be5e 100644
--- a/Interaction/Image/vtkImageViewer.cxx
+++ b/Interaction/Image/vtkImageViewer.cxx
@@ -99,7 +99,7 @@ public:
void Execute(vtkObject *caller,
unsigned long event,
- void *vtkNotUsed(callData)) VTK_OVERRIDE
+ void *vtkNotUsed(callData)) override
{
if (this->IV->GetInput() == nullptr)
{
diff --git a/Interaction/Image/vtkImageViewer.h b/Interaction/Image/vtkImageViewer.h
index 71c7f009ecb472facc1f96f4434dc248bd5490fa..4a61da27b7db3d6de8835bb0bc9dc96417525983 100644
--- a/Interaction/Image/vtkImageViewer.h
+++ b/Interaction/Image/vtkImageViewer.h
@@ -43,7 +43,7 @@ public:
static vtkImageViewer *New();
vtkTypeMacro(vtkImageViewer,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Get name of rendering window
@@ -147,7 +147,7 @@ public:
protected:
vtkImageViewer();
- ~vtkImageViewer() VTK_OVERRIDE;
+ ~vtkImageViewer() override;
vtkRenderWindow *RenderWindow;
vtkRenderer *Renderer;
diff --git a/Interaction/Image/vtkImageViewer2.cxx b/Interaction/Image/vtkImageViewer2.cxx
index f6c34686883326090cc66d3c350c2b48e5fe19a8..86360be90bbce893ed50ed2ece5acbc9dd3262f4 100644
--- a/Interaction/Image/vtkImageViewer2.cxx
+++ b/Interaction/Image/vtkImageViewer2.cxx
@@ -471,7 +471,7 @@ public:
void Execute(vtkObject *caller,
unsigned long event,
- void *vtkNotUsed(callData)) VTK_OVERRIDE
+ void *vtkNotUsed(callData)) override
{
if (this->IV->GetInput() == nullptr)
{
diff --git a/Interaction/Image/vtkImageViewer2.h b/Interaction/Image/vtkImageViewer2.h
index 4d4b3437b00569f07bfc9d640d94c8e0aad3ca62..5178c2770026ab7b253cd1b2056d67a301d98017 100644
--- a/Interaction/Image/vtkImageViewer2.h
+++ b/Interaction/Image/vtkImageViewer2.h
@@ -77,7 +77,7 @@ class VTKINTERACTIONIMAGE_EXPORT vtkImageViewer2 : public vtkObject
public:
static vtkImageViewer2 *New();
vtkTypeMacro(vtkImageViewer2,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Get the name of rendering window.
@@ -229,7 +229,7 @@ public:
protected:
vtkImageViewer2();
- ~vtkImageViewer2() VTK_OVERRIDE;
+ ~vtkImageViewer2() override;
virtual void InstallPipeline();
virtual void UnInstallPipeline();
diff --git a/Interaction/Image/vtkResliceImageViewer.cxx b/Interaction/Image/vtkResliceImageViewer.cxx
index 26558bf6760113d1033c55bf54f888606ed34352..9f0159a92b6d55f9e8c72e2724d1d55169a85aa4 100644
--- a/Interaction/Image/vtkResliceImageViewer.cxx
+++ b/Interaction/Image/vtkResliceImageViewer.cxx
@@ -52,7 +52,7 @@ public:
static vtkResliceImageViewerScrollCallback *New()
{ return new vtkResliceImageViewerScrollCallback; }
- void Execute(vtkObject *, unsigned long ev, void*) VTK_OVERRIDE
+ void Execute(vtkObject *, unsigned long ev, void*) override
{
if (!this->Viewer->GetSliceScrollOnMouseWheel())
{
diff --git a/Interaction/Image/vtkResliceImageViewer.h b/Interaction/Image/vtkResliceImageViewer.h
index 9ff0683733c06b0c94a37f39dcade1e616f44ebc..db9f21db3fa9c2f2b3ac700dca8e35e142712ae5 100644
--- a/Interaction/Image/vtkResliceImageViewer.h
+++ b/Interaction/Image/vtkResliceImageViewer.h
@@ -51,28 +51,28 @@ public:
*/
static vtkResliceImageViewer *New();
vtkTypeMacro(vtkResliceImageViewer,vtkImageViewer2);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
* Render the resulting image.
*/
- void Render() VTK_OVERRIDE;
+ void Render() override;
//@{
/**
* Set/Get the input image to the viewer.
*/
- void SetInputData(vtkImageData *in) VTK_OVERRIDE;
- void SetInputConnection(vtkAlgorithmOutput* input) VTK_OVERRIDE;
+ void SetInputData(vtkImageData *in) override;
+ void SetInputConnection(vtkAlgorithmOutput* input) override;
//@}
//@{
/**
* Set window and level for mapping pixels to colors.
*/
- void SetColorWindow(double s) VTK_OVERRIDE;
- void SetColorLevel(double s) VTK_OVERRIDE;
+ void SetColorWindow(double s) override;
+ void SetColorLevel(double s) override;
//@}
//@{
@@ -171,12 +171,12 @@ public:
protected:
vtkResliceImageViewer();
- ~vtkResliceImageViewer() VTK_OVERRIDE;
+ ~vtkResliceImageViewer() override;
- void InstallPipeline() VTK_OVERRIDE;
- void UnInstallPipeline() VTK_OVERRIDE;
- void UpdateOrientation() VTK_OVERRIDE;
- void UpdateDisplayExtent() VTK_OVERRIDE;
+ void InstallPipeline() override;
+ void UnInstallPipeline() override;
+ void UpdateOrientation() override;
+ void UpdateDisplayExtent() override;
virtual void UpdatePointPlacer();
//@{
diff --git a/Interaction/Image/vtkResliceImageViewerMeasurements.h b/Interaction/Image/vtkResliceImageViewerMeasurements.h
index 7d85848ca53301daf81c65d1b338cbb2df419cc3..3df1ce16d00b301578677cc1b5c7398076f07a27 100644
--- a/Interaction/Image/vtkResliceImageViewerMeasurements.h
+++ b/Interaction/Image/vtkResliceImageViewerMeasurements.h
@@ -52,7 +52,7 @@ public:
*/
static vtkResliceImageViewerMeasurements *New();
vtkTypeMacro(vtkResliceImageViewerMeasurements,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
@@ -106,7 +106,7 @@ public:
protected:
vtkResliceImageViewerMeasurements();
- ~vtkResliceImageViewerMeasurements() VTK_OVERRIDE;
+ ~vtkResliceImageViewerMeasurements() override;
//@{
/**
diff --git a/Interaction/Style/vtkInteractorStyleDrawPolygon.h b/Interaction/Style/vtkInteractorStyleDrawPolygon.h
index becc8b0b5bfe77dc2886517ae92440a8aa129db1..7b1817bc01ff1ec5c9973cb464fa213a9406883d 100644
--- a/Interaction/Style/vtkInteractorStyleDrawPolygon.h
+++ b/Interaction/Style/vtkInteractorStyleDrawPolygon.h
@@ -37,15 +37,15 @@ class VTKINTERACTIONSTYLE_EXPORT vtkInteractorStyleDrawPolygon : public vtkInter
public:
static vtkInteractorStyleDrawPolygon *New();
vtkTypeMacro(vtkInteractorStyleDrawPolygon, vtkInteractorStyle);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
* Event bindings
*/
- void OnMouseMove() VTK_OVERRIDE;
- void OnLeftButtonDown() VTK_OVERRIDE;
- void OnLeftButtonUp() VTK_OVERRIDE;
+ void OnMouseMove() override;
+ void OnLeftButtonDown() override;
+ void OnLeftButtonUp() override;
//@}
//@{
@@ -64,7 +64,7 @@ public:
protected:
vtkInteractorStyleDrawPolygon();
- ~vtkInteractorStyleDrawPolygon() VTK_OVERRIDE;
+ ~vtkInteractorStyleDrawPolygon() override;
virtual void DrawPolygon();
diff --git a/Interaction/Style/vtkInteractorStyleFlight.h b/Interaction/Style/vtkInteractorStyleFlight.h
index 4e2a8e029b7ce3f28b85f3418cb96ccfb85b76ce..782bef5418dacbcd9d5a58998ca078ac56d4a2ae 100644
--- a/Interaction/Style/vtkInteractorStyleFlight.h
+++ b/Interaction/Style/vtkInteractorStyleFlight.h
@@ -48,7 +48,7 @@ class VTKINTERACTIONSTYLE_EXPORT vtkInteractorStyleFlight : public vtkInteractor
public:
static vtkInteractorStyleFlight *New();
vtkTypeMacro(vtkInteractorStyleFlight,vtkInteractorStyle);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Move the Eye/Camera to a specific location (no intermediate
@@ -118,23 +118,23 @@ public:
/**
* Concrete implementation of Mouse event bindings for flight
*/
- void OnMouseMove() VTK_OVERRIDE;
- void OnLeftButtonDown() VTK_OVERRIDE;
- void OnLeftButtonUp() VTK_OVERRIDE;
- void OnMiddleButtonDown() VTK_OVERRIDE;
- void OnMiddleButtonUp() VTK_OVERRIDE;
- void OnRightButtonDown() VTK_OVERRIDE;
- void OnRightButtonUp() VTK_OVERRIDE;
+ void OnMouseMove() override;
+ void OnLeftButtonDown() override;
+ void OnLeftButtonUp() override;
+ void OnMiddleButtonDown() override;
+ void OnMiddleButtonUp() override;
+ void OnRightButtonDown() override;
+ void OnRightButtonUp() override;
//@}
//@{
/**
* Concrete implementation of Keyboard event bindings for flight
*/
- void OnChar() VTK_OVERRIDE;
- void OnKeyDown() VTK_OVERRIDE;
- void OnKeyUp() VTK_OVERRIDE;
- void OnTimer() VTK_OVERRIDE;
+ void OnChar() override;
+ void OnKeyDown() override;
+ void OnKeyUp() override;
+ void OnTimer() override;
//
virtual void ForwardFly();
virtual void ReverseFly();
@@ -147,7 +147,7 @@ public:
protected:
vtkInteractorStyleFlight();
- ~vtkInteractorStyleFlight() VTK_OVERRIDE;
+ ~vtkInteractorStyleFlight() override;
//@{
/**
diff --git a/Interaction/Style/vtkInteractorStyleImage.h b/Interaction/Style/vtkInteractorStyleImage.h
index 974ae77982a7d9b129dc87cf8416a6ee3fa75b16..38db490dd4fcc4ba9fc536ec06affa155f0fa359 100644
--- a/Interaction/Style/vtkInteractorStyleImage.h
+++ b/Interaction/Style/vtkInteractorStyleImage.h
@@ -80,7 +80,7 @@ class VTKINTERACTIONSTYLE_EXPORT vtkInteractorStyleImage : public vtkInteractorS
public:
static vtkInteractorStyleImage *New();
vtkTypeMacro(vtkInteractorStyleImage, vtkInteractorStyleTrackballCamera);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -95,19 +95,19 @@ public:
* Event bindings controlling the effects of pressing mouse buttons
* or moving the mouse.
*/
- void OnMouseMove() VTK_OVERRIDE;
- void OnLeftButtonDown() VTK_OVERRIDE;
- void OnLeftButtonUp() VTK_OVERRIDE;
- void OnMiddleButtonDown() VTK_OVERRIDE;
- void OnMiddleButtonUp() VTK_OVERRIDE;
- void OnRightButtonDown() VTK_OVERRIDE;
- void OnRightButtonUp() VTK_OVERRIDE;
+ void OnMouseMove() override;
+ void OnLeftButtonDown() override;
+ void OnLeftButtonUp() override;
+ void OnMiddleButtonDown() override;
+ void OnMiddleButtonUp() override;
+ void OnRightButtonDown() override;
+ void OnRightButtonUp() override;
//@}
/**
* Override the "fly-to" (f keypress) for images.
*/
- void OnChar() VTK_OVERRIDE;
+ void OnChar() override;
// These methods for the different interactions in different modes
// are overridden in subclasses to perform the correct motion. Since
@@ -197,7 +197,7 @@ public:
protected:
vtkInteractorStyleImage();
- ~vtkInteractorStyleImage() VTK_OVERRIDE;
+ ~vtkInteractorStyleImage() override;
int WindowLevelStartPosition[2];
int WindowLevelCurrentPosition[2];
diff --git a/Interaction/Style/vtkInteractorStyleJoystickActor.h b/Interaction/Style/vtkInteractorStyleJoystickActor.h
index c7390ada25615f18b1c55e13a9d5cf00b8c4d69c..e44849b230dabf947e70f4d63ac8f54023be4d56 100644
--- a/Interaction/Style/vtkInteractorStyleJoystickActor.h
+++ b/Interaction/Style/vtkInteractorStyleJoystickActor.h
@@ -47,35 +47,35 @@ public:
static vtkInteractorStyleJoystickActor *New();
vtkTypeMacro(vtkInteractorStyleJoystickActor,vtkInteractorStyle);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
* Event bindings controlling the effects of pressing mouse buttons
* or moving the mouse.
*/
- void OnMouseMove() VTK_OVERRIDE;
- void OnLeftButtonDown() VTK_OVERRIDE;
- void OnLeftButtonUp() VTK_OVERRIDE;
- void OnMiddleButtonDown() VTK_OVERRIDE;
- void OnMiddleButtonUp() VTK_OVERRIDE;
- void OnRightButtonDown() VTK_OVERRIDE;
- void OnRightButtonUp() VTK_OVERRIDE;
+ void OnMouseMove() override;
+ void OnLeftButtonDown() override;
+ void OnLeftButtonUp() override;
+ void OnMiddleButtonDown() override;
+ void OnMiddleButtonUp() override;
+ void OnRightButtonDown() override;
+ void OnRightButtonUp() override;
//@}
// These methods for the different interactions in different modes
// are overridden in subclasses to perform the correct motion. Since
// they might be called from OnTimer, they do not have mouse coord parameters
// (use interactor's GetEventPosition and GetLastEventPosition)
- void Rotate() VTK_OVERRIDE;
- void Spin() VTK_OVERRIDE;
- void Pan() VTK_OVERRIDE;
- void Dolly() VTK_OVERRIDE;
- void UniformScale() VTK_OVERRIDE;
+ void Rotate() override;
+ void Spin() override;
+ void Pan() override;
+ void Dolly() override;
+ void UniformScale() override;
protected:
vtkInteractorStyleJoystickActor();
- ~vtkInteractorStyleJoystickActor() VTK_OVERRIDE;
+ ~vtkInteractorStyleJoystickActor() override;
void FindPickedActor(int x, int y);
diff --git a/Interaction/Style/vtkInteractorStyleJoystickCamera.h b/Interaction/Style/vtkInteractorStyleJoystickCamera.h
index 400918bfb33deda18a0f5910c37d0c0145be0f92..6a76110fdbcafec889c85980cc628bc3f5ce2697 100644
--- a/Interaction/Style/vtkInteractorStyleJoystickCamera.h
+++ b/Interaction/Style/vtkInteractorStyleJoystickCamera.h
@@ -44,36 +44,36 @@ class VTKINTERACTIONSTYLE_EXPORT vtkInteractorStyleJoystickCamera : public vtkIn
public:
static vtkInteractorStyleJoystickCamera *New();
vtkTypeMacro(vtkInteractorStyleJoystickCamera,vtkInteractorStyle);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
* Event bindings controlling the effects of pressing mouse buttons
* or moving the mouse.
*/
- void OnMouseMove() VTK_OVERRIDE;
- void OnLeftButtonDown() VTK_OVERRIDE;
- void OnLeftButtonUp() VTK_OVERRIDE;
- void OnMiddleButtonDown() VTK_OVERRIDE;
- void OnMiddleButtonUp() VTK_OVERRIDE;
- void OnRightButtonDown() VTK_OVERRIDE;
- void OnRightButtonUp() VTK_OVERRIDE;
- void OnMouseWheelForward() VTK_OVERRIDE;
- void OnMouseWheelBackward() VTK_OVERRIDE;
+ void OnMouseMove() override;
+ void OnLeftButtonDown() override;
+ void OnLeftButtonUp() override;
+ void OnMiddleButtonDown() override;
+ void OnMiddleButtonUp() override;
+ void OnRightButtonDown() override;
+ void OnRightButtonUp() override;
+ void OnMouseWheelForward() override;
+ void OnMouseWheelBackward() override;
//@}
// These methods for the different interactions in different modes
// are overridden in subclasses to perform the correct motion. Since
// they are called by OnTimer, they do not have mouse coord parameters
// (use interactor's GetEventPosition and GetLastEventPosition)
- void Rotate() VTK_OVERRIDE;
- void Spin() VTK_OVERRIDE;
- void Pan() VTK_OVERRIDE;
- void Dolly() VTK_OVERRIDE;
+ void Rotate() override;
+ void Spin() override;
+ void Pan() override;
+ void Dolly() override;
protected:
vtkInteractorStyleJoystickCamera();
- ~vtkInteractorStyleJoystickCamera() VTK_OVERRIDE;
+ ~vtkInteractorStyleJoystickCamera() override;
virtual void Dolly(double factor);
diff --git a/Interaction/Style/vtkInteractorStyleMultiTouchCamera.h b/Interaction/Style/vtkInteractorStyleMultiTouchCamera.h
index c116bbd4c676edd13f4b658e328d3e183bddd598..abda9a7bc853020cc1a1f4f577d41bee20f8550a 100644
--- a/Interaction/Style/vtkInteractorStyleMultiTouchCamera.h
+++ b/Interaction/Style/vtkInteractorStyleMultiTouchCamera.h
@@ -37,20 +37,20 @@ class VTKINTERACTIONSTYLE_EXPORT vtkInteractorStyleMultiTouchCamera : public vtk
public:
static vtkInteractorStyleMultiTouchCamera *New();
vtkTypeMacro(vtkInteractorStyleMultiTouchCamera,vtkInteractorStyleTrackballCamera);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
* Event bindings for gestures
*/
- void OnRotate() VTK_OVERRIDE;
- void OnPinch() VTK_OVERRIDE;
- void OnPan() VTK_OVERRIDE;
+ void OnRotate() override;
+ void OnPinch() override;
+ void OnPan() override;
//@}
protected:
vtkInteractorStyleMultiTouchCamera();
- ~vtkInteractorStyleMultiTouchCamera() VTK_OVERRIDE;
+ ~vtkInteractorStyleMultiTouchCamera() override;
private:
vtkInteractorStyleMultiTouchCamera(const vtkInteractorStyleMultiTouchCamera&) VTK_DELETE_FUNCTION;
diff --git a/Interaction/Style/vtkInteractorStyleRubberBand2D.h b/Interaction/Style/vtkInteractorStyleRubberBand2D.h
index 72ded6be7940551893afe3b60488ac75a330b9cf..5989002832aa6e18c1f17628025ee0dc60fe1bba 100644
--- a/Interaction/Style/vtkInteractorStyleRubberBand2D.h
+++ b/Interaction/Style/vtkInteractorStyleRubberBand2D.h
@@ -50,17 +50,17 @@ class VTKINTERACTIONSTYLE_EXPORT vtkInteractorStyleRubberBand2D : public vtkInte
public:
static vtkInteractorStyleRubberBand2D *New();
vtkTypeMacro(vtkInteractorStyleRubberBand2D, vtkInteractorStyle);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
-
- void OnLeftButtonDown() VTK_OVERRIDE;
- void OnLeftButtonUp() VTK_OVERRIDE;
- void OnMiddleButtonDown() VTK_OVERRIDE;
- void OnMiddleButtonUp() VTK_OVERRIDE;
- void OnRightButtonDown() VTK_OVERRIDE;
- void OnRightButtonUp() VTK_OVERRIDE;
- void OnMouseMove() VTK_OVERRIDE;
- void OnMouseWheelForward() VTK_OVERRIDE;
- void OnMouseWheelBackward() VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
+
+ void OnLeftButtonDown() override;
+ void OnLeftButtonUp() override;
+ void OnMiddleButtonDown() override;
+ void OnMiddleButtonUp() override;
+ void OnRightButtonDown() override;
+ void OnRightButtonUp() override;
+ void OnMouseMove() override;
+ void OnMouseWheelForward() override;
+ void OnMouseWheelBackward() override;
//@{
/**
@@ -107,7 +107,7 @@ public:
protected:
vtkInteractorStyleRubberBand2D();
- ~vtkInteractorStyleRubberBand2D() VTK_OVERRIDE;
+ ~vtkInteractorStyleRubberBand2D() override;
// The interaction mode
int Interaction;
diff --git a/Interaction/Style/vtkInteractorStyleRubberBand3D.h b/Interaction/Style/vtkInteractorStyleRubberBand3D.h
index b9ff8e5f7a4f528802d5c7a1f6b6b66c29d1ebfb..c47f92a2cd5abf74204373e4d02027475ea01956 100644
--- a/Interaction/Style/vtkInteractorStyleRubberBand3D.h
+++ b/Interaction/Style/vtkInteractorStyleRubberBand3D.h
@@ -48,17 +48,17 @@ class VTKINTERACTIONSTYLE_EXPORT vtkInteractorStyleRubberBand3D : public vtkInte
public:
static vtkInteractorStyleRubberBand3D *New();
vtkTypeMacro(vtkInteractorStyleRubberBand3D, vtkInteractorStyleTrackballCamera);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
-
- void OnLeftButtonDown() VTK_OVERRIDE;
- void OnLeftButtonUp() VTK_OVERRIDE;
- void OnMiddleButtonDown() VTK_OVERRIDE;
- void OnMiddleButtonUp() VTK_OVERRIDE;
- void OnRightButtonDown() VTK_OVERRIDE;
- void OnRightButtonUp() VTK_OVERRIDE;
- void OnMouseMove() VTK_OVERRIDE;
- void OnMouseWheelForward() VTK_OVERRIDE;
- void OnMouseWheelBackward() VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
+
+ void OnLeftButtonDown() override;
+ void OnLeftButtonUp() override;
+ void OnMiddleButtonDown() override;
+ void OnMiddleButtonUp() override;
+ void OnRightButtonDown() override;
+ void OnRightButtonUp() override;
+ void OnMouseMove() override;
+ void OnMouseWheelForward() override;
+ void OnMouseWheelBackward() override;
//@{
/**
@@ -106,7 +106,7 @@ public:
protected:
vtkInteractorStyleRubberBand3D();
- ~vtkInteractorStyleRubberBand3D() VTK_OVERRIDE;
+ ~vtkInteractorStyleRubberBand3D() override;
// The interaction mode
int Interaction;
diff --git a/Interaction/Style/vtkInteractorStyleRubberBandPick.h b/Interaction/Style/vtkInteractorStyleRubberBandPick.h
index 4330eacbe95bda6bb19e932cee888fa07e4bff7a..a4a135865167bbaf71176cdc6e3070912fe4c6a4 100644
--- a/Interaction/Style/vtkInteractorStyleRubberBandPick.h
+++ b/Interaction/Style/vtkInteractorStyleRubberBandPick.h
@@ -42,7 +42,7 @@ class VTKINTERACTIONSTYLE_EXPORT vtkInteractorStyleRubberBandPick : public vtkIn
public:
static vtkInteractorStyleRubberBandPick *New();
vtkTypeMacro(vtkInteractorStyleRubberBandPick, vtkInteractorStyleTrackballCamera);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
void StartSelect();
@@ -50,15 +50,15 @@ public:
/**
* Event bindings
*/
- void OnMouseMove() VTK_OVERRIDE;
- void OnLeftButtonDown() VTK_OVERRIDE;
- void OnLeftButtonUp() VTK_OVERRIDE;
- void OnChar() VTK_OVERRIDE;
+ void OnMouseMove() override;
+ void OnLeftButtonDown() override;
+ void OnLeftButtonUp() override;
+ void OnChar() override;
//@}
protected:
vtkInteractorStyleRubberBandPick();
- ~vtkInteractorStyleRubberBandPick() VTK_OVERRIDE;
+ ~vtkInteractorStyleRubberBandPick() override;
virtual void Pick();
void RedrawRubberBand();
diff --git a/Interaction/Style/vtkInteractorStyleRubberBandZoom.h b/Interaction/Style/vtkInteractorStyleRubberBandZoom.h
index 3273b90446b3f4dc5ad862f801d0ac4b340f24d4..af1c565547b18f8eaa57c813963581b80074900f 100644
--- a/Interaction/Style/vtkInteractorStyleRubberBandZoom.h
+++ b/Interaction/Style/vtkInteractorStyleRubberBandZoom.h
@@ -36,7 +36,7 @@ class VTKINTERACTIONSTYLE_EXPORT vtkInteractorStyleRubberBandZoom : public vtkIn
public:
static vtkInteractorStyleRubberBandZoom *New();
vtkTypeMacro(vtkInteractorStyleRubberBandZoom, vtkInteractorStyle);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -78,16 +78,16 @@ public:
/**
* Event bindings
*/
- void OnMouseMove() VTK_OVERRIDE;
- void OnLeftButtonDown() VTK_OVERRIDE;
- void OnLeftButtonUp() VTK_OVERRIDE;
+ void OnMouseMove() override;
+ void OnLeftButtonDown() override;
+ void OnLeftButtonUp() override;
//@}
protected:
vtkInteractorStyleRubberBandZoom();
- ~vtkInteractorStyleRubberBandZoom() VTK_OVERRIDE;
+ ~vtkInteractorStyleRubberBandZoom() override;
- void Zoom() VTK_OVERRIDE;
+ void Zoom() override;
int StartPosition[2];
int EndPosition[2];
diff --git a/Interaction/Style/vtkInteractorStyleSwitch.h b/Interaction/Style/vtkInteractorStyleSwitch.h
index d471f0d1877e08bdd8c5c775d1bb18ea552f6293..7855a70909d2311799d73c2d9a086a3f31918255 100644
--- a/Interaction/Style/vtkInteractorStyleSwitch.h
+++ b/Interaction/Style/vtkInteractorStyleSwitch.h
@@ -50,18 +50,18 @@ class VTKINTERACTIONSTYLE_EXPORT vtkInteractorStyleSwitch
public:
static vtkInteractorStyleSwitch *New();
vtkTypeMacro(vtkInteractorStyleSwitch, vtkInteractorStyleSwitchBase);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* The sub styles need the interactor too.
*/
- void SetInteractor(vtkRenderWindowInteractor *iren) VTK_OVERRIDE;
+ void SetInteractor(vtkRenderWindowInteractor *iren) override;
/**
* We must override this method in order to pass the setting down to
* the underlying styles
*/
- void SetAutoAdjustCameraClippingRange( int value ) VTK_OVERRIDE;
+ void SetAutoAdjustCameraClippingRange( int value ) override;
//@{
/**
@@ -79,20 +79,20 @@ public:
* Only care about the char event, which is used to switch between
* different styles.
*/
- void OnChar() VTK_OVERRIDE;
+ void OnChar() override;
//@{
/**
* Overridden from vtkInteractorObserver because the interactor styles
* used by this class must also be updated.
*/
- void SetDefaultRenderer(vtkRenderer*) VTK_OVERRIDE;
- void SetCurrentRenderer(vtkRenderer*) VTK_OVERRIDE;
+ void SetDefaultRenderer(vtkRenderer*) override;
+ void SetCurrentRenderer(vtkRenderer*) override;
//@}
protected:
vtkInteractorStyleSwitch();
- ~vtkInteractorStyleSwitch() VTK_OVERRIDE;
+ ~vtkInteractorStyleSwitch() override;
void SetCurrentStyle();
diff --git a/Interaction/Style/vtkInteractorStyleTerrain.h b/Interaction/Style/vtkInteractorStyleTerrain.h
index 1f92c56f406f9aa59fa3b6ceff1be6a0cc976179..ba7dc8ad9e678da65a2eea872af2b5e223c89430 100644
--- a/Interaction/Style/vtkInteractorStyleTerrain.h
+++ b/Interaction/Style/vtkInteractorStyleTerrain.h
@@ -65,32 +65,32 @@ public:
static vtkInteractorStyleTerrain *New();
vtkTypeMacro(vtkInteractorStyleTerrain,vtkInteractorStyle);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
* Event bindings controlling the effects of pressing mouse buttons
* or moving the mouse.
*/
- void OnMouseMove() VTK_OVERRIDE;
- void OnLeftButtonDown() VTK_OVERRIDE;
- void OnLeftButtonUp() VTK_OVERRIDE;
- void OnMiddleButtonDown() VTK_OVERRIDE;
- void OnMiddleButtonUp() VTK_OVERRIDE;
- void OnRightButtonDown() VTK_OVERRIDE;
- void OnRightButtonUp() VTK_OVERRIDE;
+ void OnMouseMove() override;
+ void OnLeftButtonDown() override;
+ void OnLeftButtonUp() override;
+ void OnMiddleButtonDown() override;
+ void OnMiddleButtonUp() override;
+ void OnRightButtonDown() override;
+ void OnRightButtonUp() override;
//@}
/**
* Override the "fly-to" (f keypress) for images.
*/
- void OnChar() VTK_OVERRIDE;
+ void OnChar() override;
// These methods for the different interactions in different modes
// are overridden in subclasses to perform the correct motion.
- void Rotate() VTK_OVERRIDE;
- void Pan() VTK_OVERRIDE;
- void Dolly() VTK_OVERRIDE;
+ void Rotate() override;
+ void Pan() override;
+ void Dolly() override;
//@{
/**
@@ -103,7 +103,7 @@ public:
protected:
vtkInteractorStyleTerrain();
- ~vtkInteractorStyleTerrain() VTK_OVERRIDE;
+ ~vtkInteractorStyleTerrain() override;
// Internal helper attributes
int LatLongLines;
diff --git a/Interaction/Style/vtkInteractorStyleTrackball.h b/Interaction/Style/vtkInteractorStyleTrackball.h
index 91bafd1178172986d2bf3bd821ba70b1a94502fb..92763e1cb12ec1f34ecda1c280be0ac5c31dca3b 100644
--- a/Interaction/Style/vtkInteractorStyleTrackball.h
+++ b/Interaction/Style/vtkInteractorStyleTrackball.h
@@ -36,11 +36,11 @@ class VTKINTERACTIONSTYLE_EXPORT vtkInteractorStyleTrackball : public vtkInterac
public:
static vtkInteractorStyleTrackball *New();
vtkTypeMacro(vtkInteractorStyleTrackball,vtkInteractorStyleSwitch);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkInteractorStyleTrackball();
- ~vtkInteractorStyleTrackball() VTK_OVERRIDE;
+ ~vtkInteractorStyleTrackball() override;
private:
vtkInteractorStyleTrackball(const vtkInteractorStyleTrackball&) VTK_DELETE_FUNCTION;
diff --git a/Interaction/Style/vtkInteractorStyleTrackballActor.h b/Interaction/Style/vtkInteractorStyleTrackballActor.h
index 4528e18cb9d989a066a976172cdea5d842394970..fec327698f1f8679b525703cb27edc732e00723c 100644
--- a/Interaction/Style/vtkInteractorStyleTrackballActor.h
+++ b/Interaction/Style/vtkInteractorStyleTrackballActor.h
@@ -47,35 +47,35 @@ class VTKINTERACTIONSTYLE_EXPORT vtkInteractorStyleTrackballActor : public vtkIn
public:
static vtkInteractorStyleTrackballActor *New();
vtkTypeMacro(vtkInteractorStyleTrackballActor,vtkInteractorStyle);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
* Event bindings controlling the effects of pressing mouse buttons
* or moving the mouse.
*/
- void OnMouseMove() VTK_OVERRIDE;
- void OnLeftButtonDown() VTK_OVERRIDE;
- void OnLeftButtonUp() VTK_OVERRIDE;
- void OnMiddleButtonDown() VTK_OVERRIDE;
- void OnMiddleButtonUp() VTK_OVERRIDE;
- void OnRightButtonDown() VTK_OVERRIDE;
- void OnRightButtonUp() VTK_OVERRIDE;
+ void OnMouseMove() override;
+ void OnLeftButtonDown() override;
+ void OnLeftButtonUp() override;
+ void OnMiddleButtonDown() override;
+ void OnMiddleButtonUp() override;
+ void OnRightButtonDown() override;
+ void OnRightButtonUp() override;
//@}
// These methods for the different interactions in different modes
// are overridden in subclasses to perform the correct motion. Since
// they might be called from OnTimer, they do not have mouse coord parameters
// (use interactor's GetEventPosition and GetLastEventPosition)
- void Rotate() VTK_OVERRIDE;
- void Spin() VTK_OVERRIDE;
- void Pan() VTK_OVERRIDE;
- void Dolly() VTK_OVERRIDE;
- void UniformScale() VTK_OVERRIDE;
+ void Rotate() override;
+ void Spin() override;
+ void Pan() override;
+ void Dolly() override;
+ void UniformScale() override;
protected:
vtkInteractorStyleTrackballActor();
- ~vtkInteractorStyleTrackballActor() VTK_OVERRIDE;
+ ~vtkInteractorStyleTrackballActor() override;
void FindPickedActor(int x, int y);
diff --git a/Interaction/Style/vtkInteractorStyleTrackballCamera.h b/Interaction/Style/vtkInteractorStyleTrackballCamera.h
index ba552fd239e1b604ec3b0dafd6aa5c9b6e5b39be..ed083e6b59e80d3ca4937b290211ab0d3e97bcef 100644
--- a/Interaction/Style/vtkInteractorStyleTrackballCamera.h
+++ b/Interaction/Style/vtkInteractorStyleTrackballCamera.h
@@ -43,32 +43,32 @@ class VTKINTERACTIONSTYLE_EXPORT vtkInteractorStyleTrackballCamera : public vtkI
public:
static vtkInteractorStyleTrackballCamera *New();
vtkTypeMacro(vtkInteractorStyleTrackballCamera,vtkInteractorStyle);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
* Event bindings controlling the effects of pressing mouse buttons
* or moving the mouse.
*/
- void OnMouseMove() VTK_OVERRIDE;
- void OnLeftButtonDown() VTK_OVERRIDE;
- void OnLeftButtonUp() VTK_OVERRIDE;
- void OnMiddleButtonDown() VTK_OVERRIDE;
- void OnMiddleButtonUp() VTK_OVERRIDE;
- void OnRightButtonDown() VTK_OVERRIDE;
- void OnRightButtonUp() VTK_OVERRIDE;
- void OnMouseWheelForward() VTK_OVERRIDE;
- void OnMouseWheelBackward() VTK_OVERRIDE;
+ void OnMouseMove() override;
+ void OnLeftButtonDown() override;
+ void OnLeftButtonUp() override;
+ void OnMiddleButtonDown() override;
+ void OnMiddleButtonUp() override;
+ void OnRightButtonDown() override;
+ void OnRightButtonUp() override;
+ void OnMouseWheelForward() override;
+ void OnMouseWheelBackward() override;
//@}
// These methods for the different interactions in different modes
// are overridden in subclasses to perform the correct motion. Since
// they are called by OnTimer, they do not have mouse coord parameters
// (use interactor's GetEventPosition and GetLastEventPosition)
- void Rotate() VTK_OVERRIDE;
- void Spin() VTK_OVERRIDE;
- void Pan() VTK_OVERRIDE;
- void Dolly() VTK_OVERRIDE;
+ void Rotate() override;
+ void Spin() override;
+ void Pan() override;
+ void Dolly() override;
//@{
/**
@@ -80,7 +80,7 @@ public:
protected:
vtkInteractorStyleTrackballCamera();
- ~vtkInteractorStyleTrackballCamera() VTK_OVERRIDE;
+ ~vtkInteractorStyleTrackballCamera() override;
double MotionFactor;
diff --git a/Interaction/Style/vtkInteractorStyleUnicam.h b/Interaction/Style/vtkInteractorStyleUnicam.h
index c08de134ba08f39dc9f97eaabd02911d0f3b44a5..72292c14229a6452c94bda1555926c05ca7a4a20 100644
--- a/Interaction/Style/vtkInteractorStyleUnicam.h
+++ b/Interaction/Style/vtkInteractorStyleUnicam.h
@@ -111,7 +111,7 @@ class VTKINTERACTIONSTYLE_EXPORT vtkInteractorStyleUnicam : public vtkInteractor
public:
static vtkInteractorStyleUnicam *New();
vtkTypeMacro(vtkInteractorStyleUnicam,vtkInteractorStyle);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
void SetWorldUpVector(double a[3]) {this->SetWorldUpVector(a[0],a[1],a[2]);}
void SetWorldUpVector(double x, double y, double z);
@@ -121,9 +121,9 @@ public:
/**
* Concrete implementation of event bindings
*/
- void OnMouseMove() VTK_OVERRIDE;
- void OnLeftButtonDown() VTK_OVERRIDE;
- void OnLeftButtonUp() VTK_OVERRIDE;
+ void OnMouseMove() override;
+ void OnLeftButtonDown() override;
+ void OnLeftButtonUp() override;
virtual void OnLeftButtonMove();
//@}
@@ -131,11 +131,11 @@ public:
* OnTimer calls RotateCamera, RotateActor etc which should be overridden by
* style subclasses.
*/
- void OnTimer() VTK_OVERRIDE;
+ void OnTimer() override;
protected:
vtkInteractorStyleUnicam();
- ~vtkInteractorStyleUnicam() VTK_OVERRIDE;
+ ~vtkInteractorStyleUnicam() override;
vtkWorldPointPicker *InteractionPicker;
diff --git a/Interaction/Style/vtkInteractorStyleUser.h b/Interaction/Style/vtkInteractorStyleUser.h
index 60cddb1730775ba852186fdce0269c19de262a17..5bef04a3b832a9a9b9ce3b18d2325d61e4efb6bd 100644
--- a/Interaction/Style/vtkInteractorStyleUser.h
+++ b/Interaction/Style/vtkInteractorStyleUser.h
@@ -44,7 +44,7 @@ class VTKINTERACTIONSTYLE_EXPORT vtkInteractorStyleUser : public vtkInteractorSt
public:
static vtkInteractorStyleUser *New();
vtkTypeMacro(vtkInteractorStyleUser,vtkInteractorStyle);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -101,42 +101,42 @@ public:
/**
* Generic event bindings
*/
- void OnMouseMove() VTK_OVERRIDE;
- void OnLeftButtonDown() VTK_OVERRIDE;
- void OnLeftButtonUp() VTK_OVERRIDE;
- void OnMiddleButtonDown() VTK_OVERRIDE;
- void OnMiddleButtonUp() VTK_OVERRIDE;
- void OnRightButtonDown() VTK_OVERRIDE;
- void OnRightButtonUp() VTK_OVERRIDE;
- void OnMouseWheelForward() VTK_OVERRIDE;
- void OnMouseWheelBackward() VTK_OVERRIDE;
+ void OnMouseMove() override;
+ void OnLeftButtonDown() override;
+ void OnLeftButtonUp() override;
+ void OnMiddleButtonDown() override;
+ void OnMiddleButtonUp() override;
+ void OnRightButtonDown() override;
+ void OnRightButtonUp() override;
+ void OnMouseWheelForward() override;
+ void OnMouseWheelBackward() override;
//@}
//@{
/**
* Keyboard functions
*/
- void OnChar() VTK_OVERRIDE;
- void OnKeyPress() VTK_OVERRIDE;
- void OnKeyRelease() VTK_OVERRIDE;
+ void OnChar() override;
+ void OnKeyPress() override;
+ void OnKeyRelease() override;
//@}
//@{
/**
* These are more esoteric events, but are useful in some cases.
*/
- void OnExpose() VTK_OVERRIDE;
- void OnConfigure() VTK_OVERRIDE;
- void OnEnter() VTK_OVERRIDE;
- void OnLeave() VTK_OVERRIDE;
+ void OnExpose() override;
+ void OnConfigure() override;
+ void OnEnter() override;
+ void OnLeave() override;
//@}
- void OnTimer() VTK_OVERRIDE;
+ void OnTimer() override;
protected:
vtkInteractorStyleUser();
- ~vtkInteractorStyleUser() VTK_OVERRIDE;
+ ~vtkInteractorStyleUser() override;
int LastPos[2];
int OldPos[2];
diff --git a/Interaction/Style/vtkParallelCoordinatesInteractorStyle.h b/Interaction/Style/vtkParallelCoordinatesInteractorStyle.h
index 55fd6cbc01ef0adbafdecd231318c5a1c62c300b..48bf3a4fe43fa4d3bb0ee392536a66b6d9373ebe 100644
--- a/Interaction/Style/vtkParallelCoordinatesInteractorStyle.h
+++ b/Interaction/Style/vtkParallelCoordinatesInteractorStyle.h
@@ -55,7 +55,7 @@ class VTKINTERACTIONSTYLE_EXPORT vtkParallelCoordinatesInteractorStyle : public
public:
static vtkParallelCoordinatesInteractorStyle *New();
vtkTypeMacro(vtkParallelCoordinatesInteractorStyle, vtkInteractorStyleTrackballCamera);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
enum {
INTERACT_HOVER=0,
@@ -87,14 +87,14 @@ public:
* Event bindings controlling the effects of pressing mouse buttons
* or moving the mouse.
*/
- void OnMouseMove() VTK_OVERRIDE;
- void OnLeftButtonDown() VTK_OVERRIDE;
- void OnLeftButtonUp() VTK_OVERRIDE;
- void OnMiddleButtonDown() VTK_OVERRIDE;
- void OnMiddleButtonUp() VTK_OVERRIDE;
- void OnRightButtonDown() VTK_OVERRIDE;
- void OnRightButtonUp() VTK_OVERRIDE;
- void OnLeave() VTK_OVERRIDE;
+ void OnMouseMove() override;
+ void OnLeftButtonDown() override;
+ void OnLeftButtonUp() override;
+ void OnMiddleButtonDown() override;
+ void OnMiddleButtonUp() override;
+ void OnRightButtonDown() override;
+ void OnRightButtonUp() override;
+ void OnLeave() override;
//@}
//@{
@@ -104,25 +104,25 @@ public:
//@}
//@{
- void StartZoom() VTK_OVERRIDE;
- void Zoom() VTK_OVERRIDE;
- void EndZoom() VTK_OVERRIDE;
+ void StartZoom() override;
+ void Zoom() override;
+ void EndZoom() override;
//@}
//@{
- void StartPan() VTK_OVERRIDE;
- void Pan() VTK_OVERRIDE;
- void EndPan() VTK_OVERRIDE;
+ void StartPan() override;
+ void Pan() override;
+ void EndPan() override;
//@}
/**
* Override the "fly-to" (f keypress) for images.
*/
- void OnChar() VTK_OVERRIDE;
+ void OnChar() override;
protected:
vtkParallelCoordinatesInteractorStyle();
- ~vtkParallelCoordinatesInteractorStyle() VTK_OVERRIDE;
+ ~vtkParallelCoordinatesInteractorStyle() override;
int CursorStartPosition[2];
int CursorCurrentPosition[2];
diff --git a/Interaction/Widgets/Testing/Cxx/BoxWidget.cxx b/Interaction/Widgets/Testing/Cxx/BoxWidget.cxx
index f5ceaed2e899078febf30207e608dcce39946b73..edf98f9528f67e06fce9229cc1143bc7343a58c4 100644
--- a/Interaction/Widgets/Testing/Cxx/BoxWidget.cxx
+++ b/Interaction/Widgets/Testing/Cxx/BoxWidget.cxx
@@ -34,7 +34,7 @@ class vtkBWCallback : public vtkCommand
public:
static vtkBWCallback *New()
{ return new vtkBWCallback; }
- void Execute(vtkObject *caller, unsigned long, void*) VTK_OVERRIDE
+ void Execute(vtkObject *caller, unsigned long, void*) override
{
vtkBoxWidget *boxWidget = reinterpret_cast<vtkBoxWidget*>(caller);
boxWidget->GetTransform(this->Transform);
diff --git a/Interaction/Widgets/Testing/Cxx/BoxWidget2.cxx b/Interaction/Widgets/Testing/Cxx/BoxWidget2.cxx
index 3ef97f7d6b7895f1a11dd29470c3ef96d815e4cc..cc7fbb09d2ed6fd85cc789a57c0a4732c6499b74 100644
--- a/Interaction/Widgets/Testing/Cxx/BoxWidget2.cxx
+++ b/Interaction/Widgets/Testing/Cxx/BoxWidget2.cxx
@@ -35,7 +35,7 @@ class vtkBWCallback2 : public vtkCommand
public:
static vtkBWCallback2 *New()
{ return new vtkBWCallback2; }
- void Execute(vtkObject *caller, unsigned long, void*) VTK_OVERRIDE
+ void Execute(vtkObject *caller, unsigned long, void*) override
{
vtkBoxWidget2 *boxWidget =
reinterpret_cast<vtkBoxWidget2*>(caller);
diff --git a/Interaction/Widgets/Testing/Cxx/ImagePlaneWidget.cxx b/Interaction/Widgets/Testing/Cxx/ImagePlaneWidget.cxx
index a636516e83069563c9fc65e71f7c9d3c42427a17..51ff19d35a769394da79faf5f136636251eddf5b 100644
--- a/Interaction/Widgets/Testing/Cxx/ImagePlaneWidget.cxx
+++ b/Interaction/Widgets/Testing/Cxx/ImagePlaneWidget.cxx
@@ -338,7 +338,7 @@ public:
{ return new vtkWidgetWindowLevelCallback; }
void Execute( vtkObject *caller, unsigned long vtkNotUsed( event ),
- void *callData ) VTK_OVERRIDE
+ void *callData ) override
{
vtkImagePlaneWidget* self =
reinterpret_cast< vtkImagePlaneWidget* >( caller );
diff --git a/Interaction/Widgets/Testing/Cxx/TestAffineWidget.cxx b/Interaction/Widgets/Testing/Cxx/TestAffineWidget.cxx
index 2c94f6ff02f53688afdb11d692e81b894f52bdd7..68c13149852f650148450a4b9fc98b665af65789 100644
--- a/Interaction/Widgets/Testing/Cxx/TestAffineWidget.cxx
+++ b/Interaction/Widgets/Testing/Cxx/TestAffineWidget.cxx
@@ -43,12 +43,12 @@ class vtkAffineCallback : public vtkCommand
public:
static vtkAffineCallback *New()
{ return new vtkAffineCallback; }
- void Execute(vtkObject *caller, unsigned long, void*) VTK_OVERRIDE;
+ void Execute(vtkObject *caller, unsigned long, void*) override;
vtkAffineCallback():ImageActor(nullptr),AffineRep(nullptr)
{
this->Transform = vtkTransform::New();
}
- ~vtkAffineCallback() VTK_OVERRIDE
+ ~vtkAffineCallback() override
{
this->Transform->Delete();
}
diff --git a/Interaction/Widgets/Testing/Cxx/TestAngleWidget2D.cxx b/Interaction/Widgets/Testing/Cxx/TestAngleWidget2D.cxx
index f99c9076eaf1153db753f02c337b6634e000893b..065efd70351d244078cb709b392ab52975d927eb 100644
--- a/Interaction/Widgets/Testing/Cxx/TestAngleWidget2D.cxx
+++ b/Interaction/Widgets/Testing/Cxx/TestAngleWidget2D.cxx
@@ -366,7 +366,7 @@ class vtkAngleCallback : public vtkCommand
public:
static vtkAngleCallback *New()
{ return new vtkAngleCallback; }
- void Execute(vtkObject*, unsigned long eid, void*) VTK_OVERRIDE
+ void Execute(vtkObject*, unsigned long eid, void*) override
{
if ( eid == vtkCommand::PlacePointEvent )
{
diff --git a/Interaction/Widgets/Testing/Cxx/TestAngleWidget3D.cxx b/Interaction/Widgets/Testing/Cxx/TestAngleWidget3D.cxx
index abdd5abb93737b32bbf5e45eec0b66fabe2d8efa..6aab8a56b167cc2e34bf373846abe5ca7a4b9297 100644
--- a/Interaction/Widgets/Testing/Cxx/TestAngleWidget3D.cxx
+++ b/Interaction/Widgets/Testing/Cxx/TestAngleWidget3D.cxx
@@ -644,7 +644,7 @@ class vtkAngleCallback : public vtkCommand
public:
static vtkAngleCallback *New()
{ return new vtkAngleCallback; }
- void Execute(vtkObject*, unsigned long eid, void*) VTK_OVERRIDE
+ void Execute(vtkObject*, unsigned long eid, void*) override
{
if ( eid == vtkCommand::PlacePointEvent )
{
diff --git a/Interaction/Widgets/Testing/Cxx/TestBalloonWidget.cxx b/Interaction/Widgets/Testing/Cxx/TestBalloonWidget.cxx
index e2f52fd9e9debaabcac4d58dcde46af664ae3ad1..aa09f9804eb6774de89f0365bf841f86626957c4 100644
--- a/Interaction/Widgets/Testing/Cxx/TestBalloonWidget.cxx
+++ b/Interaction/Widgets/Testing/Cxx/TestBalloonWidget.cxx
@@ -39,7 +39,7 @@ class vtkBalloonCallback : public vtkCommand
public:
static vtkBalloonCallback *New()
{ return new vtkBalloonCallback; }
- void Execute(vtkObject *caller, unsigned long, void*) VTK_OVERRIDE
+ void Execute(vtkObject *caller, unsigned long, void*) override
{
vtkBalloonWidget *balloonWidget = reinterpret_cast<vtkBalloonWidget*>(caller);
if ( balloonWidget->GetCurrentProp() != nullptr )
@@ -57,7 +57,7 @@ class vtkBalloonPickCallback : public vtkCommand
public:
static vtkBalloonPickCallback *New()
{ return new vtkBalloonPickCallback; }
- void Execute(vtkObject *caller, unsigned long, void*) VTK_OVERRIDE
+ void Execute(vtkObject *caller, unsigned long, void*) override
{
vtkPropPicker *picker = reinterpret_cast<vtkPropPicker*>(caller);
vtkProp *prop = picker->GetViewProp();
diff --git a/Interaction/Widgets/Testing/Cxx/TestBiDimensionalWidget.cxx b/Interaction/Widgets/Testing/Cxx/TestBiDimensionalWidget.cxx
index 1108688704bc0b2935a7e3161a84ec4c54446b31..80ad881900db67486e2d533bd42b94b2a1d9fb1d 100644
--- a/Interaction/Widgets/Testing/Cxx/TestBiDimensionalWidget.cxx
+++ b/Interaction/Widgets/Testing/Cxx/TestBiDimensionalWidget.cxx
@@ -1089,7 +1089,7 @@ class vtkBiDimensionalCallback : public vtkCommand
public:
static vtkBiDimensionalCallback *New()
{ return new vtkBiDimensionalCallback; }
- void Execute(vtkObject *, unsigned long, void*) VTK_OVERRIDE
+ void Execute(vtkObject *, unsigned long, void*) override
{
std::cout << "End interaction event\n" << std::flush;
}
diff --git a/Interaction/Widgets/Testing/Cxx/TestBrokenLineWidget.cxx b/Interaction/Widgets/Testing/Cxx/TestBrokenLineWidget.cxx
index d51c38995efea7b4decddcfe75f77d4b780837ea..a8d559ba198804ff3d30e38568de88c58010b79e 100644
--- a/Interaction/Widgets/Testing/Cxx/TestBrokenLineWidget.cxx
+++ b/Interaction/Widgets/Testing/Cxx/TestBrokenLineWidget.cxx
@@ -32,7 +32,7 @@ class vtkBLWCallback : public vtkCommand
public:
static vtkBLWCallback *New()
{ return new vtkBLWCallback; }
- void Execute( vtkObject *caller, unsigned long, void* ) VTK_OVERRIDE
+ void Execute( vtkObject *caller, unsigned long, void* ) override
{
// Retrieve polydata line
vtkBrokenLineWidget *line = reinterpret_cast<vtkBrokenLineWidget*>( caller );
diff --git a/Interaction/Widgets/Testing/Cxx/TestCenteredSliderWidget2D.cxx b/Interaction/Widgets/Testing/Cxx/TestCenteredSliderWidget2D.cxx
index 8c77e501046e0abe725880bb3cbe4e974ff4f2c6..5928393c3ca7b4e42b96e049144f4ceaab96460c 100644
--- a/Interaction/Widgets/Testing/Cxx/TestCenteredSliderWidget2D.cxx
+++ b/Interaction/Widgets/Testing/Cxx/TestCenteredSliderWidget2D.cxx
@@ -45,7 +45,7 @@ class vtkCenteredSlider2DCallback : public vtkCommand
public:
static vtkCenteredSlider2DCallback *New()
{ return new vtkCenteredSlider2DCallback; }
- void Execute(vtkObject *caller, unsigned long, void*) VTK_OVERRIDE
+ void Execute(vtkObject *caller, unsigned long, void*) override
{
vtkCenteredSliderWidget *sliderWidget =
reinterpret_cast<vtkCenteredSliderWidget*>(caller);
diff --git a/Interaction/Widgets/Testing/Cxx/TestDistanceWidget.cxx b/Interaction/Widgets/Testing/Cxx/TestDistanceWidget.cxx
index 6ce6cc6cf8c9d63a9c5348dfc7ce9c066f389a82..6536fe3c68cb0700f73318aef115650daf2e47f9 100644
--- a/Interaction/Widgets/Testing/Cxx/TestDistanceWidget.cxx
+++ b/Interaction/Widgets/Testing/Cxx/TestDistanceWidget.cxx
@@ -814,7 +814,7 @@ class vtkDistanceCallback : public vtkCommand
public:
static vtkDistanceCallback *New()
{ return new vtkDistanceCallback; }
- void Execute(vtkObject *caller, unsigned long, void*) VTK_OVERRIDE;
+ void Execute(vtkObject *caller, unsigned long, void*) override;
vtkDistanceCallback():Renderer(nullptr),RenderWindow(nullptr),DistanceWidget(nullptr),Distance(nullptr) {}
vtkRenderer *Renderer;
vtkRenderWindow *RenderWindow;
diff --git a/Interaction/Widgets/Testing/Cxx/TestDistanceWidget3D.cxx b/Interaction/Widgets/Testing/Cxx/TestDistanceWidget3D.cxx
index 6f4f9290fc7638e99d1766be650e39beb39eca2b..20732fb4169464487adb589c873bd25d4eb666fc 100644
--- a/Interaction/Widgets/Testing/Cxx/TestDistanceWidget3D.cxx
+++ b/Interaction/Widgets/Testing/Cxx/TestDistanceWidget3D.cxx
@@ -817,7 +817,7 @@ class vtkDistanceWidget3DCallback : public vtkCommand
public:
static vtkDistanceWidget3DCallback *New()
{ return new vtkDistanceWidget3DCallback; }
- void Execute(vtkObject *caller, unsigned long, void*) VTK_OVERRIDE;
+ void Execute(vtkObject *caller, unsigned long, void*) override;
vtkDistanceWidget3DCallback():Renderer(nullptr),RenderWindow(nullptr),DistanceWidget(nullptr),Distance(nullptr) {}
vtkRenderer *Renderer;
vtkRenderWindow *RenderWindow;
diff --git a/Interaction/Widgets/Testing/Cxx/TestFixedSizeHandleRepresentation3D.cxx b/Interaction/Widgets/Testing/Cxx/TestFixedSizeHandleRepresentation3D.cxx
index 4e8eee276d5705a9aa130f53bfd2e1cef3296ad9..1dad3127d21e6d377579097bd2a038ce19db98cb 100644
--- a/Interaction/Widgets/Testing/Cxx/TestFixedSizeHandleRepresentation3D.cxx
+++ b/Interaction/Widgets/Testing/Cxx/TestFixedSizeHandleRepresentation3D.cxx
@@ -563,7 +563,7 @@ class vtkHandleCallback : public vtkCommand
public:
static vtkHandleCallback *New()
{ return new vtkHandleCallback; }
- void Execute(vtkObject*, unsigned long eid, void*) VTK_OVERRIDE
+ void Execute(vtkObject*, unsigned long eid, void*) override
{
if ( eid == vtkCommand::InteractionEvent )
{
diff --git a/Interaction/Widgets/Testing/Cxx/TestHandleWidget.cxx b/Interaction/Widgets/Testing/Cxx/TestHandleWidget.cxx
index 88eb9360080213e3d3292f017164e5d21c2f2c03..3e8f6f2991dfd901c9e1a5445c75bb172384beba 100644
--- a/Interaction/Widgets/Testing/Cxx/TestHandleWidget.cxx
+++ b/Interaction/Widgets/Testing/Cxx/TestHandleWidget.cxx
@@ -55,7 +55,7 @@ class vtkTIPW3Callback : public vtkCommand
public:
static vtkTIPW3Callback *New()
{ return new vtkTIPW3Callback; }
- void Execute(vtkObject *caller, unsigned long, void*) VTK_OVERRIDE
+ void Execute(vtkObject *caller, unsigned long, void*) override
{
vtkImplicitPlaneWidget2 *planeWidget =
reinterpret_cast<vtkImplicitPlaneWidget2*>(caller);
@@ -66,7 +66,7 @@ public:
}
vtkTIPW3Callback() : Actor(nullptr) { this->Plane = vtkPlane::New(); }
- ~vtkTIPW3Callback() VTK_OVERRIDE { this->Plane->Delete(); }
+ ~vtkTIPW3Callback() override { this->Plane->Delete(); }
vtkPlane *Plane;
vtkActor *Actor;
diff --git a/Interaction/Widgets/Testing/Cxx/TestHandleWidget2D.cxx b/Interaction/Widgets/Testing/Cxx/TestHandleWidget2D.cxx
index feeb9ce22e6c83f9dfe9f48bc5b96f6d78939df4..dbee40ced697b1496b7c1f85584e78f32eea8943 100644
--- a/Interaction/Widgets/Testing/Cxx/TestHandleWidget2D.cxx
+++ b/Interaction/Widgets/Testing/Cxx/TestHandleWidget2D.cxx
@@ -38,7 +38,7 @@ class vtkHandle2Callback : public vtkCommand
public:
static vtkHandle2Callback *New()
{ return new vtkHandle2Callback; }
- void Execute(vtkObject *caller, unsigned long, void*) VTK_OVERRIDE
+ void Execute(vtkObject *caller, unsigned long, void*) override
{
vtkHandleWidget *handleWidget =
reinterpret_cast<vtkHandleWidget*>(caller);
diff --git a/Interaction/Widgets/Testing/Cxx/TestImageActorContourWidget.cxx b/Interaction/Widgets/Testing/Cxx/TestImageActorContourWidget.cxx
index 7a1bcc7e6ea051c882afc95aed08bbf8c0bf677b..5cc91f90ba31ffb5f0c64ac1d233bca6141dd772 100644
--- a/Interaction/Widgets/Testing/Cxx/TestImageActorContourWidget.cxx
+++ b/Interaction/Widgets/Testing/Cxx/TestImageActorContourWidget.cxx
@@ -803,7 +803,7 @@ public:
{ return new vtkSliderCallback2; }
void SetImageViewer(vtkImageViewer2 *viewer)
{ this->Viewer = viewer; }
- void Execute(vtkObject *caller, unsigned long , void* ) VTK_OVERRIDE
+ void Execute(vtkObject *caller, unsigned long , void* ) override
{
vtkSliderWidget *slider = static_cast<vtkSliderWidget *>(caller);
vtkSliderRepresentation *sliderRepres = static_cast<vtkSliderRepresentation *>(slider->GetRepresentation());
diff --git a/Interaction/Widgets/Testing/Cxx/TestImageTracerWidget.cxx b/Interaction/Widgets/Testing/Cxx/TestImageTracerWidget.cxx
index 966c7e34849c3a23460f60a087b69e5e2cb66595..911bd7a5c828eca46d7c71c514758e5277778913 100644
--- a/Interaction/Widgets/Testing/Cxx/TestImageTracerWidget.cxx
+++ b/Interaction/Widgets/Testing/Cxx/TestImageTracerWidget.cxx
@@ -256,7 +256,7 @@ class vtkITWCallback : public vtkCommand
public:
static vtkITWCallback *New()
{ return new vtkITWCallback; }
- void Execute(vtkObject *caller, unsigned long, void*) VTK_OVERRIDE
+ void Execute(vtkObject *caller, unsigned long, void*) override
{
vtkImageTracerWidget *tracerWidget =
reinterpret_cast<vtkImageTracerWidget*>(caller);
@@ -306,7 +306,7 @@ class vtkSW2Callback : public vtkCommand
public:
static vtkSW2Callback *New()
{ return new vtkSW2Callback; }
- void Execute(vtkObject *caller, unsigned long, void*) VTK_OVERRIDE
+ void Execute(vtkObject *caller, unsigned long, void*) override
{
vtkSplineWidget *splineWidget =
reinterpret_cast<vtkSplineWidget*>(caller);
diff --git a/Interaction/Widgets/Testing/Cxx/TestImplicitCylinderWidget.cxx b/Interaction/Widgets/Testing/Cxx/TestImplicitCylinderWidget.cxx
index 1fd666840baa797168d7331691ee4911eb1a6586..ec3904e268a37d929a60f0638399ee18e0510c4d 100644
--- a/Interaction/Widgets/Testing/Cxx/TestImplicitCylinderWidget.cxx
+++ b/Interaction/Widgets/Testing/Cxx/TestImplicitCylinderWidget.cxx
@@ -256,7 +256,7 @@ class vtkTICWCallback : public vtkCommand
public:
static vtkTICWCallback *New()
{ return new vtkTICWCallback; }
- void Execute(vtkObject *caller, unsigned long, void*) VTK_OVERRIDE
+ void Execute(vtkObject *caller, unsigned long, void*) override
{
vtkImplicitCylinderWidget *cylWidget =
reinterpret_cast<vtkImplicitCylinderWidget*>(caller);
diff --git a/Interaction/Widgets/Testing/Cxx/TestImplicitCylinderWidget2.cxx b/Interaction/Widgets/Testing/Cxx/TestImplicitCylinderWidget2.cxx
index 59e1145592115703e40fd26ed3429685b5684a89..ec05137e1fbb60459839353476bbeddfbc1eb3c0 100644
--- a/Interaction/Widgets/Testing/Cxx/TestImplicitCylinderWidget2.cxx
+++ b/Interaction/Widgets/Testing/Cxx/TestImplicitCylinderWidget2.cxx
@@ -284,7 +284,7 @@ public:
return new vtkTICWCallback;
}
- void Execute(vtkObject *caller, unsigned long, void*) VTK_OVERRIDE
+ void Execute(vtkObject *caller, unsigned long, void*) override
{
vtkImplicitCylinderWidget *cylWidget =
reinterpret_cast<vtkImplicitCylinderWidget*>(caller);
diff --git a/Interaction/Widgets/Testing/Cxx/TestImplicitPlaneWidget.cxx b/Interaction/Widgets/Testing/Cxx/TestImplicitPlaneWidget.cxx
index 7a956fad768ea4c504213f96ace63fe05aae866a..f9483724f54b307d082676a7a7a2d50747b671e8 100644
--- a/Interaction/Widgets/Testing/Cxx/TestImplicitPlaneWidget.cxx
+++ b/Interaction/Widgets/Testing/Cxx/TestImplicitPlaneWidget.cxx
@@ -420,7 +420,7 @@ class vtkTIPWCallback : public vtkCommand
public:
static vtkTIPWCallback *New()
{ return new vtkTIPWCallback; }
- void Execute(vtkObject *caller, unsigned long, void*) VTK_OVERRIDE
+ void Execute(vtkObject *caller, unsigned long, void*) override
{
vtkImplicitPlaneWidget *planeWidget =
reinterpret_cast<vtkImplicitPlaneWidget*>(caller);
diff --git a/Interaction/Widgets/Testing/Cxx/TestImplicitPlaneWidget2.cxx b/Interaction/Widgets/Testing/Cxx/TestImplicitPlaneWidget2.cxx
index 464217b665e098b4df55014f2fc4c067f5ea32a2..bf3aceb763fded3729af37c873983a7364ca2c12 100644
--- a/Interaction/Widgets/Testing/Cxx/TestImplicitPlaneWidget2.cxx
+++ b/Interaction/Widgets/Testing/Cxx/TestImplicitPlaneWidget2.cxx
@@ -421,7 +421,7 @@ class vtkTIPW2Callback : public vtkCommand
public:
static vtkTIPW2Callback *New()
{ return new vtkTIPW2Callback; }
- void Execute(vtkObject *caller, unsigned long, void*) VTK_OVERRIDE
+ void Execute(vtkObject *caller, unsigned long, void*) override
{
vtkImplicitPlaneWidget2 *planeWidget =
reinterpret_cast<vtkImplicitPlaneWidget2*>(caller);
diff --git a/Interaction/Widgets/Testing/Cxx/TestImplicitPlaneWidget2LockNormalToCamera.cxx b/Interaction/Widgets/Testing/Cxx/TestImplicitPlaneWidget2LockNormalToCamera.cxx
index df6f380cba12c0f4d2fdc06d2cae0139bac1ed45..463e8bfd6a07461251de31ccaf80b4ffceac4a41 100644
--- a/Interaction/Widgets/Testing/Cxx/TestImplicitPlaneWidget2LockNormalToCamera.cxx
+++ b/Interaction/Widgets/Testing/Cxx/TestImplicitPlaneWidget2LockNormalToCamera.cxx
@@ -416,7 +416,7 @@ class vtkTIPW2Callback : public vtkCommand
public:
static vtkTIPW2Callback *New()
{ return new vtkTIPW2Callback; }
- void Execute(vtkObject *caller, unsigned long, void*) VTK_OVERRIDE
+ void Execute(vtkObject *caller, unsigned long, void*) override
{
vtkImplicitPlaneWidget2 *planeWidget =
reinterpret_cast<vtkImplicitPlaneWidget2*>(caller);
@@ -441,7 +441,7 @@ public:
{
return new vtkEnableSlaveCallback;
}
- void Execute(vtkObject *caller, unsigned long, void*) VTK_OVERRIDE
+ void Execute(vtkObject *caller, unsigned long, void*) override
{
vtkRenderWindowInteractor *iren =
static_cast<vtkRenderWindowInteractor*>(caller);
diff --git a/Interaction/Widgets/Testing/Cxx/TestImplicitPlaneWidget2b.cxx b/Interaction/Widgets/Testing/Cxx/TestImplicitPlaneWidget2b.cxx
index d10970e185936f357d8f89e70327582253fd6c64..88fe14a0085ee2264ca2edcceddb39667af4591f 100644
--- a/Interaction/Widgets/Testing/Cxx/TestImplicitPlaneWidget2b.cxx
+++ b/Interaction/Widgets/Testing/Cxx/TestImplicitPlaneWidget2b.cxx
@@ -49,7 +49,7 @@ public:
}
void Execute(vtkObject *caller, unsigned long eventId,
- void *callData) VTK_OVERRIDE
+ void *callData) override
{
if (vtkCommand::TimerEvent == eventId)
{
diff --git a/Interaction/Widgets/Testing/Cxx/TestImplicitPlaneWidget3.cxx b/Interaction/Widgets/Testing/Cxx/TestImplicitPlaneWidget3.cxx
index 0739c595d3a24a063fdf7a5b59e042b9f197c6ef..7af14db59c94bb25916598ea2265a73fe245a591 100644
--- a/Interaction/Widgets/Testing/Cxx/TestImplicitPlaneWidget3.cxx
+++ b/Interaction/Widgets/Testing/Cxx/TestImplicitPlaneWidget3.cxx
@@ -152,7 +152,7 @@ class vtkTIPW2Callback : public vtkCommand
public:
static vtkTIPW2Callback *New()
{ return new vtkTIPW2Callback; }
- void Execute(vtkObject *caller, unsigned long, void*) VTK_OVERRIDE
+ void Execute(vtkObject *caller, unsigned long, void*) override
{
vtkImplicitPlaneWidget2 *planeWidget =
reinterpret_cast<vtkImplicitPlaneWidget2*>(caller);
diff --git a/Interaction/Widgets/Testing/Cxx/TestLineWidget.cxx b/Interaction/Widgets/Testing/Cxx/TestLineWidget.cxx
index a1c9e70cc52189e199391408ce08e464dfb88b80..9835086a04be4438d14a818305a9eefa77954c14 100644
--- a/Interaction/Widgets/Testing/Cxx/TestLineWidget.cxx
+++ b/Interaction/Widgets/Testing/Cxx/TestLineWidget.cxx
@@ -233,7 +233,7 @@ class vtkLWCallback : public vtkCommand
public:
static vtkLWCallback *New()
{ return new vtkLWCallback; }
- void Execute(vtkObject *caller, unsigned long, void*) VTK_OVERRIDE
+ void Execute(vtkObject *caller, unsigned long, void*) override
{
vtkLineWidget *lineWidget = reinterpret_cast<vtkLineWidget*>(caller);
lineWidget->GetPolyData(this->PolyData);
diff --git a/Interaction/Widgets/Testing/Cxx/TestLineWidget2.cxx b/Interaction/Widgets/Testing/Cxx/TestLineWidget2.cxx
index 5f51044aeaeabe83beff50db86c0c20e5fb53d93..40d459086e2156d1f289c1c302438918128fe62f 100644
--- a/Interaction/Widgets/Testing/Cxx/TestLineWidget2.cxx
+++ b/Interaction/Widgets/Testing/Cxx/TestLineWidget2.cxx
@@ -46,7 +46,7 @@ class vtkLW2Callback : public vtkCommand
public:
static vtkLW2Callback *New()
{ return new vtkLW2Callback; }
- void Execute(vtkObject *caller, unsigned long, void*) VTK_OVERRIDE
+ void Execute(vtkObject *caller, unsigned long, void*) override
{
vtkLineWidget2 *lineWidget = reinterpret_cast<vtkLineWidget2*>(caller);
vtkLineRepresentation *rep =
diff --git a/Interaction/Widgets/Testing/Cxx/TestOrthoPlanes.cxx b/Interaction/Widgets/Testing/Cxx/TestOrthoPlanes.cxx
index 192e438478a91b5268d589fa7c410888fe381a0e..1748edfb84e4fd2199358bffeb02f701034bd563 100644
--- a/Interaction/Widgets/Testing/Cxx/TestOrthoPlanes.cxx
+++ b/Interaction/Widgets/Testing/Cxx/TestOrthoPlanes.cxx
@@ -339,7 +339,7 @@ public:
{ return new vtkOrthoPlanesCallback; }
void Execute( vtkObject *caller, unsigned long vtkNotUsed( event ),
- void *callData ) VTK_OVERRIDE
+ void *callData ) override
{
vtkImagePlaneWidget* self =
reinterpret_cast< vtkImagePlaneWidget* >( caller );
diff --git a/Interaction/Widgets/Testing/Cxx/TestPickingManagerSeedWidget.cxx b/Interaction/Widgets/Testing/Cxx/TestPickingManagerSeedWidget.cxx
index e417e7ec3f1b8a1eed5d5142dc9a00cff4fb78a6..ae36d6576ef0193dd7e8f12f491273e06299ef6b 100644
--- a/Interaction/Widgets/Testing/Cxx/TestPickingManagerSeedWidget.cxx
+++ b/Interaction/Widgets/Testing/Cxx/TestPickingManagerSeedWidget.cxx
@@ -468,7 +468,7 @@ public:
static vtkPickingManagerCallback *New()
{return new vtkPickingManagerCallback;}
- void Execute(vtkObject *caller, unsigned long, void*) VTK_OVERRIDE
+ void Execute(vtkObject *caller, unsigned long, void*) override
{
vtkRenderWindowInteractor *iren =
static_cast<vtkRenderWindowInteractor*>(caller);
@@ -517,7 +517,7 @@ public:
static vtkPMSCubeCallback *New()
{ return new vtkPMSCubeCallback; }
- void Execute(vtkObject *caller, unsigned long, void*) VTK_OVERRIDE
+ void Execute(vtkObject *caller, unsigned long, void*) override
{
vtkRenderWindowInteractor *iren =
static_cast<vtkRenderWindowInteractor*>(caller);
@@ -570,7 +570,7 @@ public:
this->logTime = vtkTimerLog::New();
}
- ~vtkPMSRecordPerfCallback() VTK_OVERRIDE
+ ~vtkPMSRecordPerfCallback() override
{
if (this->performanceReport.is_open())
{
@@ -581,7 +581,7 @@ public:
this->logTime->Delete();
}
- void Execute(vtkObject* vtkNotUsed(caller), unsigned long, void*) VTK_OVERRIDE
+ void Execute(vtkObject* vtkNotUsed(caller), unsigned long, void*) override
{
// vtkRenderWindowInteractor *iren =
// static_cast<vtkRenderWindowInteractor*>(caller);
diff --git a/Interaction/Widgets/Testing/Cxx/TestPickingManagerWidgets.cxx b/Interaction/Widgets/Testing/Cxx/TestPickingManagerWidgets.cxx
index 4314555c6f8777df6ea01a6e3bb9f9df5fb0fdfe..44f12bf5a7f1c52eb05b116b57317577f46a6c73 100644
--- a/Interaction/Widgets/Testing/Cxx/TestPickingManagerWidgets.cxx
+++ b/Interaction/Widgets/Testing/Cxx/TestPickingManagerWidgets.cxx
@@ -76,7 +76,7 @@ class vtkBalloonPickCallback : public vtkCommand
{
public:
static vtkBalloonPickCallback* New() { return new vtkBalloonPickCallback; }
- void Execute(vtkObject* caller, unsigned long, void*) VTK_OVERRIDE
+ void Execute(vtkObject* caller, unsigned long, void*) override
{
vtkPropPicker* picker = reinterpret_cast<vtkPropPicker*>(caller);
vtkProp* prop = picker->GetViewProp();
@@ -98,7 +98,7 @@ class vtkTIPW2Callback : public vtkCommand
public:
static vtkTIPW2Callback *New()
{ return new vtkTIPW2Callback; }
- void Execute(vtkObject *caller, unsigned long, void*) VTK_OVERRIDE
+ void Execute(vtkObject *caller, unsigned long, void*) override
{
vtkImplicitPlaneWidget2 *planeWidget =
reinterpret_cast<vtkImplicitPlaneWidget2*>(caller);
@@ -124,7 +124,7 @@ public:
static vtkEnableManagerCallback *New()
{return new vtkEnableManagerCallback;}
- void Execute(vtkObject *caller, unsigned long, void*) VTK_OVERRIDE
+ void Execute(vtkObject *caller, unsigned long, void*) override
{
vtkRenderWindowInteractor *iren =
static_cast<vtkRenderWindowInteractor*>(caller);
diff --git a/Interaction/Widgets/Testing/Cxx/TestPlaneWidget.cxx b/Interaction/Widgets/Testing/Cxx/TestPlaneWidget.cxx
index 0c29a183c29d1392bc8670fad91f7a5200095cdf..6eb5c8c567024f1ccd64b3540d468ed7f42eb16c 100644
--- a/Interaction/Widgets/Testing/Cxx/TestPlaneWidget.cxx
+++ b/Interaction/Widgets/Testing/Cxx/TestPlaneWidget.cxx
@@ -395,7 +395,7 @@ class vtkTPWCallback : public vtkCommand
public:
static vtkTPWCallback *New()
{ return new vtkTPWCallback; }
- void Execute(vtkObject *caller, unsigned long, void*) VTK_OVERRIDE
+ void Execute(vtkObject *caller, unsigned long, void*) override
{
vtkPlaneWidget *planeWidget = reinterpret_cast<vtkPlaneWidget*>(caller);
planeWidget->GetPolyData(this->PolyData);
diff --git a/Interaction/Widgets/Testing/Cxx/TestPlaybackWidget.cxx b/Interaction/Widgets/Testing/Cxx/TestPlaybackWidget.cxx
index f094dfdd8697cddebb567f27c468d2a76d95c1c3..9baf0d09d4ad84cf9f287414c746af8f9b4d7b0b 100644
--- a/Interaction/Widgets/Testing/Cxx/TestPlaybackWidget.cxx
+++ b/Interaction/Widgets/Testing/Cxx/TestPlaybackWidget.cxx
@@ -33,12 +33,12 @@ class vtkSubclassPlaybackRepresentation : public vtkPlaybackRepresentation
{
public:
static vtkSubclassPlaybackRepresentation *New() {return new vtkSubclassPlaybackRepresentation;}
- void Play() VTK_OVERRIDE {std::cout << "play\n";}
- void Stop() VTK_OVERRIDE {std::cout << "stop\n";}
- void ForwardOneFrame() VTK_OVERRIDE {std::cout << "forward one frame\n";}
- void BackwardOneFrame() VTK_OVERRIDE {std::cout << "backward one frame\n";}
- void JumpToBeginning() VTK_OVERRIDE {std::cout << "jump to beginning\n";}
- void JumpToEnd() VTK_OVERRIDE {std::cout << "jump to end\n";}
+ void Play() override {std::cout << "play\n";}
+ void Stop() override {std::cout << "stop\n";}
+ void ForwardOneFrame() override {std::cout << "forward one frame\n";}
+ void BackwardOneFrame() override {std::cout << "backward one frame\n";}
+ void JumpToBeginning() override {std::cout << "jump to beginning\n";}
+ void JumpToEnd() override {std::cout << "jump to end\n";}
};
diff --git a/Interaction/Widgets/Testing/Cxx/TestPointWidget.cxx b/Interaction/Widgets/Testing/Cxx/TestPointWidget.cxx
index 668082d53b55f025173b3a4aa8f97fac9ed954fa..6f5e27de0db87e49c80e01f1054b079fda7ae67d 100644
--- a/Interaction/Widgets/Testing/Cxx/TestPointWidget.cxx
+++ b/Interaction/Widgets/Testing/Cxx/TestPointWidget.cxx
@@ -528,7 +528,7 @@ class vtkmyPWCallback : public vtkCommand
public:
static vtkmyPWCallback *New()
{ return new vtkmyPWCallback; }
- void Execute(vtkObject *caller, unsigned long, void*) VTK_OVERRIDE
+ void Execute(vtkObject *caller, unsigned long, void*) override
{
vtkPointWidget *pointWidget = reinterpret_cast<vtkPointWidget*>(caller);
pointWidget->GetPolyData(this->PolyData);
diff --git a/Interaction/Widgets/Testing/Cxx/TestPolyPlane.cxx b/Interaction/Widgets/Testing/Cxx/TestPolyPlane.cxx
index c54ab5d3eea814b3bafc98306b70b72da3539f28..a6d1bc319d9d5879ae190fc1821c9ff70b398e15 100644
--- a/Interaction/Widgets/Testing/Cxx/TestPolyPlane.cxx
+++ b/Interaction/Widgets/Testing/Cxx/TestPolyPlane.cxx
@@ -61,7 +61,7 @@ public:
return new vtkTestPolyPlaneCallback;
}
- void Execute(vtkObject *caller, unsigned long, void*) VTK_OVERRIDE
+ void Execute(vtkObject *caller, unsigned long, void*) override
{
vtkContourWidget *widget = reinterpret_cast<vtkContourWidget*>(caller);
vtkContourRepresentation *rep = vtkContourRepresentation::
diff --git a/Interaction/Widgets/Testing/Cxx/TestResliceCursorWidget2.cxx b/Interaction/Widgets/Testing/Cxx/TestResliceCursorWidget2.cxx
index a44016807109b3362d7b3eca7e85d3b6f5999b95..0fcda33fddbf699fb4ec3bc24217eeb10bd4524d 100644
--- a/Interaction/Widgets/Testing/Cxx/TestResliceCursorWidget2.cxx
+++ b/Interaction/Widgets/Testing/Cxx/TestResliceCursorWidget2.cxx
@@ -57,7 +57,7 @@ public:
{ return new vtkResliceCursorCallback; }
void Execute( vtkObject *caller, unsigned long /*ev*/,
- void *callData ) VTK_OVERRIDE
+ void *callData ) override
{
vtkImagePlaneWidget* ipw =
dynamic_cast< vtkImagePlaneWidget* >( caller );
diff --git a/Interaction/Widgets/Testing/Cxx/TestResliceCursorWidget3.cxx b/Interaction/Widgets/Testing/Cxx/TestResliceCursorWidget3.cxx
index 44c9693c86aea16243dc066d1f997cc7b2922732..366dfe52394c159e5fb86c5bcbbf58088de23b35 100644
--- a/Interaction/Widgets/Testing/Cxx/TestResliceCursorWidget3.cxx
+++ b/Interaction/Widgets/Testing/Cxx/TestResliceCursorWidget3.cxx
@@ -58,7 +58,7 @@ public:
{ return new vtkResliceCursorCallback3; }
void Execute( vtkObject *caller, unsigned long /*ev*/,
- void *callData ) VTK_OVERRIDE
+ void *callData ) override
{
vtkImagePlaneWidget* ipw =
dynamic_cast< vtkImagePlaneWidget* >( caller );
diff --git a/Interaction/Widgets/Testing/Cxx/TestSeedWidget.cxx b/Interaction/Widgets/Testing/Cxx/TestSeedWidget.cxx
index fd5a750dfbb5edf2d70b08c4467183c75f81a7f6..ed5e3c875e490cee5af783df76a589fd41a6e0c8 100644
--- a/Interaction/Widgets/Testing/Cxx/TestSeedWidget.cxx
+++ b/Interaction/Widgets/Testing/Cxx/TestSeedWidget.cxx
@@ -412,7 +412,7 @@ class vtkSeedCallback : public vtkCommand
public:
static vtkSeedCallback *New()
{ return new vtkSeedCallback; }
- void Execute(vtkObject*, unsigned long event, void *calldata) VTK_OVERRIDE
+ void Execute(vtkObject*, unsigned long event, void *calldata) override
{
if (event == vtkCommand::PlacePointEvent)
{
diff --git a/Interaction/Widgets/Testing/Cxx/TestSeedWidget2.cxx b/Interaction/Widgets/Testing/Cxx/TestSeedWidget2.cxx
index 68839b78d1345bcb41706e761d2e598f36296824..9f40095f50ea274ffcd42fec19791c6c0349b9ea 100644
--- a/Interaction/Widgets/Testing/Cxx/TestSeedWidget2.cxx
+++ b/Interaction/Widgets/Testing/Cxx/TestSeedWidget2.cxx
@@ -1346,7 +1346,7 @@ class vtkSeedCallback2 : public vtkCommand
public:
static vtkSeedCallback2 *New()
{ return new vtkSeedCallback2; }
- void Execute(vtkObject*, unsigned long eid, void*) VTK_OVERRIDE
+ void Execute(vtkObject*, unsigned long eid, void*) override
{
if ( eid == vtkCommand::CursorChangedEvent )
{
diff --git a/Interaction/Widgets/Testing/Cxx/TestSeedWidgetNonUniformRepresentations.cxx b/Interaction/Widgets/Testing/Cxx/TestSeedWidgetNonUniformRepresentations.cxx
index ffc7ed359d8428e08b6aed9a61b3445c58495c8a..e2280b34709c2f9b6f4f4e03791d1eba938314c6 100644
--- a/Interaction/Widgets/Testing/Cxx/TestSeedWidgetNonUniformRepresentations.cxx
+++ b/Interaction/Widgets/Testing/Cxx/TestSeedWidgetNonUniformRepresentations.cxx
@@ -52,7 +52,7 @@ class vtkSeedNonUniformRepresentationCallback : public vtkCommand
public:
static vtkSeedNonUniformRepresentationCallback *New()
{ return new vtkSeedNonUniformRepresentationCallback; }
- void Execute( vtkObject *o, unsigned long event, void* ) VTK_OVERRIDE
+ void Execute( vtkObject *o, unsigned long event, void* ) override
{
vtkSeedWidget *sw = vtkSeedWidget::SafeDownCast(o);
if (sw && event == vtkCommand::PlacePointEvent)
diff --git a/Interaction/Widgets/Testing/Cxx/TestSliderWidget.cxx b/Interaction/Widgets/Testing/Cxx/TestSliderWidget.cxx
index e3d6119974b1e6b1599ae9723570ba639d9da298..2fc30e54ec2c4832cc98117da4520114fa568dc6 100644
--- a/Interaction/Widgets/Testing/Cxx/TestSliderWidget.cxx
+++ b/Interaction/Widgets/Testing/Cxx/TestSliderWidget.cxx
@@ -506,7 +506,7 @@ class vtkSliderCallback : public vtkCommand
public:
static vtkSliderCallback *New()
{ return new vtkSliderCallback; }
- void Execute(vtkObject *caller, unsigned long, void*) VTK_OVERRIDE
+ void Execute(vtkObject *caller, unsigned long, void*) override
{
vtkSliderWidget *sliderWidget =
reinterpret_cast<vtkSliderWidget*>(caller);
diff --git a/Interaction/Widgets/Testing/Cxx/TestSliderWidget2D.cxx b/Interaction/Widgets/Testing/Cxx/TestSliderWidget2D.cxx
index de985a6e7bf7033b879cecdc22a58861fd80857d..5701ac43c30e6b414c05805677ad1e83753fdeef 100644
--- a/Interaction/Widgets/Testing/Cxx/TestSliderWidget2D.cxx
+++ b/Interaction/Widgets/Testing/Cxx/TestSliderWidget2D.cxx
@@ -506,7 +506,7 @@ class vtkSlider2DCallback : public vtkCommand
public:
static vtkSlider2DCallback *New()
{ return new vtkSlider2DCallback; }
- void Execute(vtkObject *caller, unsigned long, void*) VTK_OVERRIDE
+ void Execute(vtkObject *caller, unsigned long, void*) override
{
vtkSliderWidget *sliderWidget =
reinterpret_cast<vtkSliderWidget*>(caller);
diff --git a/Interaction/Widgets/Testing/Cxx/TestSliderWidgetMultipleViewports.cxx b/Interaction/Widgets/Testing/Cxx/TestSliderWidgetMultipleViewports.cxx
index 4822d5700ecacf6de9171dcc8ac80938816f275e..8b24ef72ada363cf3662b9612f4e3a355751acf3 100644
--- a/Interaction/Widgets/Testing/Cxx/TestSliderWidgetMultipleViewports.cxx
+++ b/Interaction/Widgets/Testing/Cxx/TestSliderWidgetMultipleViewports.cxx
@@ -148,7 +148,7 @@ public:
{
return new vtkSliderMultipleViewportsCallback;
}
- void Execute(vtkObject* caller, unsigned long, void*) VTK_OVERRIDE
+ void Execute(vtkObject* caller, unsigned long, void*) override
{
vtkSliderWidget* sliderWidget = reinterpret_cast<vtkSliderWidget*>(caller);
this->Glyph->SetScaleFactor(
diff --git a/Interaction/Widgets/Testing/Cxx/TestSphereWidgetZoomInOut.cxx b/Interaction/Widgets/Testing/Cxx/TestSphereWidgetZoomInOut.cxx
index dbf6e6b31f8b6e4bb5a7e0de9ee602ae2654706f..7d6c930bd6bcc48312fcdddd6c628f7c28fe15f3 100644
--- a/Interaction/Widgets/Testing/Cxx/TestSphereWidgetZoomInOut.cxx
+++ b/Interaction/Widgets/Testing/Cxx/TestSphereWidgetZoomInOut.cxx
@@ -28,7 +28,7 @@ class vtkSphWCallback : public vtkCommand
public:
static vtkSphWCallback *New()
{ return new vtkSphWCallback; }
- void Execute(vtkObject*, unsigned long, void*) VTK_OVERRIDE
+ void Execute(vtkObject*, unsigned long, void*) override
{
}
vtkSphWCallback() {}
diff --git a/Interaction/Widgets/Testing/Cxx/TestSplineWidget.cxx b/Interaction/Widgets/Testing/Cxx/TestSplineWidget.cxx
index 5a7744d3b24747ab4f834c8f47a149eec880fa6d..523bbb92066fe6a4e1dc26ef5a72bc3e88c28880 100644
--- a/Interaction/Widgets/Testing/Cxx/TestSplineWidget.cxx
+++ b/Interaction/Widgets/Testing/Cxx/TestSplineWidget.cxx
@@ -143,7 +143,7 @@ class vtkIPWCallback : public vtkCommand
public:
static vtkIPWCallback *New()
{ return new vtkIPWCallback; }
- void Execute(vtkObject *caller, unsigned long, void*) VTK_OVERRIDE
+ void Execute(vtkObject *caller, unsigned long, void*) override
{
vtkImagePlaneWidget *planeWidget = reinterpret_cast<vtkImagePlaneWidget*>(caller);
if(planeWidget->GetPlaneOrientation() == 3)
@@ -167,7 +167,7 @@ class vtkSWCallback : public vtkCommand
public:
static vtkSWCallback *New()
{ return new vtkSWCallback; }
- void Execute(vtkObject *caller, unsigned long, void*) VTK_OVERRIDE
+ void Execute(vtkObject *caller, unsigned long, void*) override
{
vtkSplineWidget *spline = reinterpret_cast<vtkSplineWidget*>(caller);
spline->GetPolyData(Poly);
diff --git a/Interaction/Widgets/vtk3DWidget.h b/Interaction/Widgets/vtk3DWidget.h
index 0fa9a514993b0e147994c1147ad32eb6aa46305a..c3d5df8d40db0338ce10a0aea1787cd70c6618d4 100644
--- a/Interaction/Widgets/vtk3DWidget.h
+++ b/Interaction/Widgets/vtk3DWidget.h
@@ -68,7 +68,7 @@ class VTKINTERACTIONWIDGETS_EXPORT vtk3DWidget : public vtkInteractorObserver
{
public:
vtkTypeMacro(vtk3DWidget,vtkInteractorObserver);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -132,7 +132,7 @@ public:
protected:
vtk3DWidget();
- ~vtk3DWidget() VTK_OVERRIDE;
+ ~vtk3DWidget() override;
// Used to position and scale the widget initially
vtkProp3D *Prop3D;
diff --git a/Interaction/Widgets/vtkAbstractPolygonalHandleRepresentation3D.h b/Interaction/Widgets/vtkAbstractPolygonalHandleRepresentation3D.h
index 4ad380bd5ff99229dfe96b3e727a45f4ebeccfef..8a9971650ee155f07c691ca4c23702adee448325 100644
--- a/Interaction/Widgets/vtkAbstractPolygonalHandleRepresentation3D.h
+++ b/Interaction/Widgets/vtkAbstractPolygonalHandleRepresentation3D.h
@@ -56,15 +56,15 @@ public:
* Standard methods for instances of this class.
*/
vtkTypeMacro(vtkAbstractPolygonalHandleRepresentation3D,vtkHandleRepresentation);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
/**
* Set the position of the point in world and display coordinates.
*/
- void SetWorldPosition(double p[3]) VTK_OVERRIDE;
- void SetDisplayPosition(double p[3]) VTK_OVERRIDE;
+ void SetWorldPosition(double p[3]) override;
+ void SetDisplayPosition(double p[3]) override;
//@}
//@{
@@ -95,24 +95,24 @@ public:
/**
* Methods to make this class properly act like a vtkWidgetRepresentation.
*/
- void BuildRepresentation() VTK_OVERRIDE;
- void StartWidgetInteraction(double eventPos[2]) VTK_OVERRIDE;
- void WidgetInteraction(double eventPos[2]) VTK_OVERRIDE;
- int ComputeInteractionState(int X, int Y, int modify=0) VTK_OVERRIDE;
+ void BuildRepresentation() override;
+ void StartWidgetInteraction(double eventPos[2]) override;
+ void WidgetInteraction(double eventPos[2]) override;
+ int ComputeInteractionState(int X, int Y, int modify=0) override;
//@}
//@{
/**
* Methods to make this class behave as a vtkProp.
*/
- void ShallowCopy(vtkProp *prop) VTK_OVERRIDE;
- void DeepCopy(vtkProp *prop) VTK_OVERRIDE;
- void GetActors(vtkPropCollection *) VTK_OVERRIDE;
- void ReleaseGraphicsResources(vtkWindow *) VTK_OVERRIDE;
- int RenderOpaqueGeometry(vtkViewport *viewport) VTK_OVERRIDE;
- int RenderTranslucentPolygonalGeometry(vtkViewport *viewport) VTK_OVERRIDE;
- int HasTranslucentPolygonalGeometry() VTK_OVERRIDE;
- double *GetBounds() VTK_OVERRIDE;
+ void ShallowCopy(vtkProp *prop) override;
+ void DeepCopy(vtkProp *prop) override;
+ void GetActors(vtkPropCollection *) override;
+ void ReleaseGraphicsResources(vtkWindow *) override;
+ int RenderOpaqueGeometry(vtkViewport *viewport) override;
+ int RenderTranslucentPolygonalGeometry(vtkViewport *viewport) override;
+ int HasTranslucentPolygonalGeometry() override;
+ double *GetBounds() override;
//@}
//@{
@@ -163,7 +163,7 @@ public:
vtkBooleanMacro( HandleVisibility, int );
//@}
- void Highlight(int highlight) VTK_OVERRIDE;
+ void Highlight(int highlight) override;
//@{
/**
@@ -184,7 +184,7 @@ public:
protected:
vtkAbstractPolygonalHandleRepresentation3D();
- ~vtkAbstractPolygonalHandleRepresentation3D() VTK_OVERRIDE;
+ ~vtkAbstractPolygonalHandleRepresentation3D() override;
vtkActor * Actor;
vtkPolyDataMapper * Mapper;
@@ -202,7 +202,7 @@ protected:
int HandleVisibility;
// Register internal Pickers within PickingManager
- void RegisterPickers() VTK_OVERRIDE;
+ void RegisterPickers() override;
// Methods to manipulate the cursor
virtual void Translate(double *p1, double *p2);
diff --git a/Interaction/Widgets/vtkAbstractWidget.h b/Interaction/Widgets/vtkAbstractWidget.h
index 6d2abff2fe3143211b38e978d4b2fa1e0e152ffb..b908396063023e91a2594e8ff3fd07a00997c9bd 100644
--- a/Interaction/Widgets/vtkAbstractWidget.h
+++ b/Interaction/Widgets/vtkAbstractWidget.h
@@ -68,7 +68,7 @@ public:
* Standard macros implementing standard VTK methods.
*/
vtkTypeMacro(vtkAbstractWidget,vtkInteractorObserver);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
@@ -78,7 +78,7 @@ public:
* to interaction. If ProcessEvents is Off, enabling/disabling a widget
* merely affects the visibility of the representation.
*/
- void SetEnabled(int) VTK_OVERRIDE;
+ void SetEnabled(int) override;
//@{
/**
@@ -156,11 +156,11 @@ public:
* priority of the widget. Unlike the superclass documentation, no
* methods such as SetInteractor to null and reset it etc. are necessary
*/
- void SetPriority( float ) VTK_OVERRIDE;
+ void SetPriority( float ) override;
protected:
vtkAbstractWidget();
- ~vtkAbstractWidget() VTK_OVERRIDE;
+ ~vtkAbstractWidget() override;
// Handles the events; centralized here for all widgets.
static void ProcessEventsHandler(vtkObject* object, unsigned long event,
diff --git a/Interaction/Widgets/vtkAffineRepresentation.h b/Interaction/Widgets/vtkAffineRepresentation.h
index 7ae7fd8dc57620136825ed49759a309d5db8069d..00f62e23348ffa71d87b5ae5d35c9ec14a46615f 100644
--- a/Interaction/Widgets/vtkAffineRepresentation.h
+++ b/Interaction/Widgets/vtkAffineRepresentation.h
@@ -52,7 +52,7 @@ public:
* Standard methods for instances of this class.
*/
vtkTypeMacro(vtkAffineRepresentation,vtkWidgetRepresentation);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
@@ -87,11 +87,11 @@ public:
/**
* Methods to make this class properly act like a vtkWidgetRepresentation.
*/
- void ShallowCopy(vtkProp *prop) VTK_OVERRIDE;
+ void ShallowCopy(vtkProp *prop) override;
protected:
vtkAffineRepresentation();
- ~vtkAffineRepresentation() VTK_OVERRIDE;
+ ~vtkAffineRepresentation() override;
// The tolerance for selecting different parts of the widget.
int Tolerance;
diff --git a/Interaction/Widgets/vtkAffineRepresentation2D.h b/Interaction/Widgets/vtkAffineRepresentation2D.h
index 94732f2a379a3aa44a56ce45fd54660c3c7e4885..ebddf755244c96849c9a8d475807cc5062e9f054 100644
--- a/Interaction/Widgets/vtkAffineRepresentation2D.h
+++ b/Interaction/Widgets/vtkAffineRepresentation2D.h
@@ -69,7 +69,7 @@ public:
* Standard methods for instances of this class.
*/
vtkTypeMacro(vtkAffineRepresentation2D,vtkAffineRepresentation);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -107,7 +107,7 @@ public:
* scale, translate, rotate, shear) are concatenated with the internal
* transform.
*/
- void GetTransform(vtkTransform *t) VTK_OVERRIDE;
+ void GetTransform(vtkTransform *t) override;
//@{
/**
@@ -140,34 +140,34 @@ public:
* transformation matrix (i.e., sets it to identity). It also sets the
* origin for scaling and rotation.
*/
- void PlaceWidget(double bounds[6]) VTK_OVERRIDE;
- void StartWidgetInteraction(double eventPos[2]) VTK_OVERRIDE;
- void WidgetInteraction(double eventPos[2]) VTK_OVERRIDE;
- void EndWidgetInteraction(double eventPos[2]) VTK_OVERRIDE;
- int ComputeInteractionState(int X, int Y, int modify=0) VTK_OVERRIDE;
- void BuildRepresentation() VTK_OVERRIDE;
+ void PlaceWidget(double bounds[6]) override;
+ void StartWidgetInteraction(double eventPos[2]) override;
+ void WidgetInteraction(double eventPos[2]) override;
+ void EndWidgetInteraction(double eventPos[2]) override;
+ int ComputeInteractionState(int X, int Y, int modify=0) override;
+ void BuildRepresentation() override;
//@}
//@{
/**
* Methods to make this class behave as a vtkProp.
*/
- void ShallowCopy(vtkProp *prop) VTK_OVERRIDE;
- void GetActors2D(vtkPropCollection *) VTK_OVERRIDE;
- void ReleaseGraphicsResources(vtkWindow *) VTK_OVERRIDE;
- int RenderOverlay(vtkViewport *viewport) VTK_OVERRIDE;
+ void ShallowCopy(vtkProp *prop) override;
+ void GetActors2D(vtkPropCollection *) override;
+ void ReleaseGraphicsResources(vtkWindow *) override;
+ int RenderOverlay(vtkViewport *viewport) override;
//@}
protected:
vtkAffineRepresentation2D();
- ~vtkAffineRepresentation2D() VTK_OVERRIDE;
+ ~vtkAffineRepresentation2D() override;
// Methods to manipulate the cursor
void Translate(double eventPos[2]);
void Scale(double eventPos[2]);
void Rotate(double eventPos[2]);
void Shear(double eventPos[2]);
- void Highlight(int highlight) VTK_OVERRIDE;
+ void Highlight(int highlight) override;
void UpdateText(const char *text, double eventPos[2]);
// The width of the widget in normalized viewport coordinates.
diff --git a/Interaction/Widgets/vtkAffineWidget.h b/Interaction/Widgets/vtkAffineWidget.h
index bd5b1d0e46d4cde78e83b9d33844af1af1c4ac5d..f72b748f5e439a5de2108375ea9256648e06daf4 100644
--- a/Interaction/Widgets/vtkAffineWidget.h
+++ b/Interaction/Widgets/vtkAffineWidget.h
@@ -77,7 +77,7 @@ public:
* Standard VTK class macros.
*/
vtkTypeMacro(vtkAffineWidget,vtkAbstractWidget);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
@@ -97,18 +97,18 @@ public:
/**
* Create the default widget representation if one is not set.
*/
- void CreateDefaultRepresentation() VTK_OVERRIDE;
+ void CreateDefaultRepresentation() override;
/**
* Methods for activating this widget. This implementation extends the
* superclasses' in order to resize the widget handles due to a render
* start event.
*/
- void SetEnabled(int) VTK_OVERRIDE;
+ void SetEnabled(int) override;
protected:
vtkAffineWidget();
- ~vtkAffineWidget() VTK_OVERRIDE;
+ ~vtkAffineWidget() override;
// These are the callbacks for this widget
static void SelectAction(vtkAbstractWidget*);
@@ -117,7 +117,7 @@ protected:
static void ModifyEventAction(vtkAbstractWidget*);
// helper methods for cursor management
- void SetCursor(int state) VTK_OVERRIDE;
+ void SetCursor(int state) override;
// Manage the state of the widget
int WidgetState;
diff --git a/Interaction/Widgets/vtkAngleRepresentation.h b/Interaction/Widgets/vtkAngleRepresentation.h
index 2cc056a38c53924502f33f57495d8f918820cb1b..67448a99541af50a6eecedee41b4419765d9c748 100644
--- a/Interaction/Widgets/vtkAngleRepresentation.h
+++ b/Interaction/Widgets/vtkAngleRepresentation.h
@@ -44,7 +44,7 @@ public:
* Standard VTK methods.
*/
vtkTypeMacro(vtkAngleRepresentation,vtkWidgetRepresentation);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
@@ -137,16 +137,16 @@ public:
/**
* These are methods that satisfy vtkWidgetRepresentation's API.
*/
- void BuildRepresentation() VTK_OVERRIDE;
- int ComputeInteractionState(int X, int Y, int modify=0) VTK_OVERRIDE;
- void StartWidgetInteraction(double e[2]) VTK_OVERRIDE;
+ void BuildRepresentation() override;
+ int ComputeInteractionState(int X, int Y, int modify=0) override;
+ void StartWidgetInteraction(double e[2]) override;
virtual void CenterWidgetInteraction(double e[2]);
- void WidgetInteraction(double e[2]) VTK_OVERRIDE;
+ void WidgetInteraction(double e[2]) override;
//@}
protected:
vtkAngleRepresentation();
- ~vtkAngleRepresentation() VTK_OVERRIDE;
+ ~vtkAngleRepresentation() override;
// The handle and the rep used to close the handles
vtkHandleRepresentation *HandleRepresentation;
diff --git a/Interaction/Widgets/vtkAngleRepresentation2D.h b/Interaction/Widgets/vtkAngleRepresentation2D.h
index 14480664cae4be94d50738f0f4fa217fa9b3cb80..99479a559a1c040150d6b9c92cd8cf52495f5566 100644
--- a/Interaction/Widgets/vtkAngleRepresentation2D.h
+++ b/Interaction/Widgets/vtkAngleRepresentation2D.h
@@ -51,13 +51,13 @@ public:
* Standard VTK methods.
*/
vtkTypeMacro(vtkAngleRepresentation2D,vtkAngleRepresentation);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
* Satisfy the superclasses API.
*/
- double GetAngle() VTK_OVERRIDE;
+ double GetAngle() override;
//@{
/**
@@ -65,15 +65,15 @@ public:
* this representation. Note that methods are available for both
* display and world coordinates.
*/
- void GetPoint1WorldPosition(double pos[3]) VTK_OVERRIDE;
- void GetCenterWorldPosition(double pos[3]) VTK_OVERRIDE;
- void GetPoint2WorldPosition(double pos[3]) VTK_OVERRIDE;
- void SetPoint1DisplayPosition(double pos[3]) VTK_OVERRIDE;
- void SetCenterDisplayPosition(double pos[3]) VTK_OVERRIDE;
- void SetPoint2DisplayPosition(double pos[3]) VTK_OVERRIDE;
- void GetPoint1DisplayPosition(double pos[3]) VTK_OVERRIDE;
- void GetCenterDisplayPosition(double pos[3]) VTK_OVERRIDE;
- void GetPoint2DisplayPosition(double pos[3]) VTK_OVERRIDE;
+ void GetPoint1WorldPosition(double pos[3]) override;
+ void GetCenterWorldPosition(double pos[3]) override;
+ void GetPoint2WorldPosition(double pos[3]) override;
+ void SetPoint1DisplayPosition(double pos[3]) override;
+ void SetCenterDisplayPosition(double pos[3]) override;
+ void SetPoint2DisplayPosition(double pos[3]) override;
+ void GetPoint1DisplayPosition(double pos[3]) override;
+ void GetCenterDisplayPosition(double pos[3]) override;
+ void GetPoint2DisplayPosition(double pos[3]) override;
//@}
//@{
@@ -91,19 +91,19 @@ public:
* Method defined by vtkWidgetRepresentation superclass and
* needed here.
*/
- void BuildRepresentation() VTK_OVERRIDE;
+ void BuildRepresentation() override;
//@{
/**
* Methods required by vtkProp superclass.
*/
- void ReleaseGraphicsResources(vtkWindow *w) VTK_OVERRIDE;
- int RenderOverlay(vtkViewport *viewport) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *w) override;
+ int RenderOverlay(vtkViewport *viewport) override;
//@}
protected:
vtkAngleRepresentation2D();
- ~vtkAngleRepresentation2D() VTK_OVERRIDE;
+ ~vtkAngleRepresentation2D() override;
// The pieces that make up the angle representations
vtkLeaderActor2D *Ray1;
diff --git a/Interaction/Widgets/vtkAngleRepresentation3D.h b/Interaction/Widgets/vtkAngleRepresentation3D.h
index 961ed6fc10b0e69ff0c09c0558c9fedb958fc9a6..d979e62b5e9b9b91341b94e61800760730e4f39a 100644
--- a/Interaction/Widgets/vtkAngleRepresentation3D.h
+++ b/Interaction/Widgets/vtkAngleRepresentation3D.h
@@ -57,13 +57,13 @@ public:
* Standard VTK methods.
*/
vtkTypeMacro(vtkAngleRepresentation3D,vtkAngleRepresentation);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
* Satisfy the superclasses API. Angle returned is in radians.
*/
- double GetAngle() VTK_OVERRIDE;
+ double GetAngle() override;
//@{
/**
@@ -71,18 +71,18 @@ public:
* this representation. Note that methods are available for both
* display and world coordinates.
*/
- void GetPoint1WorldPosition(double pos[3]) VTK_OVERRIDE;
- void GetCenterWorldPosition(double pos[3]) VTK_OVERRIDE;
- void GetPoint2WorldPosition(double pos[3]) VTK_OVERRIDE;
+ void GetPoint1WorldPosition(double pos[3]) override;
+ void GetCenterWorldPosition(double pos[3]) override;
+ void GetPoint2WorldPosition(double pos[3]) override;
virtual void SetPoint1WorldPosition(double pos[3]);
- void SetPoint1DisplayPosition(double pos[3]) VTK_OVERRIDE;
+ void SetPoint1DisplayPosition(double pos[3]) override;
virtual void SetCenterWorldPosition(double pos[3]);
- void SetCenterDisplayPosition(double pos[3]) VTK_OVERRIDE;
+ void SetCenterDisplayPosition(double pos[3]) override;
virtual void SetPoint2WorldPosition(double pos[3]);
- void SetPoint2DisplayPosition(double pos[3]) VTK_OVERRIDE;
- void GetPoint1DisplayPosition(double pos[3]) VTK_OVERRIDE;
- void GetCenterDisplayPosition(double pos[3]) VTK_OVERRIDE;
- void GetPoint2DisplayPosition(double pos[3]) VTK_OVERRIDE;
+ void SetPoint2DisplayPosition(double pos[3]) override;
+ void GetPoint1DisplayPosition(double pos[3]) override;
+ void GetCenterDisplayPosition(double pos[3]) override;
+ void GetPoint2DisplayPosition(double pos[3]) override;
//@}
//@{
@@ -109,21 +109,21 @@ public:
* Method defined by vtkWidgetRepresentation superclass and
* needed here.
*/
- void BuildRepresentation() VTK_OVERRIDE;
+ void BuildRepresentation() override;
//@{
/**
* Methods required by vtkProp superclass.
*/
- void ReleaseGraphicsResources(vtkWindow *w) VTK_OVERRIDE;
- int RenderOpaqueGeometry(vtkViewport*) VTK_OVERRIDE;
- int RenderTranslucentPolygonalGeometry(vtkViewport*) VTK_OVERRIDE;
- int HasTranslucentPolygonalGeometry() VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *w) override;
+ int RenderOpaqueGeometry(vtkViewport*) override;
+ int RenderTranslucentPolygonalGeometry(vtkViewport*) override;
+ int HasTranslucentPolygonalGeometry() override;
//@}
protected:
vtkAngleRepresentation3D();
- ~vtkAngleRepresentation3D() VTK_OVERRIDE;
+ ~vtkAngleRepresentation3D() override;
// The pieces that make up the angle representations
vtkLineSource *Line1Source;
diff --git a/Interaction/Widgets/vtkAngleWidget.cxx b/Interaction/Widgets/vtkAngleWidget.cxx
index 6e87b9b4723ac97a275d44ddb04fba065a5c354f..50758d3a42ef2b7ff0bccb18b6a406f567d2a94b 100644
--- a/Interaction/Widgets/vtkAngleWidget.cxx
+++ b/Interaction/Widgets/vtkAngleWidget.cxx
@@ -35,7 +35,7 @@ class vtkAngleWidgetCallback : public vtkCommand
public:
static vtkAngleWidgetCallback *New()
{ return new vtkAngleWidgetCallback; }
- void Execute(vtkObject*, unsigned long eventId, void*) VTK_OVERRIDE
+ void Execute(vtkObject*, unsigned long eventId, void*) override
{
switch (eventId)
{
diff --git a/Interaction/Widgets/vtkAngleWidget.h b/Interaction/Widgets/vtkAngleWidget.h
index b105c034d57121ebfc08948b834a28ad30534fd4..9bfa76203b0dbdffd2779bf9604a8492cc14a899 100644
--- a/Interaction/Widgets/vtkAngleWidget.h
+++ b/Interaction/Widgets/vtkAngleWidget.h
@@ -92,7 +92,7 @@ public:
* Standard methods for a VTK class.
*/
vtkTypeMacro(vtkAngleWidget,vtkAbstractWidget);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
@@ -100,7 +100,7 @@ public:
* must be overridden because it is a composite widget and does more than
* its superclasses' vtkAbstractWidget::SetEnabled() method.
*/
- void SetEnabled(int) VTK_OVERRIDE;
+ void SetEnabled(int) override;
/**
* Specify an instance of vtkWidgetRepresentation used to represent this
@@ -113,7 +113,7 @@ public:
/**
* Create the default widget representation if one is not set.
*/
- void CreateDefaultRepresentation() VTK_OVERRIDE;
+ void CreateDefaultRepresentation() override;
/**
* Return the representation as a vtkAngleRepresentation.
@@ -131,7 +131,7 @@ public:
* Methods to change the whether the widget responds to interaction.
* Overridden to pass the state to component widgets.
*/
- void SetProcessEvents(int) VTK_OVERRIDE;
+ void SetProcessEvents(int) override;
/**
* Enum defining the state of the widget. By default the widget is in Start mode,
@@ -164,7 +164,7 @@ public:
protected:
vtkAngleWidget();
- ~vtkAngleWidget() VTK_OVERRIDE;
+ ~vtkAngleWidget() override;
// The state of the widget
int WidgetState;
diff --git a/Interaction/Widgets/vtkAxesTransformRepresentation.h b/Interaction/Widgets/vtkAxesTransformRepresentation.h
index 039f19b29296e9579b98b67c3117d26aa898b32b..fe6e539d792d94f8a2cca9727a785c58d8b2c4c5 100644
--- a/Interaction/Widgets/vtkAxesTransformRepresentation.h
+++ b/Interaction/Widgets/vtkAxesTransformRepresentation.h
@@ -60,7 +60,7 @@ public:
* Standard VTK methods.
*/
vtkTypeMacro(vtkAxesTransformRepresentation,vtkWidgetRepresentation);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -133,20 +133,20 @@ public:
/**
* Method to satisfy superclasses' API.
*/
- void BuildRepresentation() VTK_OVERRIDE;
- int ComputeInteractionState(int X, int Y, int modify=0) VTK_OVERRIDE;
- void StartWidgetInteraction(double e[2]) VTK_OVERRIDE;
- void WidgetInteraction(double e[2]) VTK_OVERRIDE;
- double *GetBounds() VTK_OVERRIDE;
+ void BuildRepresentation() override;
+ int ComputeInteractionState(int X, int Y, int modify=0) override;
+ void StartWidgetInteraction(double e[2]) override;
+ void WidgetInteraction(double e[2]) override;
+ double *GetBounds() override;
//@}
//@{
/**
* Methods required by vtkProp superclass.
*/
- void ReleaseGraphicsResources(vtkWindow *w) VTK_OVERRIDE;
- int RenderOpaqueGeometry(vtkViewport *viewport) VTK_OVERRIDE;
- int RenderTranslucentPolygonalGeometry(vtkViewport *viewport) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *w) override;
+ int RenderOpaqueGeometry(vtkViewport *viewport) override;
+ int RenderTranslucentPolygonalGeometry(vtkViewport *viewport) override;
//@}
//@{
@@ -173,7 +173,7 @@ public:
protected:
vtkAxesTransformRepresentation();
- ~vtkAxesTransformRepresentation() VTK_OVERRIDE;
+ ~vtkAxesTransformRepresentation() override;
// The handle and the rep used to close the handles
vtkHandleRepresentation *OriginRepresentation;
diff --git a/Interaction/Widgets/vtkAxesTransformWidget.h b/Interaction/Widgets/vtkAxesTransformWidget.h
index 604cc3ce6f24fee601237e96f50326b083cd908d..5db2fad76ff4eafc56d0cb6a0749f8bd4cee8bd0 100644
--- a/Interaction/Widgets/vtkAxesTransformWidget.h
+++ b/Interaction/Widgets/vtkAxesTransformWidget.h
@@ -101,14 +101,14 @@ public:
* Standard vtkObject methods
*/
vtkTypeMacro(vtkAxesTransformWidget,vtkAbstractWidget);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
* Override superclasses' SetEnabled() method because the line
* widget must enable its internal handle widgets.
*/
- void SetEnabled(int enabling) VTK_OVERRIDE;
+ void SetEnabled(int enabling) override;
/**
* Specify an instance of vtkWidgetRepresentation used to represent this
@@ -127,17 +127,17 @@ public:
/**
* Create the default widget representation if one is not set.
*/
- void CreateDefaultRepresentation() VTK_OVERRIDE;
+ void CreateDefaultRepresentation() override;
/**
* Methods to change the whether the widget responds to interaction.
* Overridden to pass the state to component widgets.
*/
- void SetProcessEvents(int) VTK_OVERRIDE;
+ void SetProcessEvents(int) override;
protected:
vtkAxesTransformWidget();
- ~vtkAxesTransformWidget() VTK_OVERRIDE;
+ ~vtkAxesTransformWidget() override;
int WidgetState;
enum _WidgetState {Start=0,Active};
diff --git a/Interaction/Widgets/vtkBalloonRepresentation.h b/Interaction/Widgets/vtkBalloonRepresentation.h
index 6f91e79eda6ff81c046687f0508f61f34b510ec0..8a9da4f8823ae10c89b8d23899120b717da91141 100644
--- a/Interaction/Widgets/vtkBalloonRepresentation.h
+++ b/Interaction/Widgets/vtkBalloonRepresentation.h
@@ -86,7 +86,7 @@ public:
* Standard VTK methods.
*/
vtkTypeMacro(vtkBalloonRepresentation,vtkWidgetRepresentation);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -187,18 +187,18 @@ public:
/**
* These are methods that satisfy vtkWidgetRepresentation's API.
*/
- void StartWidgetInteraction(double e[2]) VTK_OVERRIDE;
- void EndWidgetInteraction(double e[2]) VTK_OVERRIDE;
- void BuildRepresentation() VTK_OVERRIDE;
- int ComputeInteractionState(int X, int Y, int modify=0) VTK_OVERRIDE;
+ void StartWidgetInteraction(double e[2]) override;
+ void EndWidgetInteraction(double e[2]) override;
+ void BuildRepresentation() override;
+ int ComputeInteractionState(int X, int Y, int modify=0) override;
//@}
//@{
/**
* Methods required by vtkProp superclass.
*/
- void ReleaseGraphicsResources(vtkWindow *w) VTK_OVERRIDE;
- int RenderOverlay(vtkViewport *viewport) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *w) override;
+ int RenderOverlay(vtkViewport *viewport) override;
//@}
/**
@@ -208,7 +208,7 @@ public:
protected:
vtkBalloonRepresentation();
- ~vtkBalloonRepresentation() VTK_OVERRIDE;
+ ~vtkBalloonRepresentation() override;
// The balloon text and image
char *BalloonText;
diff --git a/Interaction/Widgets/vtkBalloonWidget.h b/Interaction/Widgets/vtkBalloonWidget.h
index fb8138a8e95eaa2df7556d5a871af7cc709b474c..b17078a0a3be146afe81758c513738d2ed9a9ff4 100644
--- a/Interaction/Widgets/vtkBalloonWidget.h
+++ b/Interaction/Widgets/vtkBalloonWidget.h
@@ -95,14 +95,14 @@ public:
* Standard methods for a VTK class.
*/
vtkTypeMacro(vtkBalloonWidget,vtkHoverWidget);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
* The method for activating and deactivating this widget. This method
* must be overridden because it performs special timer-related operations.
*/
- void SetEnabled(int) VTK_OVERRIDE;
+ void SetEnabled(int) override;
/**
* Specify an instance of vtkWidgetRepresentation used to represent this
@@ -121,7 +121,7 @@ public:
/**
* Create the default widget representation if one is not set.
*/
- void CreateDefaultRepresentation() VTK_OVERRIDE;
+ void CreateDefaultRepresentation() override;
//@{
/**
@@ -175,11 +175,11 @@ public:
protected:
vtkBalloonWidget();
- ~vtkBalloonWidget() VTK_OVERRIDE;
+ ~vtkBalloonWidget() override;
// This class implements the method called from its superclass.
- int SubclassEndHoverAction() VTK_OVERRIDE;
- int SubclassHoverAction() VTK_OVERRIDE;
+ int SubclassEndHoverAction() override;
+ int SubclassHoverAction() override;
// Classes for managing balloons
vtkPropMap *PropMap; //PIMPL'd map of (vtkProp,vtkStdString)
@@ -188,7 +188,7 @@ protected:
vtkAbstractPropPicker *Picker;
// Register internal Pickers within PickingManager
- void RegisterPickers() VTK_OVERRIDE;
+ void RegisterPickers() override;
// The vtkProp that is being hovered over (which may be NULL)
vtkProp *CurrentProp;
diff --git a/Interaction/Widgets/vtkBezierContourLineInterpolator.h b/Interaction/Widgets/vtkBezierContourLineInterpolator.h
index 48d532c98059c8064eedbcba0ef0520fe7bfc60b..ddf86e7b2ae846c893fb6ee7b7ab5f229e9ed034 100644
--- a/Interaction/Widgets/vtkBezierContourLineInterpolator.h
+++ b/Interaction/Widgets/vtkBezierContourLineInterpolator.h
@@ -45,12 +45,12 @@ public:
* Standard methods for instances of this class.
*/
vtkTypeMacro(vtkBezierContourLineInterpolator, vtkContourLineInterpolator);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
int InterpolateLine( vtkRenderer *ren,
vtkContourRepresentation *rep,
- int idx1, int idx2 ) VTK_OVERRIDE;
+ int idx1, int idx2 ) override;
//@{
/**
@@ -86,11 +86,11 @@ public:
* this interpolator will be a 2-tuple with a span of 4.
*/
void GetSpan(int nodeIndex, vtkIntArray *nodeIndices,
- vtkContourRepresentation *rep) VTK_OVERRIDE;
+ vtkContourRepresentation *rep) override;
protected:
vtkBezierContourLineInterpolator();
- ~vtkBezierContourLineInterpolator() VTK_OVERRIDE;
+ ~vtkBezierContourLineInterpolator() override;
void ComputeMidpoint(double p1[3], double p2[3], double mid[3])
{
diff --git a/Interaction/Widgets/vtkBiDimensionalRepresentation.h b/Interaction/Widgets/vtkBiDimensionalRepresentation.h
index efc1afc3096b5b2378624306afb83dca71d1094a..ed3011b1ebbf60deb52a732341d8e8c708fd77dd 100644
--- a/Interaction/Widgets/vtkBiDimensionalRepresentation.h
+++ b/Interaction/Widgets/vtkBiDimensionalRepresentation.h
@@ -57,7 +57,7 @@ public:
* Standard VTK methods.
*/
vtkTypeMacro(vtkBiDimensionalRepresentation,vtkWidgetRepresentation);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -207,7 +207,7 @@ public:
protected:
vtkBiDimensionalRepresentation();
- ~vtkBiDimensionalRepresentation() VTK_OVERRIDE;
+ ~vtkBiDimensionalRepresentation() override;
// Keep track if modifier is set
int Modifier;
diff --git a/Interaction/Widgets/vtkBiDimensionalRepresentation2D.h b/Interaction/Widgets/vtkBiDimensionalRepresentation2D.h
index 26df20b685025ff0a092a6e1df0753cc35eb7098..8da8d5a481f18544f21b4b666835104236a870ad 100644
--- a/Interaction/Widgets/vtkBiDimensionalRepresentation2D.h
+++ b/Interaction/Widgets/vtkBiDimensionalRepresentation2D.h
@@ -68,7 +68,7 @@ public:
* Standard VTK methods.
*/
vtkTypeMacro(vtkBiDimensionalRepresentation2D,vtkBiDimensionalRepresentation);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -95,41 +95,41 @@ public:
/**
* These are methods that satisfy vtkWidgetRepresentation's API.
*/
- void BuildRepresentation() VTK_OVERRIDE;
- int ComputeInteractionState(int X, int Y, int modify=0) VTK_OVERRIDE;
- void StartWidgetDefinition(double e[2]) VTK_OVERRIDE;
- void Point2WidgetInteraction(double e[2]) VTK_OVERRIDE;
- void Point3WidgetInteraction(double e[2]) VTK_OVERRIDE;
- void StartWidgetManipulation(double e[2]) VTK_OVERRIDE;
- void WidgetInteraction(double e[2]) VTK_OVERRIDE;
- void Highlight(int highlightOn) VTK_OVERRIDE;
+ void BuildRepresentation() override;
+ int ComputeInteractionState(int X, int Y, int modify=0) override;
+ void StartWidgetDefinition(double e[2]) override;
+ void Point2WidgetInteraction(double e[2]) override;
+ void Point3WidgetInteraction(double e[2]) override;
+ void StartWidgetManipulation(double e[2]) override;
+ void WidgetInteraction(double e[2]) override;
+ void Highlight(int highlightOn) override;
//@}
//@{
/**
* Methods required by vtkProp superclass.
*/
- void ReleaseGraphicsResources(vtkWindow *w) VTK_OVERRIDE;
- int RenderOverlay(vtkViewport *viewport) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *w) override;
+ int RenderOverlay(vtkViewport *viewport) override;
//@}
/**
* Get the text shown in the widget's label.
*/
- char* GetLabelText() VTK_OVERRIDE;
+ char* GetLabelText() override;
//@{
/**
* Get the position of the widget's label in display coordinates.
*/
- double* GetLabelPosition() VTK_OVERRIDE;
- void GetLabelPosition(double pos[3]) VTK_OVERRIDE;
- void GetWorldLabelPosition(double pos[3]) VTK_OVERRIDE;
+ double* GetLabelPosition() override;
+ void GetLabelPosition(double pos[3]) override;
+ void GetWorldLabelPosition(double pos[3]) override;
//@}
protected:
vtkBiDimensionalRepresentation2D();
- ~vtkBiDimensionalRepresentation2D() VTK_OVERRIDE;
+ ~vtkBiDimensionalRepresentation2D() override;
// Geometry of the lines
vtkCellArray *LineCells;
diff --git a/Interaction/Widgets/vtkBiDimensionalWidget.cxx b/Interaction/Widgets/vtkBiDimensionalWidget.cxx
index c15c3d721e91a33287c44e8ac200422c08e787e0..45cfd8c59a8055a1b31cc72bd79c9c6190bbfd8e 100644
--- a/Interaction/Widgets/vtkBiDimensionalWidget.cxx
+++ b/Interaction/Widgets/vtkBiDimensionalWidget.cxx
@@ -38,7 +38,7 @@ class vtkBiDimensionalWidgetCallback : public vtkCommand
public:
static vtkBiDimensionalWidgetCallback *New()
{ return new vtkBiDimensionalWidgetCallback; }
- void Execute(vtkObject*, unsigned long eventId, void*) VTK_OVERRIDE
+ void Execute(vtkObject*, unsigned long eventId, void*) override
{
switch (eventId)
{
diff --git a/Interaction/Widgets/vtkBiDimensionalWidget.h b/Interaction/Widgets/vtkBiDimensionalWidget.h
index 87e25ca4e758b9032b2e14770d046b111d4f2420..02cafa77879f335194db8fae3c46bbe73d8a040d 100644
--- a/Interaction/Widgets/vtkBiDimensionalWidget.h
+++ b/Interaction/Widgets/vtkBiDimensionalWidget.h
@@ -115,7 +115,7 @@ public:
* Standard methods for a VTK class.
*/
vtkTypeMacro(vtkBiDimensionalWidget,vtkAbstractWidget);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
@@ -123,7 +123,7 @@ public:
* must be overridden because it is a composite widget and does more than
* its superclasses' vtkAbstractWidget::SetEnabled() method.
*/
- void SetEnabled(int) VTK_OVERRIDE;
+ void SetEnabled(int) override;
/**
* Specify an instance of vtkWidgetRepresentation used to represent this
@@ -142,7 +142,7 @@ public:
/**
* Create the default widget representation if one is not set.
*/
- void CreateDefaultRepresentation() VTK_OVERRIDE;
+ void CreateDefaultRepresentation() override;
/**
* A flag indicates whether the bi-dimensional measure is valid. The widget
@@ -162,7 +162,7 @@ public:
* Methods to change the whether the widget responds to interaction.
* Overridden to pass the state to component widgets.
*/
- void SetProcessEvents(int) VTK_OVERRIDE;
+ void SetProcessEvents(int) override;
/**
* Enum defining the state of the widget. By default the widget is in Start mode,
@@ -195,7 +195,7 @@ public:
protected:
vtkBiDimensionalWidget();
- ~vtkBiDimensionalWidget() VTK_OVERRIDE;
+ ~vtkBiDimensionalWidget() override;
// The state of the widget
int WidgetState;
diff --git a/Interaction/Widgets/vtkBorderRepresentation.h b/Interaction/Widgets/vtkBorderRepresentation.h
index 14dbbe78c2a1465e321d9380724c19c3040d3562..c59f94cfaeb32e9f69c5b9b39b4ed988970b1c19 100644
--- a/Interaction/Widgets/vtkBorderRepresentation.h
+++ b/Interaction/Widgets/vtkBorderRepresentation.h
@@ -65,7 +65,7 @@ public:
* Define standard methods.
*/
vtkTypeMacro(vtkBorderRepresentation,vtkWidgetRepresentation);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -205,19 +205,19 @@ public:
* Return the MTime of this object. It takes into account MTimes
* of position coordinates and border's property.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
//@{
/**
* Subclasses should implement these methods. See the superclasses'
* documentation for more information.
*/
- void BuildRepresentation() VTK_OVERRIDE;
- void StartWidgetInteraction(double eventPos[2]) VTK_OVERRIDE;
- void WidgetInteraction(double eventPos[2]) VTK_OVERRIDE;
+ void BuildRepresentation() override;
+ void StartWidgetInteraction(double eventPos[2]) override;
+ void WidgetInteraction(double eventPos[2]) override;
virtual void GetSize(double size[2])
{size[0]=1.0; size[1]=1.0;}
- int ComputeInteractionState(int X, int Y, int modify=0) VTK_OVERRIDE;
+ int ComputeInteractionState(int X, int Y, int modify=0) override;
//@}
//@{
@@ -225,17 +225,17 @@ public:
* These methods are necessary to make this representation behave as
* a vtkProp.
*/
- void GetActors2D(vtkPropCollection*) VTK_OVERRIDE;
- void ReleaseGraphicsResources(vtkWindow*) VTK_OVERRIDE;
- int RenderOverlay(vtkViewport*) VTK_OVERRIDE;
- int RenderOpaqueGeometry(vtkViewport*) VTK_OVERRIDE;
- int RenderTranslucentPolygonalGeometry(vtkViewport*) VTK_OVERRIDE;
- int HasTranslucentPolygonalGeometry() VTK_OVERRIDE;
+ void GetActors2D(vtkPropCollection*) override;
+ void ReleaseGraphicsResources(vtkWindow*) override;
+ int RenderOverlay(vtkViewport*) override;
+ int RenderOpaqueGeometry(vtkViewport*) override;
+ int RenderTranslucentPolygonalGeometry(vtkViewport*) override;
+ int HasTranslucentPolygonalGeometry() override;
//@}
protected:
vtkBorderRepresentation();
- ~vtkBorderRepresentation() VTK_OVERRIDE;
+ ~vtkBorderRepresentation() override;
// Ivars
int ShowVerticalBorder;
diff --git a/Interaction/Widgets/vtkBorderWidget.h b/Interaction/Widgets/vtkBorderWidget.h
index 1843167ebdc70d8c651041f1c8795453ce6392fb..852ae1bdce4c0c1ccc7a6cc17683900af7035918 100644
--- a/Interaction/Widgets/vtkBorderWidget.h
+++ b/Interaction/Widgets/vtkBorderWidget.h
@@ -92,7 +92,7 @@ public:
* Standard methods for class.
*/
vtkTypeMacro(vtkBorderWidget,vtkAbstractWidget);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -137,11 +137,11 @@ public:
/**
* Create the default widget representation if one is not set.
*/
- void CreateDefaultRepresentation() VTK_OVERRIDE;
+ void CreateDefaultRepresentation() override;
protected:
vtkBorderWidget();
- ~vtkBorderWidget() VTK_OVERRIDE;
+ ~vtkBorderWidget() override;
/**
* Subclasses generally implement this method. The SelectRegion() method
@@ -168,7 +168,7 @@ protected:
virtual int SubclassMoveAction() {return 0;}
// helper methods for cursoe management
- void SetCursor(int State) VTK_OVERRIDE;
+ void SetCursor(int State) override;
//widget state
int WidgetState;
diff --git a/Interaction/Widgets/vtkBoundedPlanePointPlacer.h b/Interaction/Widgets/vtkBoundedPlanePointPlacer.h
index adc224e05e5f5b5cb34c8db60615caccd41422a5..bf57dca92192d552520052be819fa5fdbd1cc95b 100644
--- a/Interaction/Widgets/vtkBoundedPlanePointPlacer.h
+++ b/Interaction/Widgets/vtkBoundedPlanePointPlacer.h
@@ -48,7 +48,7 @@ public:
* Standard methods for instances of this class.
*/
vtkTypeMacro(vtkBoundedPlanePointPlacer,vtkPointPlacer);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -134,7 +134,7 @@ public:
int ComputeWorldPosition( vtkRenderer *ren,
double displayPos[2],
double worldPos[3],
- double worldOrient[9] ) VTK_OVERRIDE;
+ double worldOrient[9] ) override;
/**
* Given a renderer, a display position, and a reference world
@@ -146,20 +146,20 @@ public:
double displayPos[2],
double refWorldPos[3],
double worldPos[3],
- double worldOrient[9] ) VTK_OVERRIDE;
+ double worldOrient[9] ) override;
/**
* Give a world position check if it is valid - does
* it lie on the plane and within the bounds? Returns
* 1 if it is valid, 0 otherwise.
*/
- int ValidateWorldPosition( double worldPos[3] ) VTK_OVERRIDE;
+ int ValidateWorldPosition( double worldPos[3] ) override;
// Descrption:
// Orientationation is ignored, and the above method
// is called instead.
int ValidateWorldPosition( double worldPos[3],
- double worldOrient[9]) VTK_OVERRIDE;
+ double worldOrient[9]) override;
/**
* If the constraints on this placer are changed, then
@@ -171,12 +171,12 @@ public:
*/
int UpdateWorldPosition( vtkRenderer *ren,
double worldPos[3],
- double worldOrient[9] ) VTK_OVERRIDE;
+ double worldOrient[9] ) override;
protected:
vtkBoundedPlanePointPlacer();
- ~vtkBoundedPlanePointPlacer() VTK_OVERRIDE;
+ ~vtkBoundedPlanePointPlacer() override;
// Indicates the projection normal as laying along the
// XAxis, YAxis, ZAxis, or Oblique. For X, Y, and Z axes,
diff --git a/Interaction/Widgets/vtkBoxRepresentation.h b/Interaction/Widgets/vtkBoxRepresentation.h
index 264693f2c8a3c3793c8f067a2ed452dc79e7e51a..7920fb637871ec99ff90aeb2f89fb87326411e9b 100644
--- a/Interaction/Widgets/vtkBoxRepresentation.h
+++ b/Interaction/Widgets/vtkBoxRepresentation.h
@@ -69,7 +69,7 @@ public:
* Standard methods for the class.
*/
vtkTypeMacro(vtkBoxRepresentation,vtkWidgetRepresentation);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
@@ -189,22 +189,22 @@ public:
/**
* These are methods that satisfy vtkWidgetRepresentation's API.
*/
- void PlaceWidget(double bounds[6]) VTK_OVERRIDE;
- void BuildRepresentation() VTK_OVERRIDE;
- int ComputeInteractionState(int X, int Y, int modify=0) VTK_OVERRIDE;
- void StartWidgetInteraction(double e[2]) VTK_OVERRIDE;
- void WidgetInteraction(double e[2]) VTK_OVERRIDE;
- double *GetBounds() VTK_OVERRIDE;
+ void PlaceWidget(double bounds[6]) override;
+ void BuildRepresentation() override;
+ int ComputeInteractionState(int X, int Y, int modify=0) override;
+ void StartWidgetInteraction(double e[2]) override;
+ void WidgetInteraction(double e[2]) override;
+ double *GetBounds() override;
//@}
//@{
/**
* Methods supporting, and required by, the rendering process.
*/
- void ReleaseGraphicsResources(vtkWindow*) VTK_OVERRIDE;
- int RenderOpaqueGeometry(vtkViewport*) VTK_OVERRIDE;
- int RenderTranslucentPolygonalGeometry(vtkViewport*) VTK_OVERRIDE;
- int HasTranslucentPolygonalGeometry() VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow*) override;
+ int RenderOpaqueGeometry(vtkViewport*) override;
+ int RenderTranslucentPolygonalGeometry(vtkViewport*) override;
+ int HasTranslucentPolygonalGeometry() override;
//@}
// Used to manage the state of the widget
@@ -223,7 +223,7 @@ public:
protected:
vtkBoxRepresentation();
- ~vtkBoxRepresentation() VTK_OVERRIDE;
+ ~vtkBoxRepresentation() override;
// Manage how the representation appears
double LastEventPosition[3];
@@ -264,7 +264,7 @@ protected:
vtkCellPicker *LastPicker;
// Register internal Pickers within PickingManager
- void RegisterPickers() VTK_OVERRIDE;
+ void RegisterPickers() override;
// Transform the hexahedral points (used for rotations)
vtkTransform *Transform;
diff --git a/Interaction/Widgets/vtkBoxWidget.h b/Interaction/Widgets/vtkBoxWidget.h
index 3a4f95309fe4bf7ae85bdf3d9cbef6262f25c1be..dc501e99c38fe19274dac306be9420b21425fd40 100644
--- a/Interaction/Widgets/vtkBoxWidget.h
+++ b/Interaction/Widgets/vtkBoxWidget.h
@@ -98,18 +98,18 @@ public:
static vtkBoxWidget *New();
vtkTypeMacro(vtkBoxWidget,vtk3DWidget);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
* Methods that satisfy the superclass' API.
*/
- void SetEnabled(int) VTK_OVERRIDE;
- void PlaceWidget(double bounds[6]) VTK_OVERRIDE;
- void PlaceWidget() VTK_OVERRIDE
+ void SetEnabled(int) override;
+ void PlaceWidget(double bounds[6]) override;
+ void PlaceWidget() override
{this->Superclass::PlaceWidget();}
void PlaceWidget(double xmin, double xmax, double ymin, double ymax,
- double zmin, double zmax) VTK_OVERRIDE
+ double zmin, double zmax) override
{this->Superclass::PlaceWidget(xmin,xmax,ymin,ymax,zmin,zmax);}
//@}
@@ -243,7 +243,7 @@ public:
protected:
vtkBoxWidget();
- ~vtkBoxWidget() VTK_OVERRIDE;
+ ~vtkBoxWidget() override;
// Manage the state of the widget
int State;
@@ -291,7 +291,7 @@ protected:
void HighlightFace(int cellId);
void HighlightOutline(int highlight);
void ComputeNormals();
- void SizeHandles() VTK_OVERRIDE;
+ void SizeHandles() override;
// wireframe outline
vtkActor *HexOutline;
@@ -305,7 +305,7 @@ protected:
int CurrentHexFace;
// Register internal Pickers within PickingManager
- void RegisterPickers() VTK_OVERRIDE;
+ void RegisterPickers() override;
// Methods to manipulate the hexahedron.
virtual void Translate(double *p1, double *p2);
diff --git a/Interaction/Widgets/vtkBoxWidget2.h b/Interaction/Widgets/vtkBoxWidget2.h
index 682d250eddef74b72d4acf74331051accd033034..fcaac70411ea8b6d6e1ee7984344b9b40dc70a94 100644
--- a/Interaction/Widgets/vtkBoxWidget2.h
+++ b/Interaction/Widgets/vtkBoxWidget2.h
@@ -113,7 +113,7 @@ public:
* Standard class methods for type information and printing.
*/
vtkTypeMacro(vtkBoxWidget2,vtkAbstractWidget);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
@@ -151,11 +151,11 @@ public:
* Create the default widget representation if one is not set. By default,
* this is an instance of the vtkBoxRepresentation class.
*/
- void CreateDefaultRepresentation() VTK_OVERRIDE;
+ void CreateDefaultRepresentation() override;
protected:
vtkBoxWidget2();
- ~vtkBoxWidget2() VTK_OVERRIDE;
+ ~vtkBoxWidget2() override;
// Manage the state of the widget
int WidgetState;
diff --git a/Interaction/Widgets/vtkBrokenLineWidget.h b/Interaction/Widgets/vtkBrokenLineWidget.h
index a65573e4ecfec5f37b14b8283d3d0549343d352a..c54c150270177686f4296d9b5ffcf0a273d653ff 100644
--- a/Interaction/Widgets/vtkBrokenLineWidget.h
+++ b/Interaction/Widgets/vtkBrokenLineWidget.h
@@ -111,18 +111,18 @@ public:
static vtkBrokenLineWidget *New();
vtkTypeMacro(vtkBrokenLineWidget,vtk3DWidget);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
* Methods that satisfy the superclass' API.
*/
- void SetEnabled(int) VTK_OVERRIDE;
- void PlaceWidget(double bounds[6]) VTK_OVERRIDE;
- void PlaceWidget() VTK_OVERRIDE
+ void SetEnabled(int) override;
+ void PlaceWidget(double bounds[6]) override;
+ void PlaceWidget() override
{this->Superclass::PlaceWidget();}
void PlaceWidget(double xmin, double xmax, double ymin, double ymax,
- double zmin, double zmax) VTK_OVERRIDE
+ double zmin, double zmax) override
{this->Superclass::PlaceWidget(xmin,xmax,ymin,ymax,zmin,zmax);}
//@}
@@ -251,7 +251,7 @@ public:
protected:
vtkBrokenLineWidget();
- ~vtkBrokenLineWidget() VTK_OVERRIDE;
+ ~vtkBrokenLineWidget() override;
// Manage the state of the widget
int State;
@@ -305,7 +305,7 @@ protected:
vtkSphereSource **HandleGeometry;
void Initialize();
int HighlightHandle(vtkProp *prop); //returns handle index or -1 on fail
- void SizeHandles() VTK_OVERRIDE;
+ void SizeHandles() override;
void InsertHandleOnLine(double* pos);
void EraseHandle(const int&);
@@ -316,7 +316,7 @@ protected:
int CurrentHandleIndex;
// Register internal Pickers within PickingManager
- void RegisterPickers() VTK_OVERRIDE;
+ void RegisterPickers() override;
// Methods to manipulate the broken line.
void MovePoint(double *p1, double *p2);
diff --git a/Interaction/Widgets/vtkButtonRepresentation.h b/Interaction/Widgets/vtkButtonRepresentation.h
index 98ddedc5d9102e36a2ea109eff6350eb952cb3d8..6053ac6ed6e39587837fb7363635d7144e11cbde 100644
--- a/Interaction/Widgets/vtkButtonRepresentation.h
+++ b/Interaction/Widgets/vtkButtonRepresentation.h
@@ -50,7 +50,7 @@ public:
* Standard methods for the class.
*/
vtkTypeMacro(vtkButtonRepresentation,vtkWidgetRepresentation);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -95,18 +95,18 @@ public:
* a vtkCommand::HighlightEvent.
*/
enum _HighlightState {HighlightNormal,HighlightHovering,HighlightSelecting};
- void Highlight(int) VTK_OVERRIDE;
+ void Highlight(int) override;
vtkGetMacro(HighlightState,int);
//@}
/**
* Satisfy some of vtkProp's API.
*/
- void ShallowCopy(vtkProp *prop) VTK_OVERRIDE;
+ void ShallowCopy(vtkProp *prop) override;
protected:
vtkButtonRepresentation();
- ~vtkButtonRepresentation() VTK_OVERRIDE;
+ ~vtkButtonRepresentation() override;
// Values
int NumberOfStates;
diff --git a/Interaction/Widgets/vtkButtonWidget.h b/Interaction/Widgets/vtkButtonWidget.h
index 2cd5f14de0f1aa173e5b4d1c329bca8cb3cd0b38..954681b5f7a8a41d84ca861ad5d18ac41f98959a 100644
--- a/Interaction/Widgets/vtkButtonWidget.h
+++ b/Interaction/Widgets/vtkButtonWidget.h
@@ -74,7 +74,7 @@ public:
* Standard macros.
*/
vtkTypeMacro(vtkButtonWidget,vtkAbstractWidget);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
@@ -94,7 +94,7 @@ public:
/**
* Create the default widget representation if one is not set.
*/
- void CreateDefaultRepresentation() VTK_OVERRIDE;
+ void CreateDefaultRepresentation() override;
/**
* The method for activating and deactivating this widget. This method
@@ -103,11 +103,11 @@ public:
* method finds and sets the active viewport on the internal balloon
* representation.
*/
- void SetEnabled(int) VTK_OVERRIDE;
+ void SetEnabled(int) override;
protected:
vtkButtonWidget();
- ~vtkButtonWidget() VTK_OVERRIDE {}
+ ~vtkButtonWidget() override {}
// These are the events that are handled
static void SelectAction(vtkAbstractWidget*);
diff --git a/Interaction/Widgets/vtkCameraRepresentation.h b/Interaction/Widgets/vtkCameraRepresentation.h
index 505ba1833848f83a19e8d6cd6b7cd613f326b8cf..153489e4d29228db64383de944aacf30062494f2 100644
--- a/Interaction/Widgets/vtkCameraRepresentation.h
+++ b/Interaction/Widgets/vtkCameraRepresentation.h
@@ -57,7 +57,7 @@ public:
* Standard VTK class methods.
*/
vtkTypeMacro(vtkCameraRepresentation,vtkBorderRepresentation);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -113,8 +113,8 @@ public:
/**
* Satisfy the superclasses' API.
*/
- void BuildRepresentation() VTK_OVERRIDE;
- void GetSize(double size[2]) VTK_OVERRIDE
+ void BuildRepresentation() override;
+ void GetSize(double size[2]) override
{size[0]=6.0; size[1]=2.0;}
//@{
@@ -122,17 +122,17 @@ public:
* These methods are necessary to make this representation behave as
* a vtkProp.
*/
- void GetActors2D(vtkPropCollection*) VTK_OVERRIDE;
- void ReleaseGraphicsResources(vtkWindow*) VTK_OVERRIDE;
- int RenderOverlay(vtkViewport*) VTK_OVERRIDE;
- int RenderOpaqueGeometry(vtkViewport*) VTK_OVERRIDE;
- int RenderTranslucentPolygonalGeometry(vtkViewport*) VTK_OVERRIDE;
- int HasTranslucentPolygonalGeometry() VTK_OVERRIDE;
+ void GetActors2D(vtkPropCollection*) override;
+ void ReleaseGraphicsResources(vtkWindow*) override;
+ int RenderOverlay(vtkViewport*) override;
+ int RenderOpaqueGeometry(vtkViewport*) override;
+ int RenderTranslucentPolygonalGeometry(vtkViewport*) override;
+ int HasTranslucentPolygonalGeometry() override;
//@}
protected:
vtkCameraRepresentation();
- ~vtkCameraRepresentation() VTK_OVERRIDE;
+ ~vtkCameraRepresentation() override;
// the camera and the interpolator
vtkCamera *Camera;
diff --git a/Interaction/Widgets/vtkCameraWidget.h b/Interaction/Widgets/vtkCameraWidget.h
index 5b57fe1413b953c4b6af011fc63552639ae40644..60f5fe1947db7214b01f5948e6be805fb6d77988 100644
--- a/Interaction/Widgets/vtkCameraWidget.h
+++ b/Interaction/Widgets/vtkCameraWidget.h
@@ -51,7 +51,7 @@ public:
* Standar VTK class methods.
*/
vtkTypeMacro(vtkCameraWidget,vtkBorderWidget);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
@@ -65,18 +65,18 @@ public:
/**
* Create the default widget representation if one is not set.
*/
- void CreateDefaultRepresentation() VTK_OVERRIDE;
+ void CreateDefaultRepresentation() override;
protected:
vtkCameraWidget();
- ~vtkCameraWidget() VTK_OVERRIDE;
+ ~vtkCameraWidget() override;
/**
* When selecting the interior of this widget, special operations occur
* (i.e., adding a camera view, deleting a path, animating a path). Thus
* this methods overrides the superclasses' method.
*/
- void SelectRegion(double eventPos[2]) VTK_OVERRIDE;
+ void SelectRegion(double eventPos[2]) override;
private:
vtkCameraWidget(const vtkCameraWidget&) VTK_DELETE_FUNCTION;
diff --git a/Interaction/Widgets/vtkCaptionRepresentation.h b/Interaction/Widgets/vtkCaptionRepresentation.h
index abbdca781a0d17eaf05ed3459f1f70c15919868c..f72a46ba652f07d9a13997851da2798a1c0d41d4 100644
--- a/Interaction/Widgets/vtkCaptionRepresentation.h
+++ b/Interaction/Widgets/vtkCaptionRepresentation.h
@@ -58,7 +58,7 @@ public:
* Standard VTK class methods.
*/
vtkTypeMacro(vtkCaptionRepresentation,vtkBorderRepresentation);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -92,8 +92,8 @@ public:
/**
* Satisfy the superclasses API.
*/
- void BuildRepresentation() VTK_OVERRIDE;
- void GetSize(double size[2]) VTK_OVERRIDE
+ void BuildRepresentation() override;
+ void GetSize(double size[2]) override
{size[0]=2.0; size[1]=2.0;}
//@{
@@ -101,12 +101,12 @@ public:
* These methods are necessary to make this representation behave as
* a vtkProp.
*/
- void GetActors2D(vtkPropCollection*) VTK_OVERRIDE;
- void ReleaseGraphicsResources(vtkWindow*) VTK_OVERRIDE;
- int RenderOverlay(vtkViewport*) VTK_OVERRIDE;
- int RenderOpaqueGeometry(vtkViewport*) VTK_OVERRIDE;
- int RenderTranslucentPolygonalGeometry(vtkViewport*) VTK_OVERRIDE;
- int HasTranslucentPolygonalGeometry() VTK_OVERRIDE;
+ void GetActors2D(vtkPropCollection*) override;
+ void ReleaseGraphicsResources(vtkWindow*) override;
+ int RenderOverlay(vtkViewport*) override;
+ int RenderOpaqueGeometry(vtkViewport*) override;
+ int RenderTranslucentPolygonalGeometry(vtkViewport*) override;
+ int HasTranslucentPolygonalGeometry() override;
//@}
//@{
@@ -120,7 +120,7 @@ public:
protected:
vtkCaptionRepresentation();
- ~vtkCaptionRepresentation() VTK_OVERRIDE;
+ ~vtkCaptionRepresentation() override;
// the text to manage
vtkCaptionActor2D *CaptionActor2D;
diff --git a/Interaction/Widgets/vtkCaptionWidget.cxx b/Interaction/Widgets/vtkCaptionWidget.cxx
index d7c10889b9788323d2bec1ee2756788091725986..b21b30c7011126f4a12aa247e5eeae584dc6942f 100644
--- a/Interaction/Widgets/vtkCaptionWidget.cxx
+++ b/Interaction/Widgets/vtkCaptionWidget.cxx
@@ -33,7 +33,7 @@ class vtkCaptionAnchorCallback : public vtkCommand
public:
static vtkCaptionAnchorCallback *New()
{ return new vtkCaptionAnchorCallback; }
- void Execute(vtkObject*, unsigned long eventId, void*) VTK_OVERRIDE
+ void Execute(vtkObject*, unsigned long eventId, void*) override
{
switch (eventId)
{
diff --git a/Interaction/Widgets/vtkCaptionWidget.h b/Interaction/Widgets/vtkCaptionWidget.h
index d6acc79450ec6cb6b51953cea5ce37ce89ae2146..483d0de1ac65d58f81547277b9116d57fc9f5a28 100644
--- a/Interaction/Widgets/vtkCaptionWidget.h
+++ b/Interaction/Widgets/vtkCaptionWidget.h
@@ -61,14 +61,14 @@ public:
* Standard VTK class methods.
*/
vtkTypeMacro(vtkCaptionWidget,vtkBorderWidget);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
* Override superclasses' SetEnabled() method because the caption leader
* has its own dedicated widget.
*/
- void SetEnabled(int enabling) VTK_OVERRIDE;
+ void SetEnabled(int enabling) override;
/**
* Specify an instance of vtkWidgetRepresentation used to represent this
@@ -91,11 +91,11 @@ public:
/**
* Create the default widget representation if one is not set.
*/
- void CreateDefaultRepresentation() VTK_OVERRIDE;
+ void CreateDefaultRepresentation() override;
protected:
vtkCaptionWidget();
- ~vtkCaptionWidget() VTK_OVERRIDE;
+ ~vtkCaptionWidget() override;
// Handles callbacks from the anchor point
vtkCaptionAnchorCallback *AnchorCallback;
diff --git a/Interaction/Widgets/vtkCellCentersPointPlacer.h b/Interaction/Widgets/vtkCellCentersPointPlacer.h
index a67153b626e21931f238655104736bb465708c4e..07ca7e1d6bdb1d1564b1b2bc2c501cbe4b8fc50c 100644
--- a/Interaction/Widgets/vtkCellCentersPointPlacer.h
+++ b/Interaction/Widgets/vtkCellCentersPointPlacer.h
@@ -59,7 +59,7 @@ public:
* Standard methods for instances of this class.
*/
vtkTypeMacro(vtkCellCentersPointPlacer,vtkPointPlacer);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
// Descuription:
@@ -82,7 +82,7 @@ public:
int ComputeWorldPosition( vtkRenderer *ren,
double displayPos[2],
double worldPos[3],
- double worldOrient[9] ) VTK_OVERRIDE;
+ double worldOrient[9] ) override;
/**
* Given a renderer, a display position, and a reference world
@@ -94,25 +94,25 @@ public:
double displayPos[2],
double refWorldPos[3],
double worldPos[3],
- double worldOrient[9] ) VTK_OVERRIDE;
+ double worldOrient[9] ) override;
/**
* Given a world position check the validity of this
* position according to the constraints of the placer
*/
- int ValidateWorldPosition( double worldPos[3] ) VTK_OVERRIDE;
+ int ValidateWorldPosition( double worldPos[3] ) override;
/**
* Given a display position, check the validity of this position.
*/
- int ValidateDisplayPosition( vtkRenderer *, double displayPos[2] ) VTK_OVERRIDE;
+ int ValidateDisplayPosition( vtkRenderer *, double displayPos[2] ) override;
/**
* Given a world position and a world orientation,
* validate it according to the constraints of the placer.
*/
int ValidateWorldPosition( double worldPos[3],
- double worldOrient[9] ) VTK_OVERRIDE;
+ double worldOrient[9] ) override;
//@{
/**
@@ -141,7 +141,7 @@ public:
protected:
vtkCellCentersPointPlacer();
- ~vtkCellCentersPointPlacer() VTK_OVERRIDE;
+ ~vtkCellCentersPointPlacer() override;
// The props that represents the terrain data (one or more) in a rendered
// scene
diff --git a/Interaction/Widgets/vtkCenteredSliderRepresentation.h b/Interaction/Widgets/vtkCenteredSliderRepresentation.h
index abbc3ca7a8f1641fa9da9b2421c3ad9a6fa39ba8..4ab0cfde19681b471c1b4ec8d92a843435de8603 100644
--- a/Interaction/Widgets/vtkCenteredSliderRepresentation.h
+++ b/Interaction/Widgets/vtkCenteredSliderRepresentation.h
@@ -71,7 +71,7 @@ public:
*/
vtkTypeMacro(vtkCenteredSliderRepresentation,
vtkSliderRepresentation);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
@@ -99,8 +99,8 @@ public:
* Specify the label text for this widget. If the value is not set, or set
* to the empty string "", then the label text is not displayed.
*/
- void SetTitleText(const char*) VTK_OVERRIDE;
- const char* GetTitleText() VTK_OVERRIDE;
+ void SetTitleText(const char*) override;
+ const char* GetTitleText() override;
//@}
//@{
@@ -132,27 +132,27 @@ public:
* assumes that the parameter bounds[6] specifies the location in display
* space where the widget should be placed.
*/
- void PlaceWidget(double bounds[6]) VTK_OVERRIDE;
- void BuildRepresentation() VTK_OVERRIDE;
- void StartWidgetInteraction(double eventPos[2]) VTK_OVERRIDE;
- int ComputeInteractionState(int X, int Y, int modify=0) VTK_OVERRIDE;
- void WidgetInteraction(double eventPos[2]) VTK_OVERRIDE;
- void Highlight(int) VTK_OVERRIDE;
+ void PlaceWidget(double bounds[6]) override;
+ void BuildRepresentation() override;
+ void StartWidgetInteraction(double eventPos[2]) override;
+ int ComputeInteractionState(int X, int Y, int modify=0) override;
+ void WidgetInteraction(double eventPos[2]) override;
+ void Highlight(int) override;
//@}
//@{
/**
* Methods supporting the rendering process.
*/
- void GetActors(vtkPropCollection*) VTK_OVERRIDE;
- void ReleaseGraphicsResources(vtkWindow*) VTK_OVERRIDE;
- int RenderOverlay(vtkViewport*) VTK_OVERRIDE;
- int RenderOpaqueGeometry(vtkViewport*) VTK_OVERRIDE;
+ void GetActors(vtkPropCollection*) override;
+ void ReleaseGraphicsResources(vtkWindow*) override;
+ int RenderOverlay(vtkViewport*) override;
+ int RenderOpaqueGeometry(vtkViewport*) override;
//@}
protected:
vtkCenteredSliderRepresentation();
- ~vtkCenteredSliderRepresentation() VTK_OVERRIDE;
+ ~vtkCenteredSliderRepresentation() override;
// Positioning the widget
vtkCoordinate *Point1Coordinate;
diff --git a/Interaction/Widgets/vtkCenteredSliderWidget.h b/Interaction/Widgets/vtkCenteredSliderWidget.h
index b2f03958b818b902e825881c1e390a95385c4eb1..05fedff108fcf99362dc3240d26d37d5dfaa7f81 100644
--- a/Interaction/Widgets/vtkCenteredSliderWidget.h
+++ b/Interaction/Widgets/vtkCenteredSliderWidget.h
@@ -90,7 +90,7 @@ public:
* Standard macros.
*/
vtkTypeMacro(vtkCenteredSliderWidget,vtkAbstractWidget);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
@@ -110,7 +110,7 @@ public:
/**
* Create the default widget representation if one is not set.
*/
- void CreateDefaultRepresentation() VTK_OVERRIDE;
+ void CreateDefaultRepresentation() override;
/**
* Get the value fo this widget.
@@ -119,7 +119,7 @@ public:
protected:
vtkCenteredSliderWidget();
- ~vtkCenteredSliderWidget() VTK_OVERRIDE {}
+ ~vtkCenteredSliderWidget() override {}
// These are the events that are handled
static void SelectAction(vtkAbstractWidget*);
diff --git a/Interaction/Widgets/vtkCheckerboardRepresentation.h b/Interaction/Widgets/vtkCheckerboardRepresentation.h
index d129b816fda59ba0ba7f3dcdaa2d07f90f120b8e..8141b411aabdfc1284550f17b6064e17e28265c3 100644
--- a/Interaction/Widgets/vtkCheckerboardRepresentation.h
+++ b/Interaction/Widgets/vtkCheckerboardRepresentation.h
@@ -53,7 +53,7 @@ public:
* Standard VTK methods.
*/
vtkTypeMacro(vtkCheckerboardRepresentation,vtkWidgetRepresentation);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -115,18 +115,18 @@ public:
/**
* Methods required by superclass.
*/
- void BuildRepresentation() VTK_OVERRIDE;
- void GetActors(vtkPropCollection*) VTK_OVERRIDE;
- void ReleaseGraphicsResources(vtkWindow *w) VTK_OVERRIDE;
- int RenderOverlay(vtkViewport *viewport) VTK_OVERRIDE;
- int RenderOpaqueGeometry(vtkViewport *viewport) VTK_OVERRIDE;
- int RenderTranslucentPolygonalGeometry(vtkViewport *viewport) VTK_OVERRIDE;
- int HasTranslucentPolygonalGeometry() VTK_OVERRIDE;
+ void BuildRepresentation() override;
+ void GetActors(vtkPropCollection*) override;
+ void ReleaseGraphicsResources(vtkWindow *w) override;
+ int RenderOverlay(vtkViewport *viewport) override;
+ int RenderOpaqueGeometry(vtkViewport *viewport) override;
+ int RenderTranslucentPolygonalGeometry(vtkViewport *viewport) override;
+ int HasTranslucentPolygonalGeometry() override;
//@}
protected:
vtkCheckerboardRepresentation();
- ~vtkCheckerboardRepresentation() VTK_OVERRIDE;
+ ~vtkCheckerboardRepresentation() override;
// Instances that this class manipulates
vtkImageCheckerboard *Checkerboard;
diff --git a/Interaction/Widgets/vtkCheckerboardWidget.cxx b/Interaction/Widgets/vtkCheckerboardWidget.cxx
index a3f78c8ea0ddc674dd456fac8128096a21ebd90b..335e4ade208965b00197eaaf6a40f86489b171e6 100644
--- a/Interaction/Widgets/vtkCheckerboardWidget.cxx
+++ b/Interaction/Widgets/vtkCheckerboardWidget.cxx
@@ -33,7 +33,7 @@ class vtkCWCallback : public vtkCommand
public:
static vtkCWCallback *New()
{ return new vtkCWCallback; }
- void Execute(vtkObject *, unsigned long eventId, void*) VTK_OVERRIDE
+ void Execute(vtkObject *, unsigned long eventId, void*) override
{
switch (eventId)
{
diff --git a/Interaction/Widgets/vtkCheckerboardWidget.h b/Interaction/Widgets/vtkCheckerboardWidget.h
index b7b9bd3cfe57738799a744a8586bfc397a66fd52..c919ce215046cac5f0d8e5d92bd9413072dc6004 100644
--- a/Interaction/Widgets/vtkCheckerboardWidget.h
+++ b/Interaction/Widgets/vtkCheckerboardWidget.h
@@ -66,7 +66,7 @@ public:
* Standard methods for a VTK class.
*/
vtkTypeMacro(vtkCheckerboardWidget,vtkAbstractWidget);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
@@ -74,7 +74,7 @@ public:
* must be overridden because it is a composite widget and does more than
* its superclasses' vtkAbstractWidget::SetEnabled() method.
*/
- void SetEnabled(int) VTK_OVERRIDE;
+ void SetEnabled(int) override;
/**
* Specify an instance of vtkWidgetRepresentation used to represent this
@@ -93,11 +93,11 @@ public:
/**
* Create the default widget representation if one is not set.
*/
- void CreateDefaultRepresentation() VTK_OVERRIDE;
+ void CreateDefaultRepresentation() override;
protected:
vtkCheckerboardWidget();
- ~vtkCheckerboardWidget() VTK_OVERRIDE;
+ ~vtkCheckerboardWidget() override;
// The four slider widgets
vtkSliderWidget *TopSlider;
diff --git a/Interaction/Widgets/vtkClosedSurfacePointPlacer.h b/Interaction/Widgets/vtkClosedSurfacePointPlacer.h
index 90adf0c2d2d319c8ce011add5ed3ceb4690a8450..40fb1bb0a61febbf81ddfef0dbe10355ec35b9a2 100644
--- a/Interaction/Widgets/vtkClosedSurfacePointPlacer.h
+++ b/Interaction/Widgets/vtkClosedSurfacePointPlacer.h
@@ -49,7 +49,7 @@ public:
* Standard methods for instances of this class.
*/
vtkTypeMacro(vtkClosedSurfacePointPlacer,vtkPointPlacer);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -86,7 +86,7 @@ public:
int ComputeWorldPosition( vtkRenderer *ren,
double displayPos[2],
double worldPos[3],
- double worldOrient[9] ) VTK_OVERRIDE;
+ double worldOrient[9] ) override;
/**
* Given a renderer, a display position and a reference position, "worldPos"
@@ -103,20 +103,20 @@ public:
double displayPos[2],
double refWorldPos[2],
double worldPos[3],
- double worldOrient[9] ) VTK_OVERRIDE;
+ double worldOrient[9] ) override;
/**
* Give a world position check if it is valid - does
* it lie on the plane and within the bounds? Returns
* 1 if it is valid, 0 otherwise.
*/
- int ValidateWorldPosition( double worldPos[3] ) VTK_OVERRIDE;
+ int ValidateWorldPosition( double worldPos[3] ) override;
// Descrption:
// Orientationation is ignored, and the above method
// is called instead.
int ValidateWorldPosition( double worldPos[3],
- double worldOrient[9]) VTK_OVERRIDE;
+ double worldOrient[9]) override;
// Descrption:
// The minimum distance the object should be from the faces of the object.
@@ -126,7 +126,7 @@ public:
protected:
vtkClosedSurfacePointPlacer();
- ~vtkClosedSurfacePointPlacer() VTK_OVERRIDE;
+ ~vtkClosedSurfacePointPlacer() override;
// A collection of planes used to bound the projection
// plane
diff --git a/Interaction/Widgets/vtkConstrainedPointHandleRepresentation.h b/Interaction/Widgets/vtkConstrainedPointHandleRepresentation.h
index 11f9616403b88501dad38f8a55622c357d3ce397..a9dc215e7f004fb36007b1d4c1aee035b90e0800 100644
--- a/Interaction/Widgets/vtkConstrainedPointHandleRepresentation.h
+++ b/Interaction/Widgets/vtkConstrainedPointHandleRepresentation.h
@@ -65,7 +65,7 @@ public:
* Standard methods for instances of this class.
*/
vtkTypeMacro(vtkConstrainedPointHandleRepresentation,vtkHandleRepresentation);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -152,7 +152,7 @@ public:
* co-ordinates to world co-ordinates. It returns 1 if the point lies
* within the constrained region, otherwise return 0
*/
- int CheckConstraint(vtkRenderer *renderer, double pos[2]) VTK_OVERRIDE;
+ int CheckConstraint(vtkRenderer *renderer, double pos[2]) override;
//@{
/**
@@ -196,39 +196,39 @@ public:
* are the methods that the widget and its representation use to
* communicate with each other.
*/
- void SetRenderer(vtkRenderer *ren) VTK_OVERRIDE;
- void BuildRepresentation() VTK_OVERRIDE;
- void StartWidgetInteraction(double eventPos[2]) VTK_OVERRIDE;
- void WidgetInteraction(double eventPos[2]) VTK_OVERRIDE;
- int ComputeInteractionState(int X, int Y, int modify) VTK_OVERRIDE;
+ void SetRenderer(vtkRenderer *ren) override;
+ void BuildRepresentation() override;
+ void StartWidgetInteraction(double eventPos[2]) override;
+ void WidgetInteraction(double eventPos[2]) override;
+ int ComputeInteractionState(int X, int Y, int modify) override;
//@}
/**
* Method overridden from Superclass. computes the world
* co-ordinates using GetIntersectionPosition()
*/
- void SetDisplayPosition(double pos[3]) VTK_OVERRIDE;
+ void SetDisplayPosition(double pos[3]) override;
//@{
/**
* Methods to make this class behave as a vtkProp.
*/
- void GetActors(vtkPropCollection *) VTK_OVERRIDE;
- void ReleaseGraphicsResources(vtkWindow *) VTK_OVERRIDE;
- int RenderOverlay(vtkViewport *viewport) VTK_OVERRIDE;
- int RenderOpaqueGeometry(vtkViewport *viewport) VTK_OVERRIDE;
- int RenderTranslucentPolygonalGeometry(vtkViewport *viewport) VTK_OVERRIDE;
- int HasTranslucentPolygonalGeometry() VTK_OVERRIDE;
- void ShallowCopy(vtkProp* prop) VTK_OVERRIDE;
+ void GetActors(vtkPropCollection *) override;
+ void ReleaseGraphicsResources(vtkWindow *) override;
+ int RenderOverlay(vtkViewport *viewport) override;
+ int RenderOpaqueGeometry(vtkViewport *viewport) override;
+ int RenderTranslucentPolygonalGeometry(vtkViewport *viewport) override;
+ int HasTranslucentPolygonalGeometry() override;
+ void ShallowCopy(vtkProp* prop) override;
//@}
enum {XAxis=0,YAxis,ZAxis,Oblique};
- void Highlight(int highlight) VTK_OVERRIDE;
+ void Highlight(int highlight) override;
protected:
vtkConstrainedPointHandleRepresentation();
- ~vtkConstrainedPointHandleRepresentation() VTK_OVERRIDE;
+ ~vtkConstrainedPointHandleRepresentation() override;
// Render the cursor
vtkActor *Actor;
diff --git a/Interaction/Widgets/vtkContinuousValueWidget.h b/Interaction/Widgets/vtkContinuousValueWidget.h
index fbc23a98cbc6a1a4dc542c9232e6687f69a7bd29..a09bbb6eb2464874ebf0ba452d7d05b313182f2a 100644
--- a/Interaction/Widgets/vtkContinuousValueWidget.h
+++ b/Interaction/Widgets/vtkContinuousValueWidget.h
@@ -78,7 +78,7 @@ public:
* Standard macros.
*/
vtkTypeMacro(vtkContinuousValueWidget,vtkAbstractWidget);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
@@ -106,7 +106,7 @@ public:
protected:
vtkContinuousValueWidget();
- ~vtkContinuousValueWidget() VTK_OVERRIDE {}
+ ~vtkContinuousValueWidget() override {}
// These are the events that are handled
static void SelectAction(vtkAbstractWidget*);
diff --git a/Interaction/Widgets/vtkContinuousValueWidgetRepresentation.h b/Interaction/Widgets/vtkContinuousValueWidgetRepresentation.h
index 4e4b89ae3ae76a0cb26d7650f37969f964ab004b..c1ee00d0542a20e35228a5210c44a0da0593154b 100644
--- a/Interaction/Widgets/vtkContinuousValueWidgetRepresentation.h
+++ b/Interaction/Widgets/vtkContinuousValueWidgetRepresentation.h
@@ -43,7 +43,7 @@ public:
*/
vtkTypeMacro(vtkContinuousValueWidgetRepresentation,
vtkWidgetRepresentation);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -52,10 +52,10 @@ public:
* assumes that the parameter bounds[6] specifies the location in display
* space where the widget should be placed.
*/
- void PlaceWidget(double bounds[6]) VTK_OVERRIDE;
- void BuildRepresentation() VTK_OVERRIDE {}
- void StartWidgetInteraction(double eventPos[2]) VTK_OVERRIDE = 0;
- void WidgetInteraction(double eventPos[2]) VTK_OVERRIDE = 0;
+ void PlaceWidget(double bounds[6]) override;
+ void BuildRepresentation() override {}
+ void StartWidgetInteraction(double eventPos[2]) override = 0;
+ void WidgetInteraction(double eventPos[2]) override = 0;
// virtual void Highlight(int);
//@}
@@ -73,7 +73,7 @@ public:
protected:
vtkContinuousValueWidgetRepresentation();
- ~vtkContinuousValueWidgetRepresentation() VTK_OVERRIDE;
+ ~vtkContinuousValueWidgetRepresentation() override;
double Value;
diff --git a/Interaction/Widgets/vtkContourLineInterpolator.h b/Interaction/Widgets/vtkContourLineInterpolator.h
index 8b9062a04952b0a85970fc0ad441c09d7b47b71d..c93a842149aec71539cd8d60d70f4990e447c1a4 100644
--- a/Interaction/Widgets/vtkContourLineInterpolator.h
+++ b/Interaction/Widgets/vtkContourLineInterpolator.h
@@ -47,7 +47,7 @@ public:
* Standard methods for instances of this class.
*/
vtkTypeMacro(vtkContourLineInterpolator,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
@@ -90,7 +90,7 @@ public:
protected:
vtkContourLineInterpolator();
- ~vtkContourLineInterpolator() VTK_OVERRIDE;
+ ~vtkContourLineInterpolator() override;
private:
vtkContourLineInterpolator(const vtkContourLineInterpolator&) VTK_DELETE_FUNCTION;
diff --git a/Interaction/Widgets/vtkContourRepresentation.h b/Interaction/Widgets/vtkContourRepresentation.h
index 75db6a19cfaa1597320765571e25e1fd78040656..19dc9a923441fc8f8699d6afeb03b161fba59d11 100644
--- a/Interaction/Widgets/vtkContourRepresentation.h
+++ b/Interaction/Widgets/vtkContourRepresentation.h
@@ -123,7 +123,7 @@ public:
* Standard VTK methods.
*/
vtkTypeMacro(vtkContourRepresentation,vtkWidgetRepresentation);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -412,21 +412,21 @@ public:
/**
* These are methods that satisfy vtkWidgetRepresentation's API.
*/
- void BuildRepresentation() VTK_OVERRIDE =0;
- int ComputeInteractionState(int X, int Y, int modified=0) VTK_OVERRIDE =0;
- void StartWidgetInteraction(double e[2]) VTK_OVERRIDE =0;
- void WidgetInteraction(double e[2]) VTK_OVERRIDE =0;
+ void BuildRepresentation() override =0;
+ int ComputeInteractionState(int X, int Y, int modified=0) override =0;
+ void StartWidgetInteraction(double e[2]) override =0;
+ void WidgetInteraction(double e[2]) override =0;
//@}
//@{
/**
* Methods required by vtkProp superclass.
*/
- void ReleaseGraphicsResources(vtkWindow *w) VTK_OVERRIDE =0;
- int RenderOverlay(vtkViewport *viewport) VTK_OVERRIDE =0;
- int RenderOpaqueGeometry(vtkViewport *viewport) VTK_OVERRIDE =0;
- int RenderTranslucentPolygonalGeometry(vtkViewport *viewport) VTK_OVERRIDE =0;
- int HasTranslucentPolygonalGeometry() VTK_OVERRIDE =0;
+ void ReleaseGraphicsResources(vtkWindow *w) override =0;
+ int RenderOverlay(vtkViewport *viewport) override =0;
+ int RenderOpaqueGeometry(vtkViewport *viewport) override =0;
+ int RenderTranslucentPolygonalGeometry(vtkViewport *viewport) override =0;
+ int HasTranslucentPolygonalGeometry() override =0;
//@}
//@{
@@ -464,7 +464,7 @@ public:
protected:
vtkContourRepresentation();
- ~vtkContourRepresentation() VTK_OVERRIDE;
+ ~vtkContourRepresentation() override;
// Selection tolerance for the handles
int PixelTolerance;
diff --git a/Interaction/Widgets/vtkContourWidget.h b/Interaction/Widgets/vtkContourWidget.h
index f854a753e53792d98014011002a6573c10c226bd..a97a1650a5d5d76f528708e91d09b3ffadc87bad 100644
--- a/Interaction/Widgets/vtkContourWidget.h
+++ b/Interaction/Widgets/vtkContourWidget.h
@@ -143,7 +143,7 @@ public:
* Standard methods for a VTK class.
*/
vtkTypeMacro(vtkContourWidget,vtkAbstractWidget);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
@@ -151,7 +151,7 @@ public:
* must be overridden because it is a composite widget and does more than
* its superclasses' vtkAbstractWidget::SetEnabled() method.
*/
- void SetEnabled(int) VTK_OVERRIDE;
+ void SetEnabled(int) override;
/**
* Specify an instance of vtkWidgetRepresentation used to represent this
@@ -170,7 +170,7 @@ public:
/**
* Create the default widget representation if one is not set.
*/
- void CreateDefaultRepresentation() VTK_OVERRIDE;
+ void CreateDefaultRepresentation() override;
/**
* Convenient method to close the contour loop.
@@ -248,7 +248,7 @@ public:
protected:
vtkContourWidget();
- ~vtkContourWidget() VTK_OVERRIDE;
+ ~vtkContourWidget() override;
int WidgetState;
int CurrentHandle;
diff --git a/Interaction/Widgets/vtkCurveRepresentation.h b/Interaction/Widgets/vtkCurveRepresentation.h
index 46da8286f4b6f8208839ba8bcb9379166f95e189..96211dbea4b0100912db1e24f9567c1715c9dcf9 100644
--- a/Interaction/Widgets/vtkCurveRepresentation.h
+++ b/Interaction/Widgets/vtkCurveRepresentation.h
@@ -50,7 +50,7 @@ class VTKINTERACTIONWIDGETS_EXPORT vtkCurveRepresentation : public vtkWidgetRepr
{
public:
vtkTypeMacro(vtkCurveRepresentation, vtkWidgetRepresentation);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
// Used to manage the InteractionState of the widget
enum _InteractionState {
@@ -201,23 +201,23 @@ public:
* API. Note that a version of place widget is available where the
* center and handle position are specified.
*/
- void BuildRepresentation() VTK_OVERRIDE = 0;
- int ComputeInteractionState(int X, int Y, int modify=0) VTK_OVERRIDE;
- void StartWidgetInteraction(double e[2]) VTK_OVERRIDE;
- void WidgetInteraction(double e[2]) VTK_OVERRIDE;
- void EndWidgetInteraction(double e[2]) VTK_OVERRIDE;
- double *GetBounds() VTK_OVERRIDE;
+ void BuildRepresentation() override = 0;
+ int ComputeInteractionState(int X, int Y, int modify=0) override;
+ void StartWidgetInteraction(double e[2]) override;
+ void WidgetInteraction(double e[2]) override;
+ void EndWidgetInteraction(double e[2]) override;
+ double *GetBounds() override;
//@}
//@{
/**
* Methods supporting, and required by, the rendering process.
*/
- void ReleaseGraphicsResources(vtkWindow*) VTK_OVERRIDE;
- int RenderOpaqueGeometry(vtkViewport*) VTK_OVERRIDE;
- int RenderTranslucentPolygonalGeometry(vtkViewport*) VTK_OVERRIDE;
- int RenderOverlay(vtkViewport*) VTK_OVERRIDE;
- int HasTranslucentPolygonalGeometry() VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow*) override;
+ int RenderOpaqueGeometry(vtkViewport*) override;
+ int RenderTranslucentPolygonalGeometry(vtkViewport*) override;
+ int RenderOverlay(vtkViewport*) override;
+ int HasTranslucentPolygonalGeometry() override;
//@}
/**
@@ -228,7 +228,7 @@ public:
protected:
vtkCurveRepresentation();
- ~vtkCurveRepresentation() VTK_OVERRIDE;
+ ~vtkCurveRepresentation() override;
double LastEventPosition[3];
double Bounds[6];
@@ -268,7 +268,7 @@ protected:
int CurrentHandleIndex;
// Register internal Pickers within PickingManager
- void RegisterPickers() VTK_OVERRIDE;
+ void RegisterPickers() override;
// Methods to manipulate the curve.
void MovePoint(double *p1, double *p2);
diff --git a/Interaction/Widgets/vtkDijkstraImageContourLineInterpolator.h b/Interaction/Widgets/vtkDijkstraImageContourLineInterpolator.h
index 27dc27f4cd61c3235654e68c642b059629710da6..09dd557acebf9f51baa726284fd5664c93f02bee 100644
--- a/Interaction/Widgets/vtkDijkstraImageContourLineInterpolator.h
+++ b/Interaction/Widgets/vtkDijkstraImageContourLineInterpolator.h
@@ -54,7 +54,7 @@ public:
*/
vtkTypeMacro(vtkDijkstraImageContourLineInterpolator,
vtkContourLineInterpolator);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
static vtkDijkstraImageContourLineInterpolator *New();
@@ -66,7 +66,7 @@ public:
*/
int InterpolateLine( vtkRenderer *ren,
vtkContourRepresentation *rep,
- int idx1, int idx2 ) VTK_OVERRIDE;
+ int idx1, int idx2 ) override;
//@{
/**
@@ -87,7 +87,7 @@ public:
protected:
vtkDijkstraImageContourLineInterpolator();
- ~vtkDijkstraImageContourLineInterpolator() VTK_OVERRIDE;
+ ~vtkDijkstraImageContourLineInterpolator() override;
vtkImageData *CostImage;
vtkDijkstraImageGeodesicPath *DijkstraImageGeodesicPath;
diff --git a/Interaction/Widgets/vtkDistanceRepresentation.h b/Interaction/Widgets/vtkDistanceRepresentation.h
index 13c3aa41b105d1728b859fdb46b8d89fe232ea0b..9ec23c694ba97c25b191a780074d2a65b2567c44 100644
--- a/Interaction/Widgets/vtkDistanceRepresentation.h
+++ b/Interaction/Widgets/vtkDistanceRepresentation.h
@@ -41,7 +41,7 @@ public:
* Standard VTK methods.
*/
vtkTypeMacro(vtkDistanceRepresentation,vtkWidgetRepresentation);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
@@ -165,27 +165,27 @@ public:
/**
* These are methods that satisfy vtkWidgetRepresentation's API.
*/
- void BuildRepresentation() VTK_OVERRIDE;
- int ComputeInteractionState(int X, int Y, int modify=0) VTK_OVERRIDE;
- void StartWidgetInteraction(double e[2]) VTK_OVERRIDE;
- void WidgetInteraction(double e[2]) VTK_OVERRIDE;
+ void BuildRepresentation() override;
+ int ComputeInteractionState(int X, int Y, int modify=0) override;
+ void StartWidgetInteraction(double e[2]) override;
+ void WidgetInteraction(double e[2]) override;
void StartComplexInteraction(
vtkRenderWindowInteractor *iren,
vtkAbstractWidget *widget,
- unsigned long event, void *calldata) VTK_OVERRIDE;
+ unsigned long event, void *calldata) override;
void ComplexInteraction(
vtkRenderWindowInteractor *iren,
vtkAbstractWidget *widget,
- unsigned long event, void *calldata) VTK_OVERRIDE;
+ unsigned long event, void *calldata) override;
int ComputeComplexInteractionState(
vtkRenderWindowInteractor *iren,
vtkAbstractWidget *widget,
- unsigned long event, void *calldata, int modify = 0) VTK_OVERRIDE;
+ unsigned long event, void *calldata, int modify = 0) override;
//@}
protected:
vtkDistanceRepresentation();
- ~vtkDistanceRepresentation() VTK_OVERRIDE;
+ ~vtkDistanceRepresentation() override;
// The handle and the rep used to close the handles
vtkHandleRepresentation *HandleRepresentation;
diff --git a/Interaction/Widgets/vtkDistanceRepresentation2D.h b/Interaction/Widgets/vtkDistanceRepresentation2D.h
index ef687c8726a2dd5b18aa343a27a30e6106916049..943174b72b1232b6f75334b820b2ca7151d6b9f0 100644
--- a/Interaction/Widgets/vtkDistanceRepresentation2D.h
+++ b/Interaction/Widgets/vtkDistanceRepresentation2D.h
@@ -51,13 +51,13 @@ public:
* Standard VTK methods.
*/
vtkTypeMacro(vtkDistanceRepresentation2D,vtkDistanceRepresentation);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
* Satisfy the superclasses API.
*/
- double GetDistance() VTK_OVERRIDE
+ double GetDistance() override
{return this->Distance;}
//@{
@@ -66,18 +66,18 @@ public:
* this representation. Note that methods are available for both
* display and world coordinates.
*/
- double* GetPoint1WorldPosition() VTK_OVERRIDE;
- double* GetPoint2WorldPosition() VTK_OVERRIDE;
- void GetPoint1WorldPosition(double pos[3]) VTK_OVERRIDE;
- void GetPoint2WorldPosition(double pos[3]) VTK_OVERRIDE;
- void SetPoint1WorldPosition(double pos[3]) VTK_OVERRIDE;
- void SetPoint2WorldPosition(double pos[3]) VTK_OVERRIDE;
+ double* GetPoint1WorldPosition() override;
+ double* GetPoint2WorldPosition() override;
+ void GetPoint1WorldPosition(double pos[3]) override;
+ void GetPoint2WorldPosition(double pos[3]) override;
+ void SetPoint1WorldPosition(double pos[3]) override;
+ void SetPoint2WorldPosition(double pos[3]) override;
//@}
- void SetPoint1DisplayPosition(double pos[3]) VTK_OVERRIDE;
- void SetPoint2DisplayPosition(double pos[3]) VTK_OVERRIDE;
- void GetPoint1DisplayPosition(double pos[3]) VTK_OVERRIDE;
- void GetPoint2DisplayPosition(double pos[3]) VTK_OVERRIDE;
+ void SetPoint1DisplayPosition(double pos[3]) override;
+ void SetPoint2DisplayPosition(double pos[3]) override;
+ void GetPoint1DisplayPosition(double pos[3]) override;
+ void GetPoint2DisplayPosition(double pos[3]) override;
//@{
/**
@@ -92,20 +92,20 @@ public:
/**
* Method to satisfy superclasses' API.
*/
- void BuildRepresentation() VTK_OVERRIDE;
+ void BuildRepresentation() override;
//@{
/**
* Methods required by vtkProp superclass.
*/
- void ReleaseGraphicsResources(vtkWindow *w) VTK_OVERRIDE;
- int RenderOverlay(vtkViewport *viewport) VTK_OVERRIDE;
- int RenderOpaqueGeometry(vtkViewport *viewport) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *w) override;
+ int RenderOverlay(vtkViewport *viewport) override;
+ int RenderOpaqueGeometry(vtkViewport *viewport) override;
//@}
protected:
vtkDistanceRepresentation2D();
- ~vtkDistanceRepresentation2D() VTK_OVERRIDE;
+ ~vtkDistanceRepresentation2D() override;
// Add a line to the mix
vtkAxisActor2D *AxisActor;
diff --git a/Interaction/Widgets/vtkDistanceRepresentation3D.h b/Interaction/Widgets/vtkDistanceRepresentation3D.h
index 48a62c0d1b41a993c683700c405640498ba88ff3..cc1b68d408c8b036ede194205b3ba9c036b26780 100644
--- a/Interaction/Widgets/vtkDistanceRepresentation3D.h
+++ b/Interaction/Widgets/vtkDistanceRepresentation3D.h
@@ -59,13 +59,13 @@ public:
* Standard VTK methods.
*/
vtkTypeMacro(vtkDistanceRepresentation3D,vtkDistanceRepresentation);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
* Satisfy the superclasses API.
*/
- double GetDistance() VTK_OVERRIDE
+ double GetDistance() override
{return this->Distance;}
//@{
@@ -122,34 +122,34 @@ public:
* this representation. Note that methods are available for both
* display and world coordinates.
*/
- double* GetPoint1WorldPosition() VTK_OVERRIDE;
- double* GetPoint2WorldPosition() VTK_OVERRIDE;
- void GetPoint1WorldPosition(double pos[3]) VTK_OVERRIDE;
- void GetPoint2WorldPosition(double pos[3]) VTK_OVERRIDE;
- void SetPoint1WorldPosition(double pos[3]) VTK_OVERRIDE;
- void SetPoint2WorldPosition(double pos[3]) VTK_OVERRIDE;
+ double* GetPoint1WorldPosition() override;
+ double* GetPoint2WorldPosition() override;
+ void GetPoint1WorldPosition(double pos[3]) override;
+ void GetPoint2WorldPosition(double pos[3]) override;
+ void SetPoint1WorldPosition(double pos[3]) override;
+ void SetPoint2WorldPosition(double pos[3]) override;
//@}
- void SetPoint1DisplayPosition(double pos[3]) VTK_OVERRIDE;
- void SetPoint2DisplayPosition(double pos[3]) VTK_OVERRIDE;
- void GetPoint1DisplayPosition(double pos[3]) VTK_OVERRIDE;
- void GetPoint2DisplayPosition(double pos[3]) VTK_OVERRIDE;
+ void SetPoint1DisplayPosition(double pos[3]) override;
+ void SetPoint2DisplayPosition(double pos[3]) override;
+ void GetPoint1DisplayPosition(double pos[3]) override;
+ void GetPoint2DisplayPosition(double pos[3]) override;
//@{
/**
* Method to satisfy superclasses' API.
*/
- void BuildRepresentation() VTK_OVERRIDE;
- double *GetBounds() VTK_OVERRIDE;
+ void BuildRepresentation() override;
+ double *GetBounds() override;
//@}
//@{
/**
* Methods required by vtkProp superclass.
*/
- void ReleaseGraphicsResources(vtkWindow *w) VTK_OVERRIDE;
- int RenderOpaqueGeometry(vtkViewport *viewport) VTK_OVERRIDE;
- int RenderTranslucentPolygonalGeometry(vtkViewport *viewport) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *w) override;
+ int RenderOpaqueGeometry(vtkViewport *viewport) override;
+ int RenderTranslucentPolygonalGeometry(vtkViewport *viewport) override;
//@}
//@{
@@ -176,7 +176,7 @@ public:
protected:
vtkDistanceRepresentation3D();
- ~vtkDistanceRepresentation3D() VTK_OVERRIDE;
+ ~vtkDistanceRepresentation3D() override;
// The line
vtkPoints *LinePoints;
diff --git a/Interaction/Widgets/vtkDistanceWidget.cxx b/Interaction/Widgets/vtkDistanceWidget.cxx
index 58448bbac62dc07d4d5d942c9dccae773860e15f..45c4c4c95efd2f8cf0d777e9b7b41734815bfe1f 100644
--- a/Interaction/Widgets/vtkDistanceWidget.cxx
+++ b/Interaction/Widgets/vtkDistanceWidget.cxx
@@ -38,7 +38,7 @@ class vtkDistanceWidgetCallback : public vtkCommand
public:
static vtkDistanceWidgetCallback *New()
{ return new vtkDistanceWidgetCallback; }
- void Execute(vtkObject*, unsigned long eventId, void*) VTK_OVERRIDE
+ void Execute(vtkObject*, unsigned long eventId, void*) override
{
switch (eventId)
{
diff --git a/Interaction/Widgets/vtkDistanceWidget.h b/Interaction/Widgets/vtkDistanceWidget.h
index c40064498b1e60484e2c3bd640cffe7713536894..153e7f1d3119b379ff28f1621059557160193d9b 100644
--- a/Interaction/Widgets/vtkDistanceWidget.h
+++ b/Interaction/Widgets/vtkDistanceWidget.h
@@ -90,7 +90,7 @@ public:
* Standard methods for a VTK class.
*/
vtkTypeMacro(vtkDistanceWidget,vtkAbstractWidget);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
@@ -98,7 +98,7 @@ public:
* must be overridden because it is a composite widget and does more than
* its superclasses' vtkAbstractWidget::SetEnabled() method.
*/
- void SetEnabled(int) VTK_OVERRIDE;
+ void SetEnabled(int) override;
/**
* Specify an instance of vtkWidgetRepresentation used to represent this
@@ -118,13 +118,13 @@ public:
/**
* Create the default widget representation if one is not set.
*/
- void CreateDefaultRepresentation() VTK_OVERRIDE;
+ void CreateDefaultRepresentation() override;
/**
* Methods to change the whether the widget responds to interaction.
* Overridden to pass the state to component widgets.
*/
- void SetProcessEvents(int) VTK_OVERRIDE;
+ void SetProcessEvents(int) override;
/**
* Description:
@@ -158,7 +158,7 @@ public:
protected:
vtkDistanceWidget();
- ~vtkDistanceWidget() VTK_OVERRIDE;
+ ~vtkDistanceWidget() override;
// The state of the widget
int WidgetState;
diff --git a/Interaction/Widgets/vtkEllipsoidTensorProbeRepresentation.h b/Interaction/Widgets/vtkEllipsoidTensorProbeRepresentation.h
index e1e4fa9d78ab5906ecf4c44f3729279d8170317b..19700d2b3343f5745013c15640ed548a414f8641 100644
--- a/Interaction/Widgets/vtkEllipsoidTensorProbeRepresentation.h
+++ b/Interaction/Widgets/vtkEllipsoidTensorProbeRepresentation.h
@@ -47,34 +47,34 @@ public:
*/
vtkTypeMacro(vtkEllipsoidTensorProbeRepresentation,
vtkTensorProbeRepresentation);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
- void BuildRepresentation() VTK_OVERRIDE;
- int RenderOpaqueGeometry(vtkViewport *) VTK_OVERRIDE;
+ void BuildRepresentation() override;
+ int RenderOpaqueGeometry(vtkViewport *) override;
/**
* Can we pick the tensor glyph at the current cursor pos
*/
- int SelectProbe( int pos[2] ) VTK_OVERRIDE;
+ int SelectProbe( int pos[2] ) override;
//@{
/**
* See vtkProp for details.
*/
- void GetActors(vtkPropCollection *) VTK_OVERRIDE;
- void ReleaseGraphicsResources(vtkWindow *) VTK_OVERRIDE;
+ void GetActors(vtkPropCollection *) override;
+ void ReleaseGraphicsResources(vtkWindow *) override;
//@}
protected:
vtkEllipsoidTensorProbeRepresentation();
- ~vtkEllipsoidTensorProbeRepresentation() VTK_OVERRIDE;
+ ~vtkEllipsoidTensorProbeRepresentation() override;
// Get the interpolated tensor at the current position
void EvaluateTensor( double t[9] );
// Register internal Pickers within PickingManager
- void RegisterPickers() VTK_OVERRIDE;
+ void RegisterPickers() override;
vtkActor * EllipsoidActor;
vtkPolyDataMapper * EllipsoidMapper;
diff --git a/Interaction/Widgets/vtkEvent.h b/Interaction/Widgets/vtkEvent.h
index 716d497114793a179fd6485fd3d02a959cdffe05..c0526b0ad104813b187b8dea7e2cc2d9a09a4a85 100644
--- a/Interaction/Widgets/vtkEvent.h
+++ b/Interaction/Widgets/vtkEvent.h
@@ -41,7 +41,7 @@ public:
* Standard macros.
*/
vtkTypeMacro(vtkEvent,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
@@ -110,7 +110,7 @@ public:
protected:
vtkEvent();
- ~vtkEvent() VTK_OVERRIDE;
+ ~vtkEvent() override;
unsigned long EventId;
int Modifier;
diff --git a/Interaction/Widgets/vtkFinitePlaneRepresentation.h b/Interaction/Widgets/vtkFinitePlaneRepresentation.h
index 2434f40dc9f5ae98c4ad53a99b4cd00b5c0695cb..2765b190224b1b9e255a368231416db8354f5ab4 100644
--- a/Interaction/Widgets/vtkFinitePlaneRepresentation.h
+++ b/Interaction/Widgets/vtkFinitePlaneRepresentation.h
@@ -60,7 +60,7 @@ public:
* Standard vtkObject methods
*/
vtkTypeMacro(vtkFinitePlaneRepresentation, vtkWidgetRepresentation);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
@@ -126,22 +126,22 @@ public:
/**
* These are methods that satisfy vtkWidgetRepresentation's API.
*/
- void PlaceWidget(double bounds[6]) VTK_OVERRIDE;
- void BuildRepresentation() VTK_OVERRIDE;
- int ComputeInteractionState(int X, int Y, int modify=0) VTK_OVERRIDE;
- void StartWidgetInteraction(double e[2]) VTK_OVERRIDE;
- void WidgetInteraction(double e[2]) VTK_OVERRIDE;
- double *GetBounds() VTK_OVERRIDE;
+ void PlaceWidget(double bounds[6]) override;
+ void BuildRepresentation() override;
+ int ComputeInteractionState(int X, int Y, int modify=0) override;
+ void StartWidgetInteraction(double e[2]) override;
+ void WidgetInteraction(double e[2]) override;
+ double *GetBounds() override;
//@}
//@{
/**
* Methods supporting, and required by, the rendering process.
*/
- void ReleaseGraphicsResources(vtkWindow*) VTK_OVERRIDE;
- int RenderOpaqueGeometry(vtkViewport*) VTK_OVERRIDE;
- int RenderTranslucentPolygonalGeometry(vtkViewport*) VTK_OVERRIDE;
- int HasTranslucentPolygonalGeometry() VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow*) override;
+ int RenderOpaqueGeometry(vtkViewport*) override;
+ int RenderTranslucentPolygonalGeometry(vtkViewport*) override;
+ int HasTranslucentPolygonalGeometry() override;
//@}
vtkSetClampMacro(InteractionState, int, Outside, Pushing);
@@ -219,7 +219,7 @@ public:
protected:
vtkFinitePlaneRepresentation();
- ~vtkFinitePlaneRepresentation() VTK_OVERRIDE;
+ ~vtkFinitePlaneRepresentation() override;
virtual void CreateDefaultProperties();
@@ -227,7 +227,7 @@ protected:
virtual void SizeHandles();
// Register internal Pickers within PickingManager
- void RegisterPickers() VTK_OVERRIDE;
+ void RegisterPickers() override;
void SetHighlightNormal(int highlight);
void SetHighlightPlane(int highlight);
diff --git a/Interaction/Widgets/vtkFinitePlaneWidget.h b/Interaction/Widgets/vtkFinitePlaneWidget.h
index 3cb015b6af97c3368dccb8ed4995722ff70d1e18..51c4707325c22fdc41a6532af06964000aef7900 100644
--- a/Interaction/Widgets/vtkFinitePlaneWidget.h
+++ b/Interaction/Widgets/vtkFinitePlaneWidget.h
@@ -88,7 +88,7 @@ public:
* Standard vtkObject methods
*/
vtkTypeMacro(vtkFinitePlaneWidget,vtkAbstractWidget);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
@@ -102,11 +102,11 @@ public:
* Create the default widget representation if one is not set. By default,
* this is an instance of the vtkFinitePlaneRepresentation class.
*/
- void CreateDefaultRepresentation() VTK_OVERRIDE;
+ void CreateDefaultRepresentation() override;
protected:
vtkFinitePlaneWidget();
- ~vtkFinitePlaneWidget() VTK_OVERRIDE;
+ ~vtkFinitePlaneWidget() override;
int WidgetState;
enum _WidgetState {Start = 0, Active};
diff --git a/Interaction/Widgets/vtkFixedSizeHandleRepresentation3D.h b/Interaction/Widgets/vtkFixedSizeHandleRepresentation3D.h
index bce91d83ee52fb866b0561782cefa84266b35a59..d14e3f68b723eee2295c18a553dc7ed9d4cdb953 100644
--- a/Interaction/Widgets/vtkFixedSizeHandleRepresentation3D.h
+++ b/Interaction/Widgets/vtkFixedSizeHandleRepresentation3D.h
@@ -56,7 +56,7 @@ public:
*/
vtkTypeMacro(vtkFixedSizeHandleRepresentation3D,
vtkPolygonalHandleRepresentation3D);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -89,12 +89,12 @@ public:
protected:
vtkFixedSizeHandleRepresentation3D();
- ~vtkFixedSizeHandleRepresentation3D() VTK_OVERRIDE;
+ ~vtkFixedSizeHandleRepresentation3D() override;
/**
* Recomputes the handle world size based on the set display size.
*/
- void BuildRepresentation() VTK_OVERRIDE;
+ void BuildRepresentation() override;
/**
* Convenience method to convert from world to display
diff --git a/Interaction/Widgets/vtkFocalPlaneContourRepresentation.h b/Interaction/Widgets/vtkFocalPlaneContourRepresentation.h
index 8d2d28eacd210f5edf7890fc649a92eb5ce41f98..f8865e0cf6993c5959a2874fb0df52bdf3ac2c77 100644
--- a/Interaction/Widgets/vtkFocalPlaneContourRepresentation.h
+++ b/Interaction/Widgets/vtkFocalPlaneContourRepresentation.h
@@ -46,7 +46,7 @@ public:
* Standard VTK methods.
*/
vtkTypeMacro(vtkFocalPlaneContourRepresentation,vtkContourRepresentation);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
@@ -56,7 +56,7 @@ public:
* 1 on success or 0 if n or idx are out of range.
*/
int GetIntermediatePointWorldPosition( int n,
- int idx, double point[3] ) VTK_OVERRIDE;
+ int idx, double point[3] ) override;
/**
* Get the world position of the intermediate point at
@@ -72,14 +72,14 @@ public:
* 1 on success, or 0 if there are not at least
* (n+1) nodes (0 based counting).
*/
- int GetNthNodeDisplayPosition( int n, double pos[2] ) VTK_OVERRIDE;
+ int GetNthNodeDisplayPosition( int n, double pos[2] ) override;
/**
* Get the nth node's world position. Will return
* 1 on success, or 0 if there are not at least
* (n+1) nodes (0 based counting).
*/
- int GetNthNodeWorldPosition( int n, double pos[3] ) VTK_OVERRIDE;
+ int GetNthNodeWorldPosition( int n, double pos[3] ) override;
/**
* The class maintains its true contour locations based on display co-ords
@@ -91,13 +91,13 @@ public:
* The method must be called whenever the contour needs to be updated, usually
* from RenderOpaqueGeometry()
*/
- int UpdateContour() VTK_OVERRIDE;
+ int UpdateContour() override;
- void UpdateLines( int index ) VTK_OVERRIDE;
+ void UpdateLines( int index ) override;
protected:
vtkFocalPlaneContourRepresentation();
- ~vtkFocalPlaneContourRepresentation() VTK_OVERRIDE;
+ ~vtkFocalPlaneContourRepresentation() override;
private:
vtkFocalPlaneContourRepresentation(const vtkFocalPlaneContourRepresentation&) VTK_DELETE_FUNCTION;
diff --git a/Interaction/Widgets/vtkFocalPlanePointPlacer.h b/Interaction/Widgets/vtkFocalPlanePointPlacer.h
index 45582eaa72a8d23c6be039fe27c7a292e919c9f2..cf4e3e451a8c1917e8c84580f9cd08016f3a5f07 100644
--- a/Interaction/Widgets/vtkFocalPlanePointPlacer.h
+++ b/Interaction/Widgets/vtkFocalPlanePointPlacer.h
@@ -38,7 +38,7 @@ public:
* Standard methods for instances of this class.
*/
vtkTypeMacro(vtkFocalPlanePointPlacer,vtkPointPlacer);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
// Descirption:
@@ -52,7 +52,7 @@ public:
int ComputeWorldPosition( vtkRenderer *ren,
double displayPos[2],
double worldPos[3],
- double worldOrient[9] ) VTK_OVERRIDE;
+ double worldOrient[9] ) override;
/**
* Given a renderer, a display position, and a reference
@@ -68,16 +68,16 @@ public:
double displayPos[2],
double refWorldPos[3],
double worldPos[3],
- double worldOrient[9] ) VTK_OVERRIDE;
+ double worldOrient[9] ) override;
//@{
/**
* Validate a world position. All world positions
* are valid so these methods always return 1.
*/
- int ValidateWorldPosition( double worldPos[3] ) VTK_OVERRIDE;
+ int ValidateWorldPosition( double worldPos[3] ) override;
int ValidateWorldPosition( double worldPos[3],
- double worldOrient[9]) VTK_OVERRIDE;
+ double worldOrient[9]) override;
//@}
//@{
@@ -101,7 +101,7 @@ public:
protected:
vtkFocalPlanePointPlacer();
- ~vtkFocalPlanePointPlacer() VTK_OVERRIDE;
+ ~vtkFocalPlanePointPlacer() override;
void GetCurrentOrientation( double worldOrient[9] );
diff --git a/Interaction/Widgets/vtkHandleRepresentation.h b/Interaction/Widgets/vtkHandleRepresentation.h
index 37e1b35d0e3217505003c093c756282ba0e5798b..30bb301721f867938ab72523cef9764163bd09a8 100644
--- a/Interaction/Widgets/vtkHandleRepresentation.h
+++ b/Interaction/Widgets/vtkHandleRepresentation.h
@@ -60,7 +60,7 @@ public:
* Standard methods for instances of this class.
*/
vtkTypeMacro(vtkHandleRepresentation,vtkWidgetRepresentation);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -144,16 +144,16 @@ public:
/**
* Methods to make this class properly act like a vtkWidgetRepresentation.
*/
- void ShallowCopy(vtkProp *prop) VTK_OVERRIDE;
+ void ShallowCopy(vtkProp *prop) override;
virtual void DeepCopy(vtkProp *prop);
- void SetRenderer(vtkRenderer *ren) VTK_OVERRIDE;
+ void SetRenderer(vtkRenderer *ren) override;
//@}
/**
* Overload the superclasses' GetMTime() because the internal vtkCoordinates
* are used to keep the state of the representation.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
//@{
/**
@@ -170,7 +170,7 @@ public:
protected:
vtkHandleRepresentation();
- ~vtkHandleRepresentation() VTK_OVERRIDE;
+ ~vtkHandleRepresentation() override;
int Tolerance;
int ActiveRepresentation;
diff --git a/Interaction/Widgets/vtkHandleWidget.h b/Interaction/Widgets/vtkHandleWidget.h
index c918bd9758574ef37d225994f5d25526856ac688..42602188c3979ff95c576e94561369a7143cbb08 100644
--- a/Interaction/Widgets/vtkHandleWidget.h
+++ b/Interaction/Widgets/vtkHandleWidget.h
@@ -83,7 +83,7 @@ public:
* Standard VTK class macros.
*/
vtkTypeMacro(vtkHandleWidget,vtkAbstractWidget);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
@@ -104,7 +104,7 @@ public:
* Create the default widget representation if one is not set. By default
* an instance of vtkPointHandleRepresenation3D is created.
*/
- void CreateDefaultRepresentation() VTK_OVERRIDE;
+ void CreateDefaultRepresentation() override;
//@{
/**
@@ -148,7 +148,7 @@ public:
protected:
vtkHandleWidget();
- ~vtkHandleWidget() VTK_OVERRIDE;
+ ~vtkHandleWidget() override;
// These are the callbacks for this widget
static void GenericAction(vtkHandleWidget*);
@@ -161,7 +161,7 @@ protected:
static void MoveAction3D(vtkAbstractWidget*);
// helper methods for cursor management
- void SetCursor(int state) VTK_OVERRIDE;
+ void SetCursor(int state) override;
int WidgetState;
int EnableAxisConstraint;
diff --git a/Interaction/Widgets/vtkHoverWidget.h b/Interaction/Widgets/vtkHoverWidget.h
index f90888c96f2a2ef0463944e13184fc64b5b0533f..56448593241723c5f55a1b5bdfc1ec412f38dd26 100644
--- a/Interaction/Widgets/vtkHoverWidget.h
+++ b/Interaction/Widgets/vtkHoverWidget.h
@@ -87,7 +87,7 @@ public:
* Standard methods for a VTK class.
*/
vtkTypeMacro(vtkHoverWidget,vtkAbstractWidget);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -104,19 +104,19 @@ public:
* The method for activating and deactivating this widget. This method
* must be overridden because it performs special timer-related operations.
*/
- void SetEnabled(int) VTK_OVERRIDE;
+ void SetEnabled(int) override;
/**
* A default representation, of which there is none, is created. Note
* that the superclasses vtkAbstractWidget::GetRepresentation()
* method returns NULL.
*/
- void CreateDefaultRepresentation() VTK_OVERRIDE
+ void CreateDefaultRepresentation() override
{this->WidgetRep = nullptr;}
protected:
vtkHoverWidget();
- ~vtkHoverWidget() VTK_OVERRIDE;
+ ~vtkHoverWidget() override;
// The state of the widget
diff --git a/Interaction/Widgets/vtkImageActorPointPlacer.h b/Interaction/Widgets/vtkImageActorPointPlacer.h
index 1f795297d4d83bfeb4812f156b8ea66aeb0c09fe..e4cf9a3556070e41e9ef578bbd230f6a8875ee09 100644
--- a/Interaction/Widgets/vtkImageActorPointPlacer.h
+++ b/Interaction/Widgets/vtkImageActorPointPlacer.h
@@ -46,7 +46,7 @@ public:
* Standard methods for instances of this class.
*/
vtkTypeMacro(vtkImageActorPointPlacer,vtkPointPlacer);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
@@ -60,7 +60,7 @@ public:
int ComputeWorldPosition( vtkRenderer *ren,
double displayPos[2],
double worldPos[3],
- double worldOrient[9] ) VTK_OVERRIDE;
+ double worldOrient[9] ) override;
/**
* This method is identical to the one above since the
@@ -71,7 +71,7 @@ public:
double displayPos[2],
double refWorldPos[2],
double worldPos[3],
- double worldOrient[9] ) VTK_OVERRIDE;
+ double worldOrient[9] ) override;
/**
* This method validates a world position by checking to see
@@ -79,14 +79,14 @@ public:
* of the internal placer (essentially - is this world position
* on the image?)
*/
- int ValidateWorldPosition( double worldPos[3] ) VTK_OVERRIDE;
+ int ValidateWorldPosition( double worldPos[3] ) override;
/**
* This method is identical to the one above since the bounded
* plane point placer ignores orientation
*/
int ValidateWorldPosition( double worldPos[3],
- double worldOrient[9]) VTK_OVERRIDE;
+ double worldOrient[9]) override;
/**
@@ -97,7 +97,7 @@ public:
*/
int UpdateWorldPosition( vtkRenderer *ren,
double worldPos[3],
- double worldOrient[9]) VTK_OVERRIDE;
+ double worldOrient[9]) override;
/**
* A method for configuring the internal placer according
@@ -107,7 +107,7 @@ public:
* which would then cause the representation to update
* all of its points
*/
- int UpdateInternalState() VTK_OVERRIDE;
+ int UpdateInternalState() override;
//@{
/**
@@ -135,11 +135,11 @@ public:
* Set the world tolerance. This propagates it to the internal
* BoundedPlanePointPlacer.
*/
- void SetWorldTolerance( double s ) VTK_OVERRIDE;
+ void SetWorldTolerance( double s ) override;
protected:
vtkImageActorPointPlacer();
- ~vtkImageActorPointPlacer() VTK_OVERRIDE;
+ ~vtkImageActorPointPlacer() override;
// The reference image actor. Must be configured before this placer
diff --git a/Interaction/Widgets/vtkImageCroppingRegionsWidget.h b/Interaction/Widgets/vtkImageCroppingRegionsWidget.h
index 42982753c57c01561599cb461c7c8b0756674ff1..af68100b87df1eb5c1eb2d4e93e6f88a6741e997 100644
--- a/Interaction/Widgets/vtkImageCroppingRegionsWidget.h
+++ b/Interaction/Widgets/vtkImageCroppingRegionsWidget.h
@@ -49,7 +49,7 @@ public:
*/
static vtkImageCroppingRegionsWidget *New();
vtkTypeMacro(vtkImageCroppingRegionsWidget, vtk3DWidget);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -57,13 +57,13 @@ public:
* Place/Adjust widget within bounds
*/
using vtk3DWidget::PlaceWidget;
- void PlaceWidget(double bounds[6]) VTK_OVERRIDE;
+ void PlaceWidget(double bounds[6]) override;
//@}
/**
* Enable/disable the widget
*/
- void SetEnabled(int enabling) VTK_OVERRIDE;
+ void SetEnabled(int enabling) override;
//@{
/**
@@ -193,7 +193,7 @@ public:
protected:
vtkImageCroppingRegionsWidget();
- ~vtkImageCroppingRegionsWidget() VTK_OVERRIDE;
+ ~vtkImageCroppingRegionsWidget() override;
vtkVolumeMapper *VolumeMapper;
diff --git a/Interaction/Widgets/vtkImageOrthoPlanes.h b/Interaction/Widgets/vtkImageOrthoPlanes.h
index 7dcc5591e2dfb041e6b3dd882fc639449726e100..09f91e1c0fe0e50d1acd0c6f81035c8b00a113e5 100644
--- a/Interaction/Widgets/vtkImageOrthoPlanes.h
+++ b/Interaction/Widgets/vtkImageOrthoPlanes.h
@@ -40,7 +40,7 @@ class VTKINTERACTIONWIDGETS_EXPORT vtkImageOrthoPlanes : public vtkObject
public:
static vtkImageOrthoPlanes *New();
vtkTypeMacro(vtkImageOrthoPlanes,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -67,7 +67,7 @@ public:
protected:
vtkImageOrthoPlanes();
- ~vtkImageOrthoPlanes() VTK_OVERRIDE;
+ ~vtkImageOrthoPlanes() override;
void HandlePlaneRotation(vtkImagePlaneWidget *imagePlaneWidget,
int indexOfModifiedPlane);
diff --git a/Interaction/Widgets/vtkImagePlaneWidget.h b/Interaction/Widgets/vtkImagePlaneWidget.h
index 85d026ab07e6da827d9c3075b12501b31c45babf..bbe70efe88cbe250b25a6bacd1d0d63720cb2aea 100644
--- a/Interaction/Widgets/vtkImagePlaneWidget.h
+++ b/Interaction/Widgets/vtkImagePlaneWidget.h
@@ -136,25 +136,25 @@ public:
static vtkImagePlaneWidget *New();
vtkTypeMacro(vtkImagePlaneWidget,vtkPolyDataSourceWidget);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
* Methods that satisfy the superclass' API.
*/
- void SetEnabled(int) VTK_OVERRIDE;
- void PlaceWidget(double bounds[6]) VTK_OVERRIDE;
- void PlaceWidget() VTK_OVERRIDE
+ void SetEnabled(int) override;
+ void PlaceWidget(double bounds[6]) override;
+ void PlaceWidget() override
{this->Superclass::PlaceWidget();}
void PlaceWidget(double xmin, double xmax, double ymin, double ymax,
- double zmin, double zmax) VTK_OVERRIDE
+ double zmin, double zmax) override
{this->Superclass::PlaceWidget(xmin,xmax,ymin,ymax,zmin,zmax);}
//@}
/**
* Set the vtkImageData* input for the vtkImageReslice.
*/
- void SetInputConnection(vtkAlgorithmOutput* aout) VTK_OVERRIDE;
+ void SetInputConnection(vtkAlgorithmOutput* aout) override;
//@{
/**
@@ -310,13 +310,13 @@ public:
* to have the initial placement follow suit. Or, make changes after the
* widget has been initialised and call UpdatePlacement() to realise.
*/
- vtkPolyDataAlgorithm* GetPolyDataAlgorithm() VTK_OVERRIDE;
+ vtkPolyDataAlgorithm* GetPolyDataAlgorithm() override;
/**
* Satisfies superclass API. This will change the state of the widget to
* match changes that have been made to the underlying vtkPolyDataSource
*/
- void UpdatePlacement(void) VTK_OVERRIDE;
+ void UpdatePlacement(void) override;
/**
* Convenience method to get the texture used by this widget. This can be
@@ -550,7 +550,7 @@ public:
protected:
vtkImagePlaneWidget();
- ~vtkImagePlaneWidget() VTK_OVERRIDE;
+ ~vtkImagePlaneWidget() override;
int TextureVisibility;
@@ -605,7 +605,7 @@ protected:
virtual void OnMiddleButtonUp();
virtual void OnRightButtonDown();
virtual void OnRightButtonUp();
- void OnChar() VTK_OVERRIDE;
+ void OnChar() override;
virtual void StartCursor();
virtual void StopCursor();
@@ -645,7 +645,7 @@ protected:
vtkAbstractPropPicker *PlanePicker;
// Register internal Pickers within PickingManager
- void RegisterPickers() VTK_OVERRIDE;
+ void RegisterPickers() override;
// for negative window values.
void InvertTable();
diff --git a/Interaction/Widgets/vtkImageTracerWidget.h b/Interaction/Widgets/vtkImageTracerWidget.h
index b46e819e01838af4cd4faa175147c4e87f5074fd..df665886caff3624148ffaad7b6c552c22a366d9 100644
--- a/Interaction/Widgets/vtkImageTracerWidget.h
+++ b/Interaction/Widgets/vtkImageTracerWidget.h
@@ -86,18 +86,18 @@ public:
static vtkImageTracerWidget *New();
vtkTypeMacro(vtkImageTracerWidget,vtk3DWidget);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
* Methods that satisfy the superclass' API.
*/
- void SetEnabled(int) VTK_OVERRIDE;
- void PlaceWidget(double bounds[6]) VTK_OVERRIDE;
- void PlaceWidget() VTK_OVERRIDE
+ void SetEnabled(int) override;
+ void PlaceWidget(double bounds[6]) override;
+ void PlaceWidget() override
{this->Superclass::PlaceWidget();}
void PlaceWidget(double xmin, double xmax, double ymin, double ymax,
- double zmin, double zmax) VTK_OVERRIDE
+ double zmin, double zmax) override
{this->Superclass::PlaceWidget(xmin,xmax,ymin,ymax,zmin,zmax);}
//@}
@@ -284,7 +284,7 @@ public:
protected:
vtkImageTracerWidget();
- ~vtkImageTracerWidget() VTK_OVERRIDE;
+ ~vtkImageTracerWidget() override;
// Manage the state of the widget
int State;
@@ -352,7 +352,7 @@ protected:
void AdjustHandlePosition(const int& , double*);
int HighlightHandle(vtkProp* ); // returns handle index or -1 on fail
void EraseHandle(const int& );
- void SizeHandles() VTK_OVERRIDE;
+ void SizeHandles() override;
void InsertHandleOnLine(double* );
int NumberOfHandles;
@@ -381,7 +381,7 @@ protected:
vtkAbstractPropPicker* CurrentPicker;
// Register internal Pickers within PickingManager
- void RegisterPickers() VTK_OVERRIDE;
+ void RegisterPickers() override;
// Properties used to control the appearance of selected objects and
// the manipulator in general.
diff --git a/Interaction/Widgets/vtkImplicitCylinderRepresentation.h b/Interaction/Widgets/vtkImplicitCylinderRepresentation.h
index fc25fb163d7d355b62cc06a24dbc889235a900d2..3c3dc16bf50916a2c4ae4fdb0d5fb726d1735b3a 100644
--- a/Interaction/Widgets/vtkImplicitCylinderRepresentation.h
+++ b/Interaction/Widgets/vtkImplicitCylinderRepresentation.h
@@ -75,7 +75,7 @@ public:
* Standard methods for the class.
*/
vtkTypeMacro(vtkImplicitCylinderRepresentation,vtkWidgetRepresentation);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -295,24 +295,24 @@ public:
/**
* Methods to interface with the vtkImplicitCylinderWidget.
*/
- int ComputeInteractionState(int X, int Y, int modify=0) VTK_OVERRIDE;
- void PlaceWidget(double bounds[6]) VTK_OVERRIDE;
- void BuildRepresentation() VTK_OVERRIDE;
- void StartWidgetInteraction(double eventPos[2]) VTK_OVERRIDE;
- void WidgetInteraction(double newEventPos[2]) VTK_OVERRIDE;
- void EndWidgetInteraction(double newEventPos[2]) VTK_OVERRIDE;
+ int ComputeInteractionState(int X, int Y, int modify=0) override;
+ void PlaceWidget(double bounds[6]) override;
+ void BuildRepresentation() override;
+ void StartWidgetInteraction(double eventPos[2]) override;
+ void WidgetInteraction(double newEventPos[2]) override;
+ void EndWidgetInteraction(double newEventPos[2]) override;
//@}
//@{
/**
* Methods supporting the rendering process.
*/
- double *GetBounds() VTK_OVERRIDE;
- void GetActors(vtkPropCollection *pc) VTK_OVERRIDE;
- void ReleaseGraphicsResources(vtkWindow*) VTK_OVERRIDE;
- int RenderOpaqueGeometry(vtkViewport*) VTK_OVERRIDE;
- int RenderTranslucentPolygonalGeometry(vtkViewport*) VTK_OVERRIDE;
- int HasTranslucentPolygonalGeometry() VTK_OVERRIDE;
+ double *GetBounds() override;
+ void GetActors(vtkPropCollection *pc) override;
+ void ReleaseGraphicsResources(vtkWindow*) override;
+ int RenderOpaqueGeometry(vtkViewport*) override;
+ int RenderTranslucentPolygonalGeometry(vtkViewport*) override;
+ int HasTranslucentPolygonalGeometry() override;
//@}
//@{
@@ -379,7 +379,7 @@ public:
protected:
vtkImplicitCylinderRepresentation();
- ~vtkImplicitCylinderRepresentation() VTK_OVERRIDE;
+ ~vtkImplicitCylinderRepresentation() override;
int RepresentationState;
@@ -461,7 +461,7 @@ protected:
vtkCellPicker *CylPicker;
// Register internal Pickers within PickingManager
- void RegisterPickers() VTK_OVERRIDE;
+ void RegisterPickers() override;
// Transform the normal (used for rotation)
vtkTransform *Transform;
diff --git a/Interaction/Widgets/vtkImplicitCylinderWidget.h b/Interaction/Widgets/vtkImplicitCylinderWidget.h
index 4e2a7cf36cb925708a1d15a2cada41891b748bb4..ea02d00a194b1f0c8e3599769d73ed9ee0b0612a 100644
--- a/Interaction/Widgets/vtkImplicitCylinderWidget.h
+++ b/Interaction/Widgets/vtkImplicitCylinderWidget.h
@@ -106,7 +106,7 @@ public:
* Standard vtkObject methods
*/
vtkTypeMacro(vtkImplicitCylinderWidget,vtkAbstractWidget);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
@@ -119,7 +119,7 @@ public:
// Descritpion:
// Disable/Enable the widget if needed.
// Unobserved the camera if the widget is disabled.
- void SetEnabled(int enabling) VTK_OVERRIDE;
+ void SetEnabled(int enabling) override;
/**
* Return the representation as a vtkImplicitCylinderRepresentation.
@@ -130,11 +130,11 @@ public:
/**
* Create the default widget representation if one is not set.
*/
- void CreateDefaultRepresentation() VTK_OVERRIDE;
+ void CreateDefaultRepresentation() override;
protected:
vtkImplicitCylinderWidget();
- ~vtkImplicitCylinderWidget() VTK_OVERRIDE;
+ ~vtkImplicitCylinderWidget() override;
// Manage the state of the widget
int WidgetState;
diff --git a/Interaction/Widgets/vtkImplicitPlaneRepresentation.h b/Interaction/Widgets/vtkImplicitPlaneRepresentation.h
index 1803062a6a5f24447b984745dea03094519e8236..d2b3177e1b72a299ef7a3f1fa0dcc4266e147f24 100644
--- a/Interaction/Widgets/vtkImplicitPlaneRepresentation.h
+++ b/Interaction/Widgets/vtkImplicitPlaneRepresentation.h
@@ -74,7 +74,7 @@ public:
* Standard methods for the class.
*/
vtkTypeMacro(vtkImplicitPlaneRepresentation,vtkWidgetRepresentation);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -319,40 +319,40 @@ public:
/**
* Methods to interface with the vtkImplicitPlaneWidget2.
*/
- int ComputeInteractionState(int X, int Y, int modify=0) VTK_OVERRIDE;
- void PlaceWidget(double bounds[6]) VTK_OVERRIDE;
- void BuildRepresentation() VTK_OVERRIDE;
- void StartWidgetInteraction(double eventPos[2]) VTK_OVERRIDE;
- void WidgetInteraction(double newEventPos[2]) VTK_OVERRIDE;
- void EndWidgetInteraction(double newEventPos[2]) VTK_OVERRIDE;
+ int ComputeInteractionState(int X, int Y, int modify=0) override;
+ void PlaceWidget(double bounds[6]) override;
+ void BuildRepresentation() override;
+ void StartWidgetInteraction(double eventPos[2]) override;
+ void WidgetInteraction(double newEventPos[2]) override;
+ void EndWidgetInteraction(double newEventPos[2]) override;
void StartComplexInteraction(
vtkRenderWindowInteractor *iren,
vtkAbstractWidget *widget,
- unsigned long event, void *calldata) VTK_OVERRIDE;
+ unsigned long event, void *calldata) override;
void ComplexInteraction(
vtkRenderWindowInteractor *iren,
vtkAbstractWidget *widget,
- unsigned long event, void *calldata) VTK_OVERRIDE;
+ unsigned long event, void *calldata) override;
int ComputeComplexInteractionState(
vtkRenderWindowInteractor *iren,
vtkAbstractWidget *widget,
- unsigned long event, void *calldata, int modify = 0) VTK_OVERRIDE;
+ unsigned long event, void *calldata, int modify = 0) override;
void EndComplexInteraction(
vtkRenderWindowInteractor *iren,
vtkAbstractWidget *widget,
- unsigned long event, void *calldata) VTK_OVERRIDE;
+ unsigned long event, void *calldata) override;
//@}
//@{
/**
* Methods supporting the rendering process.
*/
- double *GetBounds() VTK_OVERRIDE;
- void GetActors(vtkPropCollection *pc) VTK_OVERRIDE;
- void ReleaseGraphicsResources(vtkWindow*) VTK_OVERRIDE;
- int RenderOpaqueGeometry(vtkViewport*) VTK_OVERRIDE;
- int RenderTranslucentPolygonalGeometry(vtkViewport*) VTK_OVERRIDE;
- int HasTranslucentPolygonalGeometry() VTK_OVERRIDE;
+ double *GetBounds() override;
+ void GetActors(vtkPropCollection *pc) override;
+ void ReleaseGraphicsResources(vtkWindow*) override;
+ int RenderOpaqueGeometry(vtkViewport*) override;
+ int RenderTranslucentPolygonalGeometry(vtkViewport*) override;
+ int HasTranslucentPolygonalGeometry() override;
//@}
// Manage the state of the widget
@@ -407,7 +407,7 @@ public:
protected:
vtkImplicitPlaneRepresentation();
- ~vtkImplicitPlaneRepresentation() VTK_OVERRIDE;
+ ~vtkImplicitPlaneRepresentation() override;
int RepresentationState;
@@ -488,7 +488,7 @@ protected:
vtkCellPicker *Picker;
// Register internal Pickers within PickingManager
- void RegisterPickers() VTK_OVERRIDE;
+ void RegisterPickers() override;
// Transform the normal (used for rotation)
vtkTransform *Transform;
diff --git a/Interaction/Widgets/vtkImplicitPlaneWidget.h b/Interaction/Widgets/vtkImplicitPlaneWidget.h
index 056e1b8c085dd3355a563309811312aeb5962ca8..2ec3c052460513413f51843a8d1e14c405053d0b 100644
--- a/Interaction/Widgets/vtkImplicitPlaneWidget.h
+++ b/Interaction/Widgets/vtkImplicitPlaneWidget.h
@@ -92,18 +92,18 @@ public:
static vtkImplicitPlaneWidget *New();
vtkTypeMacro(vtkImplicitPlaneWidget,vtkPolyDataSourceWidget);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
* Methods that satisfy the superclass' API.
*/
- void SetEnabled(int) VTK_OVERRIDE;
- void PlaceWidget(double bounds[6]) VTK_OVERRIDE;
- void PlaceWidget() VTK_OVERRIDE
+ void SetEnabled(int) override;
+ void PlaceWidget(double bounds[6]) override;
+ void PlaceWidget() override
{this->Superclass::PlaceWidget();}
void PlaceWidget(double xmin, double xmax, double ymin, double ymax,
- double zmin, double zmax) VTK_OVERRIDE
+ double zmin, double zmax) override
{this->Superclass::PlaceWidget(xmin,xmax,ymin,ymax,zmin,zmax);}
//@}
@@ -225,7 +225,7 @@ public:
* Satisfies superclass API. This returns a pointer to the underlying
* PolyData (which represents the plane).
*/
- vtkPolyDataAlgorithm* GetPolyDataAlgorithm() VTK_OVERRIDE;
+ vtkPolyDataAlgorithm* GetPolyDataAlgorithm() override;
/**
* Get the implicit function for the plane. The user must provide the
@@ -239,12 +239,12 @@ public:
* Satisfies the superclass API. This will change the state of the widget
* to match changes that have been made to the underlying PolyDataSource
*/
- void UpdatePlacement() VTK_OVERRIDE;
+ void UpdatePlacement() override;
/**
* Control widget appearance
*/
- void SizeHandles() VTK_OVERRIDE;
+ void SizeHandles() override;
//@{
/**
@@ -281,7 +281,7 @@ public:
protected:
vtkImplicitPlaneWidget();
- ~vtkImplicitPlaneWidget() VTK_OVERRIDE;
+ ~vtkImplicitPlaneWidget() override;
// Manage the state of the widget
int State;
@@ -377,7 +377,7 @@ protected:
vtkCellPicker *Picker;
// Register internal Pickers within PickingManager
- void RegisterPickers() VTK_OVERRIDE;
+ void RegisterPickers() override;
// Transform the normal (used for rotation)
vtkTransform *Transform;
diff --git a/Interaction/Widgets/vtkImplicitPlaneWidget2.cxx b/Interaction/Widgets/vtkImplicitPlaneWidget2.cxx
index 657b877af0fe6b72717faa98ce472ce76cd7e942..ebc2a20ee5b75d5cb4ad7d3afbab9afe6ab8894f 100644
--- a/Interaction/Widgets/vtkImplicitPlaneWidget2.cxx
+++ b/Interaction/Widgets/vtkImplicitPlaneWidget2.cxx
@@ -39,7 +39,7 @@ class vtkInteractionCallback : public vtkCommand
public:
static vtkInteractionCallback *New()
{ return new vtkInteractionCallback; }
- void Execute(vtkObject*, unsigned long eventId, void*) VTK_OVERRIDE
+ void Execute(vtkObject*, unsigned long eventId, void*) override
{
switch (eventId)
{
diff --git a/Interaction/Widgets/vtkImplicitPlaneWidget2.h b/Interaction/Widgets/vtkImplicitPlaneWidget2.h
index 20e4dc57f1304417b0aaa91a73a7017fcccfc914..a947b593a240a105bb805be2c2cd2e642565cf2f 100644
--- a/Interaction/Widgets/vtkImplicitPlaneWidget2.h
+++ b/Interaction/Widgets/vtkImplicitPlaneWidget2.h
@@ -113,7 +113,7 @@ public:
* Standard vtkObject methods
*/
vtkTypeMacro(vtkImplicitPlaneWidget2,vtkAbstractWidget);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
@@ -126,7 +126,7 @@ public:
// Descritpion:
// Disable/Enable the widget if needed.
// Unobserved the camera if the widget is disabled.
- void SetEnabled(int enabling) VTK_OVERRIDE;
+ void SetEnabled(int enabling) override;
/**
* Observe/Unobserve the camera if the widget is locked/unlocked to update the
@@ -143,11 +143,11 @@ public:
/**
* Create the default widget representation if one is not set.
*/
- void CreateDefaultRepresentation() VTK_OVERRIDE;
+ void CreateDefaultRepresentation() override;
protected:
vtkImplicitPlaneWidget2();
- ~vtkImplicitPlaneWidget2() VTK_OVERRIDE;
+ ~vtkImplicitPlaneWidget2() override;
// Manage the state of the widget
int WidgetState;
diff --git a/Interaction/Widgets/vtkLineRepresentation.h b/Interaction/Widgets/vtkLineRepresentation.h
index b0e6d6066210a12bd4152e04c01847c6f9ec018d..f964c2c394c8c5ea4a03d141e6c0030deb8d21a0 100644
--- a/Interaction/Widgets/vtkLineRepresentation.h
+++ b/Interaction/Widgets/vtkLineRepresentation.h
@@ -68,7 +68,7 @@ public:
* Standard methods for the class.
*/
vtkTypeMacro(vtkLineRepresentation,vtkWidgetRepresentation);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -176,23 +176,23 @@ public:
/**
* These are methods that satisfy vtkWidgetRepresentation's API.
*/
- void PlaceWidget(double bounds[6]) VTK_OVERRIDE;
- void BuildRepresentation() VTK_OVERRIDE;
- int ComputeInteractionState(int X, int Y, int modify=0) VTK_OVERRIDE;
- void StartWidgetInteraction(double e[2]) VTK_OVERRIDE;
- void WidgetInteraction(double e[2]) VTK_OVERRIDE;
- double *GetBounds() VTK_OVERRIDE;
+ void PlaceWidget(double bounds[6]) override;
+ void BuildRepresentation() override;
+ int ComputeInteractionState(int X, int Y, int modify=0) override;
+ void StartWidgetInteraction(double e[2]) override;
+ void WidgetInteraction(double e[2]) override;
+ double *GetBounds() override;
//@}
//@{
/**
* Methods supporting the rendering process.
*/
- void GetActors(vtkPropCollection *pc) VTK_OVERRIDE;
- void ReleaseGraphicsResources(vtkWindow*) VTK_OVERRIDE;
- int RenderOpaqueGeometry(vtkViewport*) VTK_OVERRIDE;
- int RenderTranslucentPolygonalGeometry(vtkViewport*) VTK_OVERRIDE;
- int HasTranslucentPolygonalGeometry() VTK_OVERRIDE;
+ void GetActors(vtkPropCollection *pc) override;
+ void ReleaseGraphicsResources(vtkWindow*) override;
+ int RenderOpaqueGeometry(vtkViewport*) override;
+ int RenderTranslucentPolygonalGeometry(vtkViewport*) override;
+ int HasTranslucentPolygonalGeometry() override;
//@}
// Manage the state of the widget
@@ -234,12 +234,12 @@ public:
* Overload the superclasses' GetMTime() because internal classes
* are used to keep the state of the representation.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
/**
* Overridden to set the rendererer on the internal representations.
*/
- void SetRenderer(vtkRenderer *ren) VTK_OVERRIDE;
+ void SetRenderer(vtkRenderer *ren) override;
//@{
/**
@@ -310,7 +310,7 @@ public:
protected:
vtkLineRepresentation();
- ~vtkLineRepresentation() VTK_OVERRIDE;
+ ~vtkLineRepresentation() override;
// The handle and the rep used to close the handles
vtkPointHandleRepresentation3D *HandleRepresentation;
diff --git a/Interaction/Widgets/vtkLineWidget.cxx b/Interaction/Widgets/vtkLineWidget.cxx
index ef95e9c4babde52d66b5bc7e245c1eff3c369ca5..2a03a8758966258db4f9a58688b78cf2ba0f7d1e 100644
--- a/Interaction/Widgets/vtkLineWidget.cxx
+++ b/Interaction/Widgets/vtkLineWidget.cxx
@@ -48,7 +48,7 @@ class vtkPWCallback : public vtkCommand
public:
static vtkPWCallback *New()
{ return new vtkPWCallback; }
- void Execute(vtkObject *vtkNotUsed(caller), unsigned long, void*) VTK_OVERRIDE
+ void Execute(vtkObject *vtkNotUsed(caller), unsigned long, void*) override
{
double x[3];
this->PointWidget->GetPosition(x);
@@ -67,7 +67,7 @@ class vtkPW1Callback : public vtkCommand
public:
static vtkPW1Callback *New()
{ return new vtkPW1Callback; }
- void Execute(vtkObject *vtkNotUsed(caller), unsigned long, void*) VTK_OVERRIDE
+ void Execute(vtkObject *vtkNotUsed(caller), unsigned long, void*) override
{
double x[3];
this->PointWidget->GetPosition(x);
@@ -86,7 +86,7 @@ class vtkPW2Callback : public vtkCommand
public:
static vtkPW2Callback *New()
{ return new vtkPW2Callback; }
- void Execute(vtkObject *vtkNotUsed(caller), unsigned long, void*) VTK_OVERRIDE
+ void Execute(vtkObject *vtkNotUsed(caller), unsigned long, void*) override
{
double x[3];
this->PointWidget->GetPosition(x);
diff --git a/Interaction/Widgets/vtkLineWidget.h b/Interaction/Widgets/vtkLineWidget.h
index 7ceb28c3b83701ebea8b8391828a0ce0e4a32ef0..45ae9eda2c0bbfd8509e8b0264ea5d7f1f5cb8c6 100644
--- a/Interaction/Widgets/vtkLineWidget.h
+++ b/Interaction/Widgets/vtkLineWidget.h
@@ -93,18 +93,18 @@ public:
static vtkLineWidget *New();
vtkTypeMacro(vtkLineWidget,vtk3DWidget);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
* Methods that satisfy the superclass' API.
*/
- void SetEnabled(int) VTK_OVERRIDE;
- void PlaceWidget(double bounds[6]) VTK_OVERRIDE;
- void PlaceWidget() VTK_OVERRIDE
+ void SetEnabled(int) override;
+ void PlaceWidget(double bounds[6]) override;
+ void PlaceWidget() override
{this->Superclass::PlaceWidget();}
void PlaceWidget(double xmin, double xmax, double ymin, double ymax,
- double zmin, double zmax) VTK_OVERRIDE
+ double zmin, double zmax) override
{this->Superclass::PlaceWidget(xmin,xmax,ymin,ymax,zmin,zmax);}
//@}
@@ -195,7 +195,7 @@ public:
protected:
vtkLineWidget();
- ~vtkLineWidget() VTK_OVERRIDE;
+ ~vtkLineWidget() override;
// Manage the state of the widget
friend class vtkPWCallback;
@@ -247,7 +247,7 @@ protected:
vtkSphereSource **HandleGeometry;
void BuildRepresentation();
- void SizeHandles() VTK_OVERRIDE;
+ void SizeHandles() override;
void HandlesOn(double length);
void HandlesOff();
int HighlightHandle(vtkProp *prop); //returns cell id
@@ -261,7 +261,7 @@ protected:
void SetLinePosition(double x[3]);
// Register internal Pickers within PickingManager
- void RegisterPickers() VTK_OVERRIDE;
+ void RegisterPickers() override;
// Methods to manipulate the hexahedron.
void Scale(double *p1, double *p2, int X, int Y);
diff --git a/Interaction/Widgets/vtkLineWidget2.h b/Interaction/Widgets/vtkLineWidget2.h
index 1acc16570b154d981b7342bb59712895c7bce357..77ee078001f0624efb61e8d098d799b0952c5c4d 100644
--- a/Interaction/Widgets/vtkLineWidget2.h
+++ b/Interaction/Widgets/vtkLineWidget2.h
@@ -102,14 +102,14 @@ public:
* Standard vtkObject methods
*/
vtkTypeMacro(vtkLineWidget2,vtkAbstractWidget);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
* Override superclasses' SetEnabled() method because the line
* widget must enable its internal handle widgets.
*/
- void SetEnabled(int enabling) VTK_OVERRIDE;
+ void SetEnabled(int enabling) override;
/**
* Specify an instance of vtkWidgetRepresentation used to represent this
@@ -128,17 +128,17 @@ public:
/**
* Create the default widget representation if one is not set.
*/
- void CreateDefaultRepresentation() VTK_OVERRIDE;
+ void CreateDefaultRepresentation() override;
/**
* Methods to change the whether the widget responds to interaction.
* Overridden to pass the state to component widgets.
*/
- void SetProcessEvents(int) VTK_OVERRIDE;
+ void SetProcessEvents(int) override;
protected:
vtkLineWidget2();
- ~vtkLineWidget2() VTK_OVERRIDE;
+ ~vtkLineWidget2() override;
// Manage the state of the widget
int WidgetState;
diff --git a/Interaction/Widgets/vtkLinearContourLineInterpolator.h b/Interaction/Widgets/vtkLinearContourLineInterpolator.h
index d57d34640d02629be19cfa59d922665794028e1a..b8fb547b595b887accd33f8b807aa714d777f60d 100644
--- a/Interaction/Widgets/vtkLinearContourLineInterpolator.h
+++ b/Interaction/Widgets/vtkLinearContourLineInterpolator.h
@@ -45,16 +45,16 @@ public:
* Standard methods for instances of this class.
*/
vtkTypeMacro(vtkLinearContourLineInterpolator,vtkContourLineInterpolator);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
int InterpolateLine( vtkRenderer *ren,
vtkContourRepresentation *rep,
- int idx1, int idx2 ) VTK_OVERRIDE;
+ int idx1, int idx2 ) override;
protected:
vtkLinearContourLineInterpolator();
- ~vtkLinearContourLineInterpolator() VTK_OVERRIDE;
+ ~vtkLinearContourLineInterpolator() override;
private:
vtkLinearContourLineInterpolator(const vtkLinearContourLineInterpolator&) VTK_DELETE_FUNCTION;
diff --git a/Interaction/Widgets/vtkLogoRepresentation.h b/Interaction/Widgets/vtkLogoRepresentation.h
index a7fb3a8933062c9b4fb998bb14fb5a49d38dabb7..4d34f579d9fedbc231a7cf1b982bb8975c1c58f8 100644
--- a/Interaction/Widgets/vtkLogoRepresentation.h
+++ b/Interaction/Widgets/vtkLogoRepresentation.h
@@ -55,7 +55,7 @@ public:
* Standard VTK class methods.
*/
vtkTypeMacro(vtkLogoRepresentation,vtkBorderRepresentation);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -77,21 +77,21 @@ public:
/**
* Satisfy the superclasses' API.
*/
- void BuildRepresentation() VTK_OVERRIDE;
+ void BuildRepresentation() override;
//@{
/**
* These methods are necessary to make this representation behave as
* a vtkProp.
*/
- void GetActors2D(vtkPropCollection *pc) VTK_OVERRIDE;
- void ReleaseGraphicsResources(vtkWindow*) VTK_OVERRIDE;
- int RenderOverlay(vtkViewport*) VTK_OVERRIDE;
+ void GetActors2D(vtkPropCollection *pc) override;
+ void ReleaseGraphicsResources(vtkWindow*) override;
+ int RenderOverlay(vtkViewport*) override;
//@}
protected:
vtkLogoRepresentation();
- ~vtkLogoRepresentation() VTK_OVERRIDE;
+ ~vtkLogoRepresentation() override;
// data members
vtkImageData *Image;
diff --git a/Interaction/Widgets/vtkLogoWidget.h b/Interaction/Widgets/vtkLogoWidget.h
index 68592b8aef6d00f1203592f627a5e04bf5544a1d..2bcc09290e6d502ddbb7e5b4cb069dcdd1eee3ae 100644
--- a/Interaction/Widgets/vtkLogoWidget.h
+++ b/Interaction/Widgets/vtkLogoWidget.h
@@ -48,7 +48,7 @@ public:
* Standar VTK class methods.
*/
vtkTypeMacro(vtkLogoWidget,vtkBorderWidget);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
@@ -62,11 +62,11 @@ public:
/**
* Create the default widget representation if one is not set.
*/
- void CreateDefaultRepresentation() VTK_OVERRIDE;
+ void CreateDefaultRepresentation() override;
protected:
vtkLogoWidget();
- ~vtkLogoWidget() VTK_OVERRIDE;
+ ~vtkLogoWidget() override;
private:
vtkLogoWidget(const vtkLogoWidget&) VTK_DELETE_FUNCTION;
diff --git a/Interaction/Widgets/vtkMeasurementCubeHandleRepresentation3D.h b/Interaction/Widgets/vtkMeasurementCubeHandleRepresentation3D.h
index 9b86ed0507dd5e151e7f60ee65bdbc478ab9442e..00cde3d2f276a8d2db25578e53a9305f40c3df45 100644
--- a/Interaction/Widgets/vtkMeasurementCubeHandleRepresentation3D.h
+++ b/Interaction/Widgets/vtkMeasurementCubeHandleRepresentation3D.h
@@ -54,15 +54,15 @@ public:
*/
vtkTypeMacro(vtkMeasurementCubeHandleRepresentation3D,
vtkHandleRepresentation);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
/**
* Set the position of the point in world and display coordinates.
*/
- void SetWorldPosition(double p[3]) VTK_OVERRIDE;
- void SetDisplayPosition(double p[3]) VTK_OVERRIDE;
+ void SetWorldPosition(double p[3]) override;
+ void SetDisplayPosition(double p[3]) override;
//@}
//@{
@@ -92,24 +92,24 @@ public:
/**
* Methods to make this class properly act like a vtkWidgetRepresentation.
*/
- void BuildRepresentation() VTK_OVERRIDE;
- void StartWidgetInteraction(double eventPos[2]) VTK_OVERRIDE;
- void WidgetInteraction(double eventPos[2]) VTK_OVERRIDE;
- int ComputeInteractionState(int X, int Y, int modify=0) VTK_OVERRIDE;
+ void BuildRepresentation() override;
+ void StartWidgetInteraction(double eventPos[2]) override;
+ void WidgetInteraction(double eventPos[2]) override;
+ int ComputeInteractionState(int X, int Y, int modify=0) override;
//@}
//@{
/**
* Methods to make this class behave as a vtkProp.
*/
- void ShallowCopy(vtkProp *prop) VTK_OVERRIDE;
- void DeepCopy(vtkProp *prop) VTK_OVERRIDE;
- void GetActors(vtkPropCollection *) VTK_OVERRIDE;
- void ReleaseGraphicsResources(vtkWindow *) VTK_OVERRIDE;
- int RenderOpaqueGeometry(vtkViewport *viewport) VTK_OVERRIDE;
- int RenderTranslucentPolygonalGeometry(vtkViewport *viewport) VTK_OVERRIDE;
- int HasTranslucentPolygonalGeometry() VTK_OVERRIDE;
- double *GetBounds() VTK_OVERRIDE;
+ void ShallowCopy(vtkProp *prop) override;
+ void DeepCopy(vtkProp *prop) override;
+ void GetActors(vtkPropCollection *) override;
+ void ReleaseGraphicsResources(vtkWindow *) override;
+ int RenderOpaqueGeometry(vtkViewport *viewport) override;
+ int RenderTranslucentPolygonalGeometry(vtkViewport *viewport) override;
+ int HasTranslucentPolygonalGeometry() override;
+ double *GetBounds() override;
//@}
//@{
@@ -148,7 +148,7 @@ public:
/**
* Toggle highlighting (used when the cube is selected).
*/
- void Highlight(int highlight) VTK_OVERRIDE;
+ void Highlight(int highlight) override;
//@}
//@{
@@ -217,7 +217,7 @@ public:
protected:
vtkMeasurementCubeHandleRepresentation3D();
- ~vtkMeasurementCubeHandleRepresentation3D() VTK_OVERRIDE;
+ ~vtkMeasurementCubeHandleRepresentation3D() override;
vtkActor * Actor;
vtkPolyDataMapper * Mapper;
@@ -241,7 +241,7 @@ protected:
char * LengthUnit;
// Register internal Pickers within PickingManager
- void RegisterPickers() VTK_OVERRIDE;
+ void RegisterPickers() override;
// Methods to manipulate the cursor
virtual void Translate(double *p1, double *p2);
diff --git a/Interaction/Widgets/vtkOrientationMarkerWidget.cxx b/Interaction/Widgets/vtkOrientationMarkerWidget.cxx
index 7b9a8ee55f764f2326ef3061bcd08fa52206497a..29b7f0c90a158443c3f31ba0233e3d6c51a437ee 100644
--- a/Interaction/Widgets/vtkOrientationMarkerWidget.cxx
+++ b/Interaction/Widgets/vtkOrientationMarkerWidget.cxx
@@ -43,7 +43,7 @@ public:
this->OrientationMarkerWidget = nullptr;
}
- void Execute(vtkObject* wdg, unsigned long event, void *calldata) VTK_OVERRIDE
+ void Execute(vtkObject* wdg, unsigned long event, void *calldata) override
{
if (this->OrientationMarkerWidget)
{
diff --git a/Interaction/Widgets/vtkOrientationMarkerWidget.h b/Interaction/Widgets/vtkOrientationMarkerWidget.h
index 0b39aed36695fe21349eb2fc594b0fca1f723193..850d7a9f75a26b3adaf6fdaa416164e6edb2ad8d 100644
--- a/Interaction/Widgets/vtkOrientationMarkerWidget.h
+++ b/Interaction/Widgets/vtkOrientationMarkerWidget.h
@@ -83,7 +83,7 @@ class VTKINTERACTIONWIDGETS_EXPORT vtkOrientationMarkerWidget : public vtkIntera
public:
static vtkOrientationMarkerWidget* New();
vtkTypeMacro(vtkOrientationMarkerWidget, vtkInteractorObserver);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -96,7 +96,7 @@ public:
/**
* Enable/disable the widget. Default is 0 (disabled).
*/
- void SetEnabled(int) VTK_OVERRIDE;
+ void SetEnabled(int) override;
/**
* Callback to keep the camera for the orientation marker up to date with the
@@ -156,12 +156,12 @@ public:
* Need to reimplement this->Modified() because of the
* vtkSetVector4Macro/vtkGetVector4Macro use
*/
- void Modified() VTK_OVERRIDE;
+ void Modified() override;
//@}
protected:
vtkOrientationMarkerWidget();
- ~vtkOrientationMarkerWidget() VTK_OVERRIDE;
+ ~vtkOrientationMarkerWidget() override;
vtkRenderer *Renderer;
vtkProp *OrientationMarker;
diff --git a/Interaction/Widgets/vtkOrientedGlyphContourRepresentation.h b/Interaction/Widgets/vtkOrientedGlyphContourRepresentation.h
index d0420746bee36cb411ff142bca38d18246da6366..f7ea62151737b517317ebc4a3838e0d992128c14 100644
--- a/Interaction/Widgets/vtkOrientedGlyphContourRepresentation.h
+++ b/Interaction/Widgets/vtkOrientedGlyphContourRepresentation.h
@@ -51,7 +51,7 @@ public:
* Standard methods for instances of this class.
*/
vtkTypeMacro(vtkOrientedGlyphContourRepresentation,vtkContourRepresentation);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -103,29 +103,29 @@ public:
* are the methods that the widget and its representation use to
* communicate with each other.
*/
- void SetRenderer(vtkRenderer *ren) VTK_OVERRIDE;
- void BuildRepresentation() VTK_OVERRIDE;
- void StartWidgetInteraction(double eventPos[2]) VTK_OVERRIDE;
- void WidgetInteraction(double eventPos[2]) VTK_OVERRIDE;
- int ComputeInteractionState(int X, int Y, int modified=0) VTK_OVERRIDE;
+ void SetRenderer(vtkRenderer *ren) override;
+ void BuildRepresentation() override;
+ void StartWidgetInteraction(double eventPos[2]) override;
+ void WidgetInteraction(double eventPos[2]) override;
+ int ComputeInteractionState(int X, int Y, int modified=0) override;
//@}
//@{
/**
* Methods to make this class behave as a vtkProp.
*/
- void GetActors(vtkPropCollection *) VTK_OVERRIDE;
- void ReleaseGraphicsResources(vtkWindow *) VTK_OVERRIDE;
- int RenderOverlay(vtkViewport *viewport) VTK_OVERRIDE;
- int RenderOpaqueGeometry(vtkViewport *viewport) VTK_OVERRIDE;
- int RenderTranslucentPolygonalGeometry(vtkViewport *viewport) VTK_OVERRIDE;
- int HasTranslucentPolygonalGeometry() VTK_OVERRIDE;
+ void GetActors(vtkPropCollection *) override;
+ void ReleaseGraphicsResources(vtkWindow *) override;
+ int RenderOverlay(vtkViewport *viewport) override;
+ int RenderOpaqueGeometry(vtkViewport *viewport) override;
+ int RenderTranslucentPolygonalGeometry(vtkViewport *viewport) override;
+ int HasTranslucentPolygonalGeometry() override;
//@}
/**
* Get the points in this contour as a vtkPolyData.
*/
- vtkPolyData * GetContourRepresentationAsPolyData() VTK_OVERRIDE;
+ vtkPolyData * GetContourRepresentationAsPolyData() override;
//@{
/**
@@ -149,16 +149,16 @@ public:
* A flag to indicate whether to show the Selected nodes
* Default is to set it to false.
*/
- void SetShowSelectedNodes(int) VTK_OVERRIDE;
+ void SetShowSelectedNodes(int) override;
/**
* Return the bounds of the representation
*/
- double *GetBounds() VTK_OVERRIDE;
+ double *GetBounds() override;
protected:
vtkOrientedGlyphContourRepresentation();
- ~vtkOrientedGlyphContourRepresentation() VTK_OVERRIDE;
+ ~vtkOrientedGlyphContourRepresentation() override;
// Render the cursor
vtkActor *Actor;
@@ -212,7 +212,7 @@ protected:
int AlwaysOnTop;
- void BuildLines() VTK_OVERRIDE;
+ void BuildLines() override;
private:
vtkOrientedGlyphContourRepresentation(const vtkOrientedGlyphContourRepresentation&) VTK_DELETE_FUNCTION;
diff --git a/Interaction/Widgets/vtkOrientedGlyphFocalPlaneContourRepresentation.h b/Interaction/Widgets/vtkOrientedGlyphFocalPlaneContourRepresentation.h
index 5e89340caf7d5013adba036b8d392adf599d273e..d771cc159fa00235c9f5bbe84b7b4a175ffe37aa 100644
--- a/Interaction/Widgets/vtkOrientedGlyphFocalPlaneContourRepresentation.h
+++ b/Interaction/Widgets/vtkOrientedGlyphFocalPlaneContourRepresentation.h
@@ -57,7 +57,7 @@ public:
*/
vtkTypeMacro(vtkOrientedGlyphFocalPlaneContourRepresentation,
vtkFocalPlaneContourRepresentation);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -109,29 +109,29 @@ public:
* are the methods that the widget and its representation use to
* communicate with each other.
*/
- void SetRenderer(vtkRenderer *ren) VTK_OVERRIDE;
- void BuildRepresentation() VTK_OVERRIDE;
- void StartWidgetInteraction(double eventPos[2]) VTK_OVERRIDE;
- void WidgetInteraction(double eventPos[2]) VTK_OVERRIDE;
- int ComputeInteractionState(int X, int Y, int modified=0) VTK_OVERRIDE;
+ void SetRenderer(vtkRenderer *ren) override;
+ void BuildRepresentation() override;
+ void StartWidgetInteraction(double eventPos[2]) override;
+ void WidgetInteraction(double eventPos[2]) override;
+ int ComputeInteractionState(int X, int Y, int modified=0) override;
//@}
//@{
/**
* Methods to make this class behave as a vtkProp.
*/
- void GetActors2D(vtkPropCollection *) VTK_OVERRIDE;
- void ReleaseGraphicsResources(vtkWindow *) VTK_OVERRIDE;
- int RenderOverlay(vtkViewport *viewport) VTK_OVERRIDE;
- int RenderOpaqueGeometry(vtkViewport *viewport) VTK_OVERRIDE;
- int RenderTranslucentPolygonalGeometry(vtkViewport *viewport) VTK_OVERRIDE;
- int HasTranslucentPolygonalGeometry() VTK_OVERRIDE;
+ void GetActors2D(vtkPropCollection *) override;
+ void ReleaseGraphicsResources(vtkWindow *) override;
+ int RenderOverlay(vtkViewport *viewport) override;
+ int RenderOpaqueGeometry(vtkViewport *viewport) override;
+ int RenderTranslucentPolygonalGeometry(vtkViewport *viewport) override;
+ int HasTranslucentPolygonalGeometry() override;
//@}
/**
* Get the points in this contour as a vtkPolyData.
*/
- vtkPolyData * GetContourRepresentationAsPolyData() VTK_OVERRIDE;
+ vtkPolyData * GetContourRepresentationAsPolyData() override;
/**
* Direction cosines of the plane on which the contour lies
@@ -144,7 +144,7 @@ public:
protected:
vtkOrientedGlyphFocalPlaneContourRepresentation();
- ~vtkOrientedGlyphFocalPlaneContourRepresentation() VTK_OVERRIDE;
+ ~vtkOrientedGlyphFocalPlaneContourRepresentation() override;
// Render the cursor
vtkActor2D *Actor;
@@ -197,7 +197,7 @@ protected:
// widget is focused - maintain this distance during interaction.
double InteractionOffset[2];
- void BuildLines() VTK_OVERRIDE;
+ void BuildLines() override;
private:
vtkOrientedGlyphFocalPlaneContourRepresentation(const vtkOrientedGlyphFocalPlaneContourRepresentation&) VTK_DELETE_FUNCTION;
diff --git a/Interaction/Widgets/vtkOrientedPolygonalHandleRepresentation3D.h b/Interaction/Widgets/vtkOrientedPolygonalHandleRepresentation3D.h
index 4020ac0dfb5b668c83fd71c1ba5feb38cbf9a902..63034cf523c7f5579e01d7d51eedf3a1bf6008fb 100644
--- a/Interaction/Widgets/vtkOrientedPolygonalHandleRepresentation3D.h
+++ b/Interaction/Widgets/vtkOrientedPolygonalHandleRepresentation3D.h
@@ -49,17 +49,17 @@ public:
*/
vtkTypeMacro(vtkOrientedPolygonalHandleRepresentation3D,
vtkAbstractPolygonalHandleRepresentation3D);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
protected:
vtkOrientedPolygonalHandleRepresentation3D();
- ~vtkOrientedPolygonalHandleRepresentation3D() VTK_OVERRIDE;
+ ~vtkOrientedPolygonalHandleRepresentation3D() override;
/**
* Override the superclass method.
*/
- void UpdateHandle() VTK_OVERRIDE;
+ void UpdateHandle() override;
private:
vtkOrientedPolygonalHandleRepresentation3D(const vtkOrientedPolygonalHandleRepresentation3D&) VTK_DELETE_FUNCTION;
diff --git a/Interaction/Widgets/vtkParallelopipedRepresentation.h b/Interaction/Widgets/vtkParallelopipedRepresentation.h
index ddb2d42088cc2f4cee1627812213b24d47ba4ad4..27c1d07f0a59e0c117d354808babede103639370 100644
--- a/Interaction/Widgets/vtkParallelopipedRepresentation.h
+++ b/Interaction/Widgets/vtkParallelopipedRepresentation.h
@@ -61,13 +61,13 @@ public:
* Standard methods for instances of this class.
*/
vtkTypeMacro(vtkParallelopipedRepresentation,vtkWidgetRepresentation);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
* Methods to satisfy the superclass.
*/
- void GetActors(vtkPropCollection *pc) VTK_OVERRIDE;
+ void GetActors(vtkPropCollection *pc) override;
//@{
/**
@@ -85,7 +85,7 @@ public:
* Corner 3 - 7 - 4 - 0 - 3 forms a face
*/
virtual void PlaceWidget(double corners[8][3]);
- void PlaceWidget(double bounds[6]) VTK_OVERRIDE;
+ void PlaceWidget(double bounds[6]) override;
//@}
//@{
@@ -113,7 +113,7 @@ public:
/**
* The parallelopiped polydata.
*/
- double *GetBounds() VTK_OVERRIDE;
+ double *GetBounds() override;
//@{
/**
@@ -161,22 +161,22 @@ public:
* This actually constructs the geometry of the widget from the various
* data parameters.
*/
- void BuildRepresentation() VTK_OVERRIDE;
+ void BuildRepresentation() override;
//@{
/**
* Methods required by vtkProp superclass.
*/
- void ReleaseGraphicsResources(vtkWindow *w) VTK_OVERRIDE;
- int RenderOverlay(vtkViewport *viewport) VTK_OVERRIDE;
- int RenderOpaqueGeometry(vtkViewport *viewport) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *w) override;
+ int RenderOverlay(vtkViewport *viewport) override;
+ int RenderOpaqueGeometry(vtkViewport *viewport) override;
//@}
/**
* Given and x-y display coordinate, compute the interaction state of
* the widget.
*/
- int ComputeInteractionState(int X, int Y, int modify=0) VTK_OVERRIDE;
+ int ComputeInteractionState(int X, int Y, int modify=0) override;
// Manage the state of the widget
enum _InteractionState
@@ -221,7 +221,7 @@ public:
protected:
vtkParallelopipedRepresentation();
- ~vtkParallelopipedRepresentation() VTK_OVERRIDE;
+ ~vtkParallelopipedRepresentation() override;
/**
* Translate the nth PtId (0 <= n <= 15) by the specified amount.
diff --git a/Interaction/Widgets/vtkParallelopipedWidget.h b/Interaction/Widgets/vtkParallelopipedWidget.h
index 93d3e31e767cf8a82966162ec326959e2633030a..60e7e5dc06edb439d72a0fa1ef5d35073781036e 100644
--- a/Interaction/Widgets/vtkParallelopipedWidget.h
+++ b/Interaction/Widgets/vtkParallelopipedWidget.h
@@ -60,14 +60,14 @@ public:
static vtkParallelopipedWidget *New();
vtkTypeMacro(vtkParallelopipedWidget,vtkAbstractWidget);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Override the superclass method. This is a composite widget, (it internally
* consists of handle widgets). We will override the superclass method, so
* that we can pass the enabled state to the internal widgets as well.
*/
- void SetEnabled(int) VTK_OVERRIDE;
+ void SetEnabled(int) override;
/**
* Specify an instance of vtkWidgetRepresentation used to represent this
@@ -99,17 +99,17 @@ public:
/**
* Create the default widget representation if one is not set.
*/
- void CreateDefaultRepresentation() VTK_OVERRIDE;
+ void CreateDefaultRepresentation() override;
/**
* Methods to change the whether the widget responds to interaction.
* Overridden to pass the state to component widgets.
*/
- void SetProcessEvents(int) VTK_OVERRIDE;
+ void SetProcessEvents(int) override;
protected:
vtkParallelopipedWidget();
- ~vtkParallelopipedWidget() VTK_OVERRIDE;
+ ~vtkParallelopipedWidget() override;
static void RequestResizeCallback (vtkAbstractWidget* );
static void RequestResizeAlongAnAxisCallback (vtkAbstractWidget* );
@@ -127,10 +127,10 @@ protected:
//@}
// helper methods for cursor management
- void SetCursor(int state) VTK_OVERRIDE;
+ void SetCursor(int state) override;
// To break reference count loops
- void ReportReferences(vtkGarbageCollector* collector) VTK_OVERRIDE;
+ void ReportReferences(vtkGarbageCollector* collector) override;
// The positioning handle widgets
vtkHandleWidget **HandleWidgets;
diff --git a/Interaction/Widgets/vtkPlaneWidget.h b/Interaction/Widgets/vtkPlaneWidget.h
index 56b54f0ab56237d7e374f32e0ef5652156398de0..74f7dd5f2608635b0b4a2cce15b00886031102b2 100644
--- a/Interaction/Widgets/vtkPlaneWidget.h
+++ b/Interaction/Widgets/vtkPlaneWidget.h
@@ -106,18 +106,18 @@ public:
static vtkPlaneWidget *New();
vtkTypeMacro(vtkPlaneWidget,vtkPolyDataSourceWidget);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
* Methods that satisfy the superclass' API.
*/
- void SetEnabled(int) VTK_OVERRIDE;
- void PlaceWidget(double bounds[6]) VTK_OVERRIDE;
- void PlaceWidget() VTK_OVERRIDE
+ void SetEnabled(int) override;
+ void PlaceWidget(double bounds[6]) override;
+ void PlaceWidget() override
{this->Superclass::PlaceWidget();}
void PlaceWidget(double xmin, double xmax, double ymin, double ymax,
- double zmin, double zmax) VTK_OVERRIDE
+ double zmin, double zmax) override
{this->Superclass::PlaceWidget(xmin,xmax,ymin,ymax,zmin,zmax);}
//@}
@@ -243,13 +243,13 @@ public:
* to have the initial placement follow suit. Or, make changes after the
* widget has been initialised and call UpdatePlacement() to realise.
*/
- vtkPolyDataAlgorithm* GetPolyDataAlgorithm() VTK_OVERRIDE;
+ vtkPolyDataAlgorithm* GetPolyDataAlgorithm() override;
/**
* Satisfies superclass API. This will change the state of the widget to
* match changes that have been made to the underlying PolyDataSource
*/
- void UpdatePlacement(void) VTK_OVERRIDE;
+ void UpdatePlacement(void) override;
//@{
/**
@@ -273,7 +273,7 @@ public:
protected:
vtkPlaneWidget();
- ~vtkPlaneWidget() VTK_OVERRIDE;
+ ~vtkPlaneWidget() override;
// Manage the state of the widget
int State;
@@ -329,7 +329,7 @@ protected:
void HandlesOn(double length);
void HandlesOff();
int HighlightHandle(vtkProp *prop); //returns cell id
- void SizeHandles() VTK_OVERRIDE;
+ void SizeHandles() override;
// the normal cone
vtkActor *ConeActor;
@@ -358,7 +358,7 @@ protected:
vtkActor *CurrentHandle;
// Register internal Pickers within PickingManager
- void RegisterPickers() VTK_OVERRIDE;
+ void RegisterPickers() override;
// Methods to manipulate the hexahedron.
void MoveOrigin(double *p1, double *p2);
diff --git a/Interaction/Widgets/vtkPlaybackRepresentation.h b/Interaction/Widgets/vtkPlaybackRepresentation.h
index b7a6e72b7125d223e8284bd94052907bf5c9cb73..172f049ebef5b0641b6deccaa40f91c603c57422 100644
--- a/Interaction/Widgets/vtkPlaybackRepresentation.h
+++ b/Interaction/Widgets/vtkPlaybackRepresentation.h
@@ -52,7 +52,7 @@ public:
* Standard VTK class methods.
*/
vtkTypeMacro(vtkPlaybackRepresentation,vtkBorderRepresentation);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -76,8 +76,8 @@ public:
/**
* Satisfy the superclasses' API.
*/
- void BuildRepresentation() VTK_OVERRIDE;
- void GetSize(double size[2]) VTK_OVERRIDE
+ void BuildRepresentation() override;
+ void GetSize(double size[2]) override
{size[0]=12.0; size[1]=2.0;}
//@{
@@ -85,17 +85,17 @@ public:
* These methods are necessary to make this representation behave as
* a vtkProp.
*/
- void GetActors2D(vtkPropCollection*) VTK_OVERRIDE;
- void ReleaseGraphicsResources(vtkWindow*) VTK_OVERRIDE;
- int RenderOverlay(vtkViewport*) VTK_OVERRIDE;
- int RenderOpaqueGeometry(vtkViewport*) VTK_OVERRIDE;
- int RenderTranslucentPolygonalGeometry(vtkViewport*) VTK_OVERRIDE;
- int HasTranslucentPolygonalGeometry() VTK_OVERRIDE;
+ void GetActors2D(vtkPropCollection*) override;
+ void ReleaseGraphicsResources(vtkWindow*) override;
+ int RenderOverlay(vtkViewport*) override;
+ int RenderOpaqueGeometry(vtkViewport*) override;
+ int RenderTranslucentPolygonalGeometry(vtkViewport*) override;
+ int HasTranslucentPolygonalGeometry() override;
//@}
protected:
vtkPlaybackRepresentation();
- ~vtkPlaybackRepresentation() VTK_OVERRIDE;
+ ~vtkPlaybackRepresentation() override;
// representation geometry
vtkPoints *Points;
diff --git a/Interaction/Widgets/vtkPlaybackWidget.h b/Interaction/Widgets/vtkPlaybackWidget.h
index e1de4ef8a8ef961080bfbdf5969bbc502f90105f..cddca435764ff47fe72806fc4428083ef2187e40 100644
--- a/Interaction/Widgets/vtkPlaybackWidget.h
+++ b/Interaction/Widgets/vtkPlaybackWidget.h
@@ -47,7 +47,7 @@ public:
* Standar VTK class methods.
*/
vtkTypeMacro(vtkPlaybackWidget,vtkBorderWidget);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
@@ -61,17 +61,17 @@ public:
/**
* Create the default widget representation if one is not set.
*/
- void CreateDefaultRepresentation() VTK_OVERRIDE;
+ void CreateDefaultRepresentation() override;
protected:
vtkPlaybackWidget();
- ~vtkPlaybackWidget() VTK_OVERRIDE;
+ ~vtkPlaybackWidget() override;
/**
* When selecting the interior of this widget, special operations occur
* (i.e., operating the playback controls).
*/
- void SelectRegion(double eventPos[2]) VTK_OVERRIDE;
+ void SelectRegion(double eventPos[2]) override;
private:
vtkPlaybackWidget(const vtkPlaybackWidget&) VTK_DELETE_FUNCTION;
diff --git a/Interaction/Widgets/vtkPointHandleRepresentation2D.h b/Interaction/Widgets/vtkPointHandleRepresentation2D.h
index af1b3b5aa237882c496d05330eb3f125c6e82827..836bc277789ef03f729edeec6b690750f630e485 100644
--- a/Interaction/Widgets/vtkPointHandleRepresentation2D.h
+++ b/Interaction/Widgets/vtkPointHandleRepresentation2D.h
@@ -53,7 +53,7 @@ public:
* Standard methods for instances of this class.
*/
vtkTypeMacro(vtkPointHandleRepresentation2D,vtkHandleRepresentation);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -71,7 +71,7 @@ public:
* the superclasses SetDisplayPosition in order to set the focal point
* of the cursor.
*/
- void SetDisplayPosition(double xyz[3]) VTK_OVERRIDE;
+ void SetDisplayPosition(double xyz[3]) override;
//@{
/**
@@ -89,25 +89,25 @@ public:
* methods. These are the methods that the widget and its representation
* use to communicate with each other.
*/
- double *GetBounds() VTK_OVERRIDE;
- void BuildRepresentation() VTK_OVERRIDE;
- void StartWidgetInteraction(double eventPos[2]) VTK_OVERRIDE;
- void WidgetInteraction(double eventPos[2]) VTK_OVERRIDE;
- int ComputeInteractionState(int X, int Y, int modify=0) VTK_OVERRIDE;
+ double *GetBounds() override;
+ void BuildRepresentation() override;
+ void StartWidgetInteraction(double eventPos[2]) override;
+ void WidgetInteraction(double eventPos[2]) override;
+ int ComputeInteractionState(int X, int Y, int modify=0) override;
//@}
//@{
/**
* Methods to make this class behave as a vtkProp.
*/
- void ShallowCopy(vtkProp *prop) VTK_OVERRIDE;
- void DeepCopy(vtkProp *prop) VTK_OVERRIDE;
- void GetActors2D(vtkPropCollection *) VTK_OVERRIDE;
- void ReleaseGraphicsResources(vtkWindow *) VTK_OVERRIDE;
- int RenderOverlay(vtkViewport *viewport) VTK_OVERRIDE;
+ void ShallowCopy(vtkProp *prop) override;
+ void DeepCopy(vtkProp *prop) override;
+ void GetActors2D(vtkPropCollection *) override;
+ void ReleaseGraphicsResources(vtkWindow *) override;
+ int RenderOverlay(vtkViewport *viewport) override;
//@}
- void Highlight(int highlight) VTK_OVERRIDE;
+ void Highlight(int highlight) override;
/**
* Override the superclass implementation. This class does not use a
@@ -115,11 +115,11 @@ public:
* space. Since this class constrains points to lie in an overlay
* plane anyway, we don't care. Just returns.
*/
- void SetPointPlacer ( vtkPointPlacer * ) VTK_OVERRIDE;
+ void SetPointPlacer ( vtkPointPlacer * ) override;
protected:
vtkPointHandleRepresentation2D();
- ~vtkPointHandleRepresentation2D() VTK_OVERRIDE;
+ ~vtkPointHandleRepresentation2D() override;
// Render the cursor
vtkActor2D *Actor;
diff --git a/Interaction/Widgets/vtkPointHandleRepresentation3D.h b/Interaction/Widgets/vtkPointHandleRepresentation3D.h
index e307955233ad8633d6a93e510fe4e50598e71d0c..cabba48a1d004105bee069a2085051f4e4993f5f 100644
--- a/Interaction/Widgets/vtkPointHandleRepresentation3D.h
+++ b/Interaction/Widgets/vtkPointHandleRepresentation3D.h
@@ -50,7 +50,7 @@ public:
* Standard methods for instances of this class.
*/
vtkTypeMacro(vtkPointHandleRepresentation3D,vtkHandleRepresentation);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -61,8 +61,8 @@ public:
* the superclasses' SetWorldPosition() and SetDisplayPosition() in
* order to set the focal point of the cursor properly.
*/
- void SetWorldPosition(double p[3]) VTK_OVERRIDE;
- void SetDisplayPosition(double p[3]) VTK_OVERRIDE;
+ void SetWorldPosition(double p[3]) override;
+ void SetDisplayPosition(double p[3]) override;
//@}
/**
@@ -174,46 +174,46 @@ public:
/**
* Overload the superclasses SetHandleSize() method to update internal variables.
*/
- void SetHandleSize(double size) VTK_OVERRIDE;
+ void SetHandleSize(double size) override;
//@{
/**
* Methods to make this class properly act like a vtkWidgetRepresentation.
*/
- double *GetBounds() VTK_OVERRIDE;
- void BuildRepresentation() VTK_OVERRIDE;
- void StartWidgetInteraction(double eventPos[2]) VTK_OVERRIDE;
- void WidgetInteraction(double eventPos[2]) VTK_OVERRIDE;
- int ComputeInteractionState(int X, int Y, int modify=0) VTK_OVERRIDE;
- void PlaceWidget(double bounds[6]) VTK_OVERRIDE;
+ double *GetBounds() override;
+ void BuildRepresentation() override;
+ void StartWidgetInteraction(double eventPos[2]) override;
+ void WidgetInteraction(double eventPos[2]) override;
+ int ComputeInteractionState(int X, int Y, int modify=0) override;
+ void PlaceWidget(double bounds[6]) override;
void StartComplexInteraction(
vtkRenderWindowInteractor *iren,
vtkAbstractWidget *widget,
- unsigned long event, void *calldata) VTK_OVERRIDE;
+ unsigned long event, void *calldata) override;
void ComplexInteraction(
vtkRenderWindowInteractor *iren,
vtkAbstractWidget *widget,
- unsigned long event, void *calldata) VTK_OVERRIDE;
+ unsigned long event, void *calldata) override;
int ComputeComplexInteractionState(
vtkRenderWindowInteractor *iren,
vtkAbstractWidget *widget,
- unsigned long event, void *calldata, int modify = 0) VTK_OVERRIDE;
+ unsigned long event, void *calldata, int modify = 0) override;
//@}
//@{
/**
* Methods to make this class behave as a vtkProp.
*/
- void ShallowCopy(vtkProp *prop) VTK_OVERRIDE;
- void DeepCopy(vtkProp *prop) VTK_OVERRIDE;
- void GetActors(vtkPropCollection *) VTK_OVERRIDE;
- void ReleaseGraphicsResources(vtkWindow *) VTK_OVERRIDE;
- int RenderOpaqueGeometry(vtkViewport *viewport) VTK_OVERRIDE;
- int RenderTranslucentPolygonalGeometry(vtkViewport *viewport) VTK_OVERRIDE;
- int HasTranslucentPolygonalGeometry() VTK_OVERRIDE;
+ void ShallowCopy(vtkProp *prop) override;
+ void DeepCopy(vtkProp *prop) override;
+ void GetActors(vtkPropCollection *) override;
+ void ReleaseGraphicsResources(vtkWindow *) override;
+ int RenderOpaqueGeometry(vtkViewport *viewport) override;
+ int RenderTranslucentPolygonalGeometry(vtkViewport *viewport) override;
+ int HasTranslucentPolygonalGeometry() override;
//@}
- void Highlight(int highlight) VTK_OVERRIDE;
+ void Highlight(int highlight) override;
//@{
/**
@@ -234,7 +234,7 @@ public:
protected:
vtkPointHandleRepresentation3D();
- ~vtkPointHandleRepresentation3D() VTK_OVERRIDE;
+ ~vtkPointHandleRepresentation3D() override;
// the cursor3D
vtkActor *Actor;
@@ -248,7 +248,7 @@ protected:
double LastEventPosition[3];
// Register internal Pickers within PickingManager
- void RegisterPickers() VTK_OVERRIDE;
+ void RegisterPickers() override;
// Methods to manipulate the cursor
int ConstraintAxis;
diff --git a/Interaction/Widgets/vtkPointPlacer.h b/Interaction/Widgets/vtkPointPlacer.h
index ebd089a128f88d72764d9d524e2daef5dceeb43b..19b16c49b39b553005c79275703d1bfce43f0038 100644
--- a/Interaction/Widgets/vtkPointPlacer.h
+++ b/Interaction/Widgets/vtkPointPlacer.h
@@ -59,7 +59,7 @@ public:
* Standard methods for instances of this class.
*/
vtkTypeMacro(vtkPointPlacer,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
@@ -157,7 +157,7 @@ public:
protected:
vtkPointPlacer();
- ~vtkPointPlacer() VTK_OVERRIDE;
+ ~vtkPointPlacer() override;
int PixelTolerance;
double WorldTolerance;
diff --git a/Interaction/Widgets/vtkPointWidget.h b/Interaction/Widgets/vtkPointWidget.h
index 7503c76b339b25dd04c46f6e7160791766078546..b391ade3aee62f0dd96d45c3a199d574a9b16a1e 100644
--- a/Interaction/Widgets/vtkPointWidget.h
+++ b/Interaction/Widgets/vtkPointWidget.h
@@ -83,18 +83,18 @@ public:
static vtkPointWidget *New();
vtkTypeMacro(vtkPointWidget,vtk3DWidget);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
* Methods that satisfy the superclass' API.
*/
- void SetEnabled(int) VTK_OVERRIDE;
- void PlaceWidget(double bounds[6]) VTK_OVERRIDE;
- void PlaceWidget() VTK_OVERRIDE
+ void SetEnabled(int) override;
+ void PlaceWidget(double bounds[6]) override;
+ void PlaceWidget() override
{this->Superclass::PlaceWidget();}
void PlaceWidget(double xmin, double xmax, double ymin, double ymax,
- double zmin, double zmax) VTK_OVERRIDE
+ double zmin, double zmax) override
{this->Superclass::PlaceWidget(xmin,xmax,ymin,ymax,zmin,zmax);}
//@}
@@ -223,7 +223,7 @@ public:
protected:
vtkPointWidget();
- ~vtkPointWidget() VTK_OVERRIDE;
+ ~vtkPointWidget() override;
// Manage the state of the widget
friend class vtkLineWidget;
@@ -263,7 +263,7 @@ protected:
vtkCellPicker *CursorPicker;
// Register internal Pickers within PickingManager
- void RegisterPickers() VTK_OVERRIDE;
+ void RegisterPickers() override;
// Methods to manipulate the cursor
int ConstraintAxis;
diff --git a/Interaction/Widgets/vtkPolyDataContourLineInterpolator.h b/Interaction/Widgets/vtkPolyDataContourLineInterpolator.h
index 079b9ed556893675eecc70e06efc55fd2cf12e27..63ac6cf6f539a3661cd5dbcbce6204043097f745 100644
--- a/Interaction/Widgets/vtkPolyDataContourLineInterpolator.h
+++ b/Interaction/Widgets/vtkPolyDataContourLineInterpolator.h
@@ -41,7 +41,7 @@ public:
*/
vtkTypeMacro(vtkPolyDataContourLineInterpolator,
vtkContourLineInterpolator);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
@@ -51,7 +51,7 @@ public:
*/
int InterpolateLine( vtkRenderer *ren,
vtkContourRepresentation *rep,
- int idx1, int idx2 ) VTK_OVERRIDE = 0;
+ int idx1, int idx2 ) override = 0;
/**
* The interpolator is given a chance to update the node.
@@ -62,7 +62,7 @@ public:
*/
int UpdateNode( vtkRenderer *,
vtkContourRepresentation *,
- double * vtkNotUsed(node), int vtkNotUsed(idx) ) VTK_OVERRIDE = 0;
+ double * vtkNotUsed(node), int vtkNotUsed(idx) ) override = 0;
//@{
/**
@@ -74,7 +74,7 @@ public:
protected:
vtkPolyDataContourLineInterpolator();
- ~vtkPolyDataContourLineInterpolator() VTK_OVERRIDE;
+ ~vtkPolyDataContourLineInterpolator() override;
vtkPolyDataCollection *Polys;
diff --git a/Interaction/Widgets/vtkPolyDataPointPlacer.h b/Interaction/Widgets/vtkPolyDataPointPlacer.h
index 4615bd4172b133eb8b16fddefd6846b18d56b6cd..13830dd38c6d979dab76613a63cb8703edbc75b1 100644
--- a/Interaction/Widgets/vtkPolyDataPointPlacer.h
+++ b/Interaction/Widgets/vtkPolyDataPointPlacer.h
@@ -55,7 +55,7 @@ public:
* Standard methods for instances of this class.
*/
vtkTypeMacro(vtkPolyDataPointPlacer,vtkPointPlacer);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
// Descuription:
@@ -78,7 +78,7 @@ public:
int ComputeWorldPosition( vtkRenderer *ren,
double displayPos[2],
double worldPos[3],
- double worldOrient[9] ) VTK_OVERRIDE;
+ double worldOrient[9] ) override;
/**
* Given a renderer, a display position, and a reference world
@@ -90,25 +90,25 @@ public:
double displayPos[2],
double refWorldPos[3],
double worldPos[3],
- double worldOrient[9] ) VTK_OVERRIDE;
+ double worldOrient[9] ) override;
/**
* Given a world position check the validity of this
* position according to the constraints of the placer
*/
- int ValidateWorldPosition( double worldPos[3] ) VTK_OVERRIDE;
+ int ValidateWorldPosition( double worldPos[3] ) override;
/**
* Given a display position, check the validity of this position.
*/
- int ValidateDisplayPosition( vtkRenderer *, double displayPos[2] ) VTK_OVERRIDE;
+ int ValidateDisplayPosition( vtkRenderer *, double displayPos[2] ) override;
/**
* Given a world position and a world orientation,
* validate it according to the constraints of the placer.
*/
int ValidateWorldPosition( double worldPos[3],
- double worldOrient[9] ) VTK_OVERRIDE;
+ double worldOrient[9] ) override;
//@{
/**
@@ -119,7 +119,7 @@ public:
protected:
vtkPolyDataPointPlacer();
- ~vtkPolyDataPointPlacer() VTK_OVERRIDE;
+ ~vtkPolyDataPointPlacer() override;
// The props that represents the terrain data (one or more) in a rendered
// scene
diff --git a/Interaction/Widgets/vtkPolyDataSourceWidget.h b/Interaction/Widgets/vtkPolyDataSourceWidget.h
index 5fd034c3f719c65fac07c6cdce6aa614c5ef54fe..2d3042b2fbddc0f7609d0379ae38b286365fd8ea 100644
--- a/Interaction/Widgets/vtkPolyDataSourceWidget.h
+++ b/Interaction/Widgets/vtkPolyDataSourceWidget.h
@@ -46,13 +46,13 @@ class VTKINTERACTIONWIDGETS_EXPORT vtkPolyDataSourceWidget : public vtk3DWidget
{
public:
vtkTypeMacro(vtkPolyDataSourceWidget, vtk3DWidget);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Overrides vtk3DWidget PlaceWidget() so that it doesn't complain if
* there's no Input and no Prop3D.
*/
- void PlaceWidget() VTK_OVERRIDE;
+ void PlaceWidget() override;
/**
* We have to redeclare this abstract, PlaceWidget() requires it. You HAVE
@@ -60,13 +60,13 @@ class VTKINTERACTIONWIDGETS_EXPORT vtkPolyDataSourceWidget : public vtk3DWidget
* and no Input, your PlaceWidget must make use of the underlying
* PolyDataSource to do its work.
*/
- void PlaceWidget(double bounds[6]) VTK_OVERRIDE = 0;
+ void PlaceWidget(double bounds[6]) override = 0;
/**
* Convenience method brought over from vtkPlaneWidget.
*/
void PlaceWidget(double xmin, double xmax, double ymin, double ymax,
- double zmin, double zmax) VTK_OVERRIDE
+ double zmin, double zmax) override
{this->Superclass::PlaceWidget(xmin,xmax,ymin,ymax,zmin,zmax);}
/**
diff --git a/Interaction/Widgets/vtkPolyLineRepresentation.h b/Interaction/Widgets/vtkPolyLineRepresentation.h
index afab2b98f63d20fe855a0cf3bdbe066fbdeb8741..c2c1cfda202b7b470eb9f674e63ec181328f5d2a 100644
--- a/Interaction/Widgets/vtkPolyLineRepresentation.h
+++ b/Interaction/Widgets/vtkPolyLineRepresentation.h
@@ -41,7 +41,7 @@ class VTKINTERACTIONWIDGETS_EXPORT vtkPolyLineRepresentation : public vtkCurveRe
public:
static vtkPolyLineRepresentation* New();
vtkTypeMacro(vtkPolyLineRepresentation, vtkCurveRepresentation);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Grab the polydata (including points) that defines the poly line.
@@ -51,23 +51,23 @@ public:
* provides the vtkPolyData and the points and polyline are added to
* it.
*/
- void GetPolyData(vtkPolyData *pd) VTK_OVERRIDE;
+ void GetPolyData(vtkPolyData *pd) override;
/**
* Set the number of handles for this widget.
*/
- void SetNumberOfHandles(int npts) VTK_OVERRIDE;
+ void SetNumberOfHandles(int npts) override;
/**
* Get the positions of the handles.
*/
- vtkDoubleArray* GetHandlePositions() VTK_OVERRIDE;
+ vtkDoubleArray* GetHandlePositions() override;
/**
* Get the true length of the poly line. Calculated as the summed
* lengths of the individual straight line segments.
*/
- double GetSummedLength() VTK_OVERRIDE;
+ double GetSummedLength() override;
/**
* Convenience method to allocate and set the handles from a
@@ -75,22 +75,22 @@ public:
* the poly line sets Closed to on and disregards the last point,
* otherwise Closed remains unchanged.
*/
- void InitializeHandles(vtkPoints* points) VTK_OVERRIDE;
+ void InitializeHandles(vtkPoints* points) override;
/**
* Build the representation for the poly line.
*/
- void BuildRepresentation() VTK_OVERRIDE;
+ void BuildRepresentation() override;
protected:
vtkPolyLineRepresentation();
- ~vtkPolyLineRepresentation() VTK_OVERRIDE;
+ ~vtkPolyLineRepresentation() override;
// The poly line source
vtkPolyLineSource *PolyLineSource;
// Specialized method to insert a handle on the poly line.
- void InsertHandleOnLine(double* pos) VTK_OVERRIDE;
+ void InsertHandleOnLine(double* pos) override;
private:
vtkPolyLineRepresentation(const vtkPolyLineRepresentation&) VTK_DELETE_FUNCTION;
diff --git a/Interaction/Widgets/vtkPolyLineWidget.h b/Interaction/Widgets/vtkPolyLineWidget.h
index 66d3ae906275dc6fcc4df3cd02c4722f62b2ceda..afc3512c123b3f0f48a688d0db1780c711e1781e 100644
--- a/Interaction/Widgets/vtkPolyLineWidget.h
+++ b/Interaction/Widgets/vtkPolyLineWidget.h
@@ -36,7 +36,7 @@ class VTKINTERACTIONWIDGETS_EXPORT vtkPolyLineWidget : public vtkAbstractWidget
public:
static vtkPolyLineWidget* New();
vtkTypeMacro(vtkPolyLineWidget, vtkAbstractWidget);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Specify an instance of vtkWidgetRepresentation used to represent this
@@ -53,11 +53,11 @@ public:
* Create the default widget representation if one is not set. By default,
* this is an instance of the vtkPolyLineRepresentation class.
*/
- void CreateDefaultRepresentation() VTK_OVERRIDE;
+ void CreateDefaultRepresentation() override;
protected:
vtkPolyLineWidget();
- ~vtkPolyLineWidget() VTK_OVERRIDE;
+ ~vtkPolyLineWidget() override;
int WidgetState;
enum _WidgetState {Start=0,Active};
diff --git a/Interaction/Widgets/vtkPolygonalHandleRepresentation3D.h b/Interaction/Widgets/vtkPolygonalHandleRepresentation3D.h
index bf4577c245c0844c33104dd6d67c99bcd377b006..ad2c6bd7f2c384b0a0ae77d904e6a5a6be9a135c 100644
--- a/Interaction/Widgets/vtkPolygonalHandleRepresentation3D.h
+++ b/Interaction/Widgets/vtkPolygonalHandleRepresentation3D.h
@@ -46,13 +46,13 @@ public:
*/
vtkTypeMacro(vtkPolygonalHandleRepresentation3D,
vtkAbstractPolygonalHandleRepresentation3D);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
* Set the position of the point in world and display coordinates.
*/
- void SetWorldPosition(double p[3]) VTK_OVERRIDE;
+ void SetWorldPosition(double p[3]) override;
//@{
/**
@@ -65,7 +65,7 @@ public:
protected:
vtkPolygonalHandleRepresentation3D();
- ~vtkPolygonalHandleRepresentation3D() VTK_OVERRIDE {}
+ ~vtkPolygonalHandleRepresentation3D() override {}
double Offset[3];
diff --git a/Interaction/Widgets/vtkPolygonalSurfaceContourLineInterpolator.h b/Interaction/Widgets/vtkPolygonalSurfaceContourLineInterpolator.h
index 360b20fd6c7482fc576374a8de19bc68e7ca3094..9e6b1f9a26bc225c5ea08e8ef8e44b2058c82450 100644
--- a/Interaction/Widgets/vtkPolygonalSurfaceContourLineInterpolator.h
+++ b/Interaction/Widgets/vtkPolygonalSurfaceContourLineInterpolator.h
@@ -54,7 +54,7 @@ public:
* Standard methods for instances of this class.
*/
vtkTypeMacro(vtkPolygonalSurfaceContourLineInterpolator, vtkPolyDataContourLineInterpolator);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
static vtkPolygonalSurfaceContourLineInterpolator *New();
@@ -66,7 +66,7 @@ public:
*/
int InterpolateLine( vtkRenderer *ren,
vtkContourRepresentation *rep,
- int idx1, int idx2 ) VTK_OVERRIDE;
+ int idx1, int idx2 ) override;
/**
* The interpolator is given a chance to update the node.
@@ -77,7 +77,7 @@ public:
*/
int UpdateNode( vtkRenderer *,
vtkContourRepresentation *,
- double * vtkNotUsed(node), int vtkNotUsed(idx) ) VTK_OVERRIDE;
+ double * vtkNotUsed(node), int vtkNotUsed(idx) ) override;
//@{
/**
@@ -98,7 +98,7 @@ public:
protected:
vtkPolygonalSurfaceContourLineInterpolator();
- ~vtkPolygonalSurfaceContourLineInterpolator() VTK_OVERRIDE;
+ ~vtkPolygonalSurfaceContourLineInterpolator() override;
/**
* Draw the polyline at a certain height (in the direction of the vertex
diff --git a/Interaction/Widgets/vtkPolygonalSurfacePointPlacer.h b/Interaction/Widgets/vtkPolygonalSurfacePointPlacer.h
index 726d997829b518d15db53ebc94c0ca43b1b2e972..894b5fa69afb8102eb8d90ccaddf4bc3e9caaec9 100644
--- a/Interaction/Widgets/vtkPolygonalSurfacePointPlacer.h
+++ b/Interaction/Widgets/vtkPolygonalSurfacePointPlacer.h
@@ -67,14 +67,14 @@ public:
* Standard methods for instances of this class.
*/
vtkTypeMacro(vtkPolygonalSurfacePointPlacer,vtkPolyDataPointPlacer);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
// Descuription:
// Add /remove a prop, to place points on
- void AddProp( vtkProp * ) VTK_OVERRIDE;
- void RemoveViewProp(vtkProp *prop) VTK_OVERRIDE;
- void RemoveAllProps() VTK_OVERRIDE;
+ void AddProp( vtkProp * ) override;
+ void RemoveViewProp(vtkProp *prop) override;
+ void RemoveAllProps() override;
/**
* Given a renderer and a display position in pixel coordinates,
@@ -87,7 +87,7 @@ public:
int ComputeWorldPosition( vtkRenderer *ren,
double displayPos[2],
double worldPos[3],
- double worldOrient[9] ) VTK_OVERRIDE;
+ double worldOrient[9] ) override;
/**
* Given a renderer, a display position, and a reference world
@@ -99,31 +99,31 @@ public:
double displayPos[2],
double refWorldPos[3],
double worldPos[3],
- double worldOrient[9] ) VTK_OVERRIDE;
+ double worldOrient[9] ) override;
/**
* Given a world position check the validity of this
* position according to the constraints of the placer
*/
- int ValidateWorldPosition( double worldPos[3] ) VTK_OVERRIDE;
+ int ValidateWorldPosition( double worldPos[3] ) override;
/**
* Give the node a chance to update its auxiliary point id.
*/
int UpdateNodeWorldPosition( double worldPos[3],
- vtkIdType nodePointId ) VTK_OVERRIDE;
+ vtkIdType nodePointId ) override;
/**
* Given a display position, check the validity of this position.
*/
- int ValidateDisplayPosition( vtkRenderer *, double displayPos[2] ) VTK_OVERRIDE;
+ int ValidateDisplayPosition( vtkRenderer *, double displayPos[2] ) override;
/**
* Given a world position and a world orientation,
* validate it according to the constraints of the placer.
*/
int ValidateWorldPosition( double worldPos[3],
- double worldOrient[9] ) VTK_OVERRIDE;
+ double worldOrient[9] ) override;
//@{
/**
@@ -172,7 +172,7 @@ public:
protected:
vtkPolygonalSurfacePointPlacer();
- ~vtkPolygonalSurfacePointPlacer() VTK_OVERRIDE;
+ ~vtkPolygonalSurfacePointPlacer() override;
// The props that represents the terrain data (one or more) in a rendered
// scene
diff --git a/Interaction/Widgets/vtkProgressBarRepresentation.h b/Interaction/Widgets/vtkProgressBarRepresentation.h
index a1cdc56cb84376ee6d0f633ec1441f0ae8db57ca..d91afc32c65e205837fe954b02058e5ccf04f9e5 100644
--- a/Interaction/Widgets/vtkProgressBarRepresentation.h
+++ b/Interaction/Widgets/vtkProgressBarRepresentation.h
@@ -47,7 +47,7 @@ public:
* Standard VTK class methods.
*/
vtkTypeMacro(vtkProgressBarRepresentation, vtkBorderRepresentation);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -99,8 +99,8 @@ public:
/**
* Satisfy the superclasses' API.
*/
- void BuildRepresentation() VTK_OVERRIDE;
- void GetSize(double size[2]) VTK_OVERRIDE;
+ void BuildRepresentation() override;
+ void GetSize(double size[2]) override;
//@}
//@{
@@ -108,17 +108,17 @@ public:
* These methods are necessary to make this representation behave as
* a vtkProp.
*/
- void GetActors2D(vtkPropCollection*) VTK_OVERRIDE;
- void ReleaseGraphicsResources(vtkWindow*) VTK_OVERRIDE;
- int RenderOverlay(vtkViewport*) VTK_OVERRIDE;
- int RenderOpaqueGeometry(vtkViewport*) VTK_OVERRIDE;
- int RenderTranslucentPolygonalGeometry(vtkViewport*) VTK_OVERRIDE;
- int HasTranslucentPolygonalGeometry() VTK_OVERRIDE;
+ void GetActors2D(vtkPropCollection*) override;
+ void ReleaseGraphicsResources(vtkWindow*) override;
+ int RenderOverlay(vtkViewport*) override;
+ int RenderOpaqueGeometry(vtkViewport*) override;
+ int RenderTranslucentPolygonalGeometry(vtkViewport*) override;
+ int HasTranslucentPolygonalGeometry() override;
//@}
protected:
vtkProgressBarRepresentation();
- ~vtkProgressBarRepresentation() VTK_OVERRIDE;
+ ~vtkProgressBarRepresentation() override;
double ProgressRate;
double ProgressBarColor[3];
diff --git a/Interaction/Widgets/vtkProgressBarWidget.h b/Interaction/Widgets/vtkProgressBarWidget.h
index df773a878583b942fcc0df63fd8e11ff8c3dad1c..f2a013a0cc43d3c562b32641792849d569a63ac0 100644
--- a/Interaction/Widgets/vtkProgressBarWidget.h
+++ b/Interaction/Widgets/vtkProgressBarWidget.h
@@ -48,7 +48,7 @@ public:
* Standard VTK class methods.
*/
vtkTypeMacro(vtkProgressBarWidget, vtkBorderWidget);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
@@ -62,11 +62,11 @@ public:
/**
* Create the default widget representation if one is not set.
*/
- void CreateDefaultRepresentation() VTK_OVERRIDE;
+ void CreateDefaultRepresentation() override;
protected:
vtkProgressBarWidget();
- ~vtkProgressBarWidget() VTK_OVERRIDE;
+ ~vtkProgressBarWidget() override;
private:
vtkProgressBarWidget(const vtkProgressBarWidget&) VTK_DELETE_FUNCTION;
diff --git a/Interaction/Widgets/vtkProp3DButtonRepresentation.h b/Interaction/Widgets/vtkProp3DButtonRepresentation.h
index 248fabe5e558d82e7c7c137e58c4854a9070066c..bfd5de7e7246cb859bab46c7a42297f986a6596c 100644
--- a/Interaction/Widgets/vtkProp3DButtonRepresentation.h
+++ b/Interaction/Widgets/vtkProp3DButtonRepresentation.h
@@ -61,7 +61,7 @@ public:
* Standard methods for instances of the class.
*/
vtkTypeMacro(vtkProp3DButtonRepresentation,vtkButtonRepresentation);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -86,39 +86,39 @@ public:
/**
* Extend the vtkButtonRepresentation::SetState() method.
*/
- void SetState(int state) VTK_OVERRIDE;
+ void SetState(int state) override;
//@{
/**
* Provide the necessary methods to satisfy the vtkWidgetRepresentation API.
*/
- int ComputeInteractionState(int X, int Y, int modify=0) VTK_OVERRIDE;
- void BuildRepresentation() VTK_OVERRIDE;
+ int ComputeInteractionState(int X, int Y, int modify=0) override;
+ void BuildRepresentation() override;
//@}
/**
* This method positions (translates and scales the props) into the
* bounding box specified. Note all the button props are scaled.
*/
- void PlaceWidget(double bounds[6]) VTK_OVERRIDE;
+ void PlaceWidget(double bounds[6]) override;
//@{
/**
* Provide the necessary methods to satisfy the rendering API.
*/
- void ShallowCopy(vtkProp *prop) VTK_OVERRIDE;
- double *GetBounds() VTK_OVERRIDE;
- void GetActors(vtkPropCollection *pc) VTK_OVERRIDE;
- void ReleaseGraphicsResources(vtkWindow*) VTK_OVERRIDE;
- int RenderOpaqueGeometry(vtkViewport*) VTK_OVERRIDE;
- int RenderVolumetricGeometry(vtkViewport*) VTK_OVERRIDE;
- int RenderTranslucentPolygonalGeometry(vtkViewport*) VTK_OVERRIDE;
- int HasTranslucentPolygonalGeometry() VTK_OVERRIDE;
+ void ShallowCopy(vtkProp *prop) override;
+ double *GetBounds() override;
+ void GetActors(vtkPropCollection *pc) override;
+ void ReleaseGraphicsResources(vtkWindow*) override;
+ int RenderOpaqueGeometry(vtkViewport*) override;
+ int RenderVolumetricGeometry(vtkViewport*) override;
+ int RenderTranslucentPolygonalGeometry(vtkViewport*) override;
+ int HasTranslucentPolygonalGeometry() override;
//@}
protected:
vtkProp3DButtonRepresentation();
- ~vtkProp3DButtonRepresentation() VTK_OVERRIDE;
+ ~vtkProp3DButtonRepresentation() override;
// The current vtkProp3D used to represent the button
vtkProp3D *CurrentProp;
@@ -135,7 +135,7 @@ protected:
vtkPropPicker *Picker;
// Register internal Pickers within PickingManager
- void RegisterPickers() VTK_OVERRIDE;
+ void RegisterPickers() override;
private:
vtkProp3DButtonRepresentation(const vtkProp3DButtonRepresentation&) VTK_DELETE_FUNCTION;
diff --git a/Interaction/Widgets/vtkRectilinearWipeRepresentation.h b/Interaction/Widgets/vtkRectilinearWipeRepresentation.h
index 41dcbc37abcbd3e2ba9ed68d72bc4230a2210785..bf86bbfab4d30635853514a722b3f268b0d8ba5d 100644
--- a/Interaction/Widgets/vtkRectilinearWipeRepresentation.h
+++ b/Interaction/Widgets/vtkRectilinearWipeRepresentation.h
@@ -65,7 +65,7 @@ public:
* Standard methods for instances of this class.
*/
vtkTypeMacro(vtkRectilinearWipeRepresentation,vtkWidgetRepresentation);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -108,10 +108,10 @@ public:
* are the methods that the widget and its representation use to
* communicate with each other.
*/
- void BuildRepresentation() VTK_OVERRIDE;
- void StartWidgetInteraction(double eventPos[2]) VTK_OVERRIDE;
- void WidgetInteraction(double eventPos[2]) VTK_OVERRIDE;
- int ComputeInteractionState(int X, int Y, int modify=0) VTK_OVERRIDE;
+ void BuildRepresentation() override;
+ void StartWidgetInteraction(double eventPos[2]) override;
+ void WidgetInteraction(double eventPos[2]) override;
+ int ComputeInteractionState(int X, int Y, int modify=0) override;
//@}
// Enums define the state of the prop relative to the mouse pointer
@@ -129,17 +129,17 @@ public:
/**
* Methods to make this class behave as a vtkProp.
*/
- void GetActors2D(vtkPropCollection *) VTK_OVERRIDE;
- void ReleaseGraphicsResources(vtkWindow *) VTK_OVERRIDE;
- int RenderOverlay(vtkViewport *viewport) VTK_OVERRIDE;
- int RenderOpaqueGeometry(vtkViewport *viewport) VTK_OVERRIDE;
- int RenderTranslucentPolygonalGeometry(vtkViewport *viewport) VTK_OVERRIDE;
- int HasTranslucentPolygonalGeometry() VTK_OVERRIDE;
+ void GetActors2D(vtkPropCollection *) override;
+ void ReleaseGraphicsResources(vtkWindow *) override;
+ int RenderOverlay(vtkViewport *viewport) override;
+ int RenderOpaqueGeometry(vtkViewport *viewport) override;
+ int RenderTranslucentPolygonalGeometry(vtkViewport *viewport) override;
+ int HasTranslucentPolygonalGeometry() override;
//@}
protected:
vtkRectilinearWipeRepresentation();
- ~vtkRectilinearWipeRepresentation() VTK_OVERRIDE;
+ ~vtkRectilinearWipeRepresentation() override;
// Instances that this class manipulates
vtkImageRectilinearWipe *RectilinearWipe;
diff --git a/Interaction/Widgets/vtkRectilinearWipeWidget.h b/Interaction/Widgets/vtkRectilinearWipeWidget.h
index 88709e246b9afd864cdfb382350f5c02e3f7e7d2..93ceaf618c2a72b3656c0b21b556012d22dd7e86 100644
--- a/Interaction/Widgets/vtkRectilinearWipeWidget.h
+++ b/Interaction/Widgets/vtkRectilinearWipeWidget.h
@@ -96,7 +96,7 @@ public:
* Standard macros.
*/
vtkTypeMacro(vtkRectilinearWipeWidget,vtkAbstractWidget);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
@@ -116,11 +116,11 @@ public:
/**
* Create the default widget representation if one is not set.
*/
- void CreateDefaultRepresentation() VTK_OVERRIDE;
+ void CreateDefaultRepresentation() override;
protected:
vtkRectilinearWipeWidget();
- ~vtkRectilinearWipeWidget() VTK_OVERRIDE;
+ ~vtkRectilinearWipeWidget() override;
// These methods handle events
static void SelectAction(vtkAbstractWidget*);
@@ -128,7 +128,7 @@ protected:
static void EndSelectAction(vtkAbstractWidget*);
// helper methods for cursor management
- void SetCursor(int state) VTK_OVERRIDE;
+ void SetCursor(int state) override;
// Manage the state of the widget
int WidgetState;
diff --git a/Interaction/Widgets/vtkResliceCursor.h b/Interaction/Widgets/vtkResliceCursor.h
index 7f770ba87b95cb25ea9fca9009abcccbb53b5d49..34e1b66034e29218650cd5208d663a0848bb915b 100644
--- a/Interaction/Widgets/vtkResliceCursor.h
+++ b/Interaction/Widgets/vtkResliceCursor.h
@@ -94,7 +94,7 @@ public:
/**
* Printself method.
*/
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Get the planes that represent normals along the X, Y and Z. The argument
@@ -150,7 +150,7 @@ public:
/**
* Get the MTime. Check the MTime of the internal planes as well.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
/**
* Reset the cursor to the default position, ie with the axes, normal
@@ -161,7 +161,7 @@ public:
protected:
vtkResliceCursor();
- ~vtkResliceCursor() VTK_OVERRIDE;
+ ~vtkResliceCursor() override;
virtual void BuildCursorGeometry();
virtual void BuildPolyData();
diff --git a/Interaction/Widgets/vtkResliceCursorActor.h b/Interaction/Widgets/vtkResliceCursorActor.h
index 530c99d54f6aceba14a45854ad78bb4e1a4895ef..067f71989ea9817229435860b8cfb1875b420f94 100644
--- a/Interaction/Widgets/vtkResliceCursorActor.h
+++ b/Interaction/Widgets/vtkResliceCursorActor.h
@@ -48,7 +48,7 @@ public:
*/
static vtkResliceCursorActor *New();
vtkTypeMacro(vtkResliceCursorActor,vtkProp3D);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -61,29 +61,29 @@ public:
/**
* Support the standard render methods.
*/
- int RenderOpaqueGeometry(vtkViewport *viewport) VTK_OVERRIDE;
+ int RenderOpaqueGeometry(vtkViewport *viewport) override;
/**
* Does this prop have some translucent polygonal geometry? No.
*/
- int HasTranslucentPolygonalGeometry() VTK_OVERRIDE;
+ int HasTranslucentPolygonalGeometry() override;
/**
* Release any graphics resources that are being consumed by this actor.
* The parameter window could be used to determine which graphic
* resources to release.
*/
- void ReleaseGraphicsResources(vtkWindow *) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *) override;
/**
* Get the bounds for this Actor as (Xmin,Xmax,Ymin,Ymax,Zmin,Zmax).
*/
- double *GetBounds() VTK_OVERRIDE;
+ double *GetBounds() override;
/**
* Get the actors mtime plus consider its algorithm.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
//@{
/**
@@ -105,7 +105,7 @@ public:
protected:
vtkResliceCursorActor();
- ~vtkResliceCursorActor() VTK_OVERRIDE;
+ ~vtkResliceCursorActor() override;
void UpdateViewProps( vtkViewport * v = nullptr );
void UpdateHoleSize( vtkViewport * v );
diff --git a/Interaction/Widgets/vtkResliceCursorLineRepresentation.h b/Interaction/Widgets/vtkResliceCursorLineRepresentation.h
index 5fa14b1a78c6c238db05b98c3a1910c1217aa882..8ae5ac884d85409a8479111fcf7408965f9a25a7 100644
--- a/Interaction/Widgets/vtkResliceCursorLineRepresentation.h
+++ b/Interaction/Widgets/vtkResliceCursorLineRepresentation.h
@@ -55,36 +55,36 @@ public:
* Standard VTK methods.
*/
vtkTypeMacro(vtkResliceCursorLineRepresentation,vtkResliceCursorRepresentation);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
/**
* These are methods that satisfy vtkWidgetRepresentation's API.
*/
- void BuildRepresentation() VTK_OVERRIDE;
- int ComputeInteractionState(int X, int Y, int modify=0) VTK_OVERRIDE;
- void StartWidgetInteraction(double startEventPos[2]) VTK_OVERRIDE;
- void WidgetInteraction(double e[2]) VTK_OVERRIDE;
- void Highlight(int highlightOn) VTK_OVERRIDE;
+ void BuildRepresentation() override;
+ int ComputeInteractionState(int X, int Y, int modify=0) override;
+ void StartWidgetInteraction(double startEventPos[2]) override;
+ void WidgetInteraction(double e[2]) override;
+ void Highlight(int highlightOn) override;
//@}
//@{
/**
* Methods required by vtkProp superclass.
*/
- void ReleaseGraphicsResources(vtkWindow *w) VTK_OVERRIDE;
- int RenderOverlay(vtkViewport *viewport) VTK_OVERRIDE;
- int RenderOpaqueGeometry(vtkViewport *viewport) VTK_OVERRIDE;
- int RenderTranslucentPolygonalGeometry(vtkViewport *viewport) VTK_OVERRIDE;
- int HasTranslucentPolygonalGeometry() VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *w) override;
+ int RenderOverlay(vtkViewport *viewport) override;
+ int RenderOpaqueGeometry(vtkViewport *viewport) override;
+ int RenderTranslucentPolygonalGeometry(vtkViewport *viewport) override;
+ int HasTranslucentPolygonalGeometry() override;
//@}
/**
* Get the bounds of this prop. This simply returns the bounds of the
* reslice cursor object.
*/
- double * GetBounds() VTK_OVERRIDE;
+ double * GetBounds() override;
//@{
/**
@@ -97,7 +97,7 @@ public:
/**
* Get the reslice cursor.
*/
- vtkResliceCursor * GetResliceCursor() VTK_OVERRIDE;
+ vtkResliceCursor * GetResliceCursor() override;
/**
* Set the user matrix on all the internal actors.
@@ -106,9 +106,9 @@ public:
protected:
vtkResliceCursorLineRepresentation();
- ~vtkResliceCursorLineRepresentation() VTK_OVERRIDE;
+ ~vtkResliceCursorLineRepresentation() override;
- vtkResliceCursorPolyDataAlgorithm * GetCursorAlgorithm() VTK_OVERRIDE;
+ vtkResliceCursorPolyDataAlgorithm * GetCursorAlgorithm() override;
double RotateAxis( double evenPos[2], int axis );
diff --git a/Interaction/Widgets/vtkResliceCursorPicker.h b/Interaction/Widgets/vtkResliceCursorPicker.h
index c63e95552bd6273407964fa25bba102c4390d25c..29155d233d111c261a44f14678773b36bd4688eb 100644
--- a/Interaction/Widgets/vtkResliceCursorPicker.h
+++ b/Interaction/Widgets/vtkResliceCursorPicker.h
@@ -44,7 +44,7 @@ class VTKINTERACTIONWIDGETS_EXPORT vtkResliceCursorPicker : public vtkPicker
public:
static vtkResliceCursorPicker *New();
vtkTypeMacro(vtkResliceCursorPicker, vtkPicker);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Perform pick operation with selection point provided. Normally the
@@ -53,7 +53,7 @@ public:
* something was successfully picked.
*/
int Pick(double selectionX, double selectionY, double selectionZ,
- vtkRenderer *renderer) VTK_OVERRIDE;
+ vtkRenderer *renderer) override;
//@{
/**
@@ -85,7 +85,7 @@ public:
protected:
vtkResliceCursorPicker();
- ~vtkResliceCursorPicker() VTK_OVERRIDE;
+ ~vtkResliceCursorPicker() override;
virtual int IntersectPolyDataWithLine(
double p1[3], double p2[3], vtkPolyData *, double tol );
diff --git a/Interaction/Widgets/vtkResliceCursorPolyDataAlgorithm.h b/Interaction/Widgets/vtkResliceCursorPolyDataAlgorithm.h
index 7e8acef5e077df8ddaf0041b66f31ce236c5ce8d..0fea2b41fcbcb553093024355367ac7ef82a072d 100644
--- a/Interaction/Widgets/vtkResliceCursorPolyDataAlgorithm.h
+++ b/Interaction/Widgets/vtkResliceCursorPolyDataAlgorithm.h
@@ -46,7 +46,7 @@ class VTKINTERACTIONWIDGETS_EXPORT vtkResliceCursorPolyDataAlgorithm : public vt
{
public:
vtkTypeMacro(vtkResliceCursorPolyDataAlgorithm,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkResliceCursorPolyDataAlgorithm *New();
@@ -119,15 +119,15 @@ public:
* Get the MTime. Check the MTime of the internal ResliceCursor as well, if
* one has been set
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
protected:
vtkResliceCursorPolyDataAlgorithm();
- ~vtkResliceCursorPolyDataAlgorithm() VTK_OVERRIDE;
+ ~vtkResliceCursorPolyDataAlgorithm() override;
int RequestData(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
void GetSlabPolyData( int axis, int planeAxis, vtkPolyData *pd );
diff --git a/Interaction/Widgets/vtkResliceCursorRepresentation.h b/Interaction/Widgets/vtkResliceCursorRepresentation.h
index df96ba17863112c7411db451abab7855b8bfc6ab..c41db11da5283b9daa65f7bfb979ef22d41d1e35 100644
--- a/Interaction/Widgets/vtkResliceCursorRepresentation.h
+++ b/Interaction/Widgets/vtkResliceCursorRepresentation.h
@@ -59,7 +59,7 @@ public:
* Standard VTK methods.
*/
vtkTypeMacro(vtkResliceCursorRepresentation,vtkWidgetRepresentation);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -124,7 +124,7 @@ public:
/**
* These are methods that satisfy vtkWidgetRepresentation's API.
*/
- void BuildRepresentation() VTK_OVERRIDE;
+ void BuildRepresentation() override;
//@{
/**
@@ -250,7 +250,7 @@ public:
protected:
vtkResliceCursorRepresentation();
- ~vtkResliceCursorRepresentation() VTK_OVERRIDE;
+ ~vtkResliceCursorRepresentation() override;
//@{
/**
diff --git a/Interaction/Widgets/vtkResliceCursorThickLineRepresentation.h b/Interaction/Widgets/vtkResliceCursorThickLineRepresentation.h
index 6cf91eb50329701153376a785bbf2a48c5a3531b..6fec747d271141b828898e5fcc9b00d19075ead1 100644
--- a/Interaction/Widgets/vtkResliceCursorThickLineRepresentation.h
+++ b/Interaction/Widgets/vtkResliceCursorThickLineRepresentation.h
@@ -45,7 +45,7 @@ public:
* Standard VTK methods.
*/
vtkTypeMacro(vtkResliceCursorThickLineRepresentation,vtkResliceCursorLineRepresentation);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
@@ -54,7 +54,7 @@ public:
* implementation and creates a vtkImageSlabReslice instead of a
* vtkImageReslice.
*/
- void CreateDefaultResliceAlgorithm() VTK_OVERRIDE;
+ void CreateDefaultResliceAlgorithm() override;
/**
* INTERNAL - Do not use
@@ -63,11 +63,11 @@ public:
*/
void SetResliceParameters(
double outputSpacingX, double outputSpacingY,
- int extentX, int extentY ) VTK_OVERRIDE;
+ int extentX, int extentY ) override;
protected:
vtkResliceCursorThickLineRepresentation();
- ~vtkResliceCursorThickLineRepresentation() VTK_OVERRIDE;
+ ~vtkResliceCursorThickLineRepresentation() override;
private:
vtkResliceCursorThickLineRepresentation(const vtkResliceCursorThickLineRepresentation&) VTK_DELETE_FUNCTION;
diff --git a/Interaction/Widgets/vtkResliceCursorWidget.h b/Interaction/Widgets/vtkResliceCursorWidget.h
index 16eeee04e4f9dd5b8151c8a7d51b256e698c4faa..0d67e40f44c544b0e6eea242cba186554227edf3 100644
--- a/Interaction/Widgets/vtkResliceCursorWidget.h
+++ b/Interaction/Widgets/vtkResliceCursorWidget.h
@@ -55,7 +55,7 @@ public:
* Standard VTK class macros.
*/
vtkTypeMacro(vtkResliceCursorWidget,vtkAbstractWidget);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
@@ -76,14 +76,14 @@ public:
/**
* Create the default widget representation if one is not set.
*/
- void CreateDefaultRepresentation() VTK_OVERRIDE;
+ void CreateDefaultRepresentation() override;
/**
* Methods for activiating this widget. This implementation extends the
* superclasses' in order to resize the widget handles due to a render
* start event.
*/
- void SetEnabled(int) VTK_OVERRIDE;
+ void SetEnabled(int) override;
//@{
/**
@@ -112,7 +112,7 @@ public:
protected:
vtkResliceCursorWidget();
- ~vtkResliceCursorWidget() VTK_OVERRIDE;
+ ~vtkResliceCursorWidget() override;
// These are the callbacks for this widget
static void SelectAction(vtkAbstractWidget*);
@@ -124,7 +124,7 @@ protected:
static void ResetResliceCursorAction(vtkAbstractWidget*);
// helper methods for cursor management
- void SetCursor(int state) VTK_OVERRIDE;
+ void SetCursor(int state) override;
// Start Window Level
void StartWindowLevel();
diff --git a/Interaction/Widgets/vtkScalarBarRepresentation.h b/Interaction/Widgets/vtkScalarBarRepresentation.h
index de160f4ad96ee52d3a25ffee4b0b06dfe41ca71d..1c025ca0af75beb388626cb3a2f59df4d648f088 100644
--- a/Interaction/Widgets/vtkScalarBarRepresentation.h
+++ b/Interaction/Widgets/vtkScalarBarRepresentation.h
@@ -52,7 +52,7 @@ class VTKINTERACTIONWIDGETS_EXPORT vtkScalarBarRepresentation : public vtkBorder
{
public:
vtkTypeMacro(vtkScalarBarRepresentation, vtkBorderRepresentation);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
static vtkScalarBarRepresentation *New();
//@{
@@ -67,9 +67,9 @@ public:
/**
* Satisfy the superclass' API.
*/
- void BuildRepresentation() VTK_OVERRIDE;
- void WidgetInteraction(double eventPos[2]) VTK_OVERRIDE;
- void GetSize(double size[2]) VTK_OVERRIDE
+ void BuildRepresentation() override;
+ void WidgetInteraction(double eventPos[2]) override;
+ void GetSize(double size[2]) override
{size[0]=2.0; size[1]=2.0;}
//@}
@@ -78,14 +78,14 @@ public:
* These methods are necessary to make this representation behave as
* a vtkProp.
*/
- int GetVisibility() VTK_OVERRIDE;
- void SetVisibility(int) VTK_OVERRIDE;
- void GetActors2D(vtkPropCollection *collection) VTK_OVERRIDE;
- void ReleaseGraphicsResources(vtkWindow *window) VTK_OVERRIDE;
- int RenderOverlay(vtkViewport*) VTK_OVERRIDE;
- int RenderOpaqueGeometry(vtkViewport*) VTK_OVERRIDE;
- int RenderTranslucentPolygonalGeometry(vtkViewport*) VTK_OVERRIDE;
- int HasTranslucentPolygonalGeometry() VTK_OVERRIDE;
+ int GetVisibility() override;
+ void SetVisibility(int) override;
+ void GetActors2D(vtkPropCollection *collection) override;
+ void ReleaseGraphicsResources(vtkWindow *window) override;
+ int RenderOverlay(vtkViewport*) override;
+ int RenderOpaqueGeometry(vtkViewport*) override;
+ int RenderTranslucentPolygonalGeometry(vtkViewport*) override;
+ int HasTranslucentPolygonalGeometry() override;
//@}
//@{
@@ -107,7 +107,7 @@ public:
protected:
vtkScalarBarRepresentation();
- ~vtkScalarBarRepresentation() VTK_OVERRIDE;
+ ~vtkScalarBarRepresentation() override;
/**
* Change horizontal <--> vertical orientation, rotate the corners of the
diff --git a/Interaction/Widgets/vtkScalarBarWidget.h b/Interaction/Widgets/vtkScalarBarWidget.h
index 8fdb5409b5ea288cde97a20c1ae0ef50d9974f47..bf6973e824c92d6b6bd6527d17b76c6d59bfaf23 100644
--- a/Interaction/Widgets/vtkScalarBarWidget.h
+++ b/Interaction/Widgets/vtkScalarBarWidget.h
@@ -46,7 +46,7 @@ class VTKINTERACTIONWIDGETS_EXPORT vtkScalarBarWidget : public vtkBorderWidget
public:
static vtkScalarBarWidget *New();
vtkTypeMacro(vtkScalarBarWidget, vtkBorderWidget);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Specify an instance of vtkWidgetRepresentation used to represent this
@@ -84,11 +84,11 @@ public:
/**
* Create the default widget representation if one is not set.
*/
- void CreateDefaultRepresentation() VTK_OVERRIDE;
+ void CreateDefaultRepresentation() override;
protected:
vtkScalarBarWidget();
- ~vtkScalarBarWidget() VTK_OVERRIDE;
+ ~vtkScalarBarWidget() override;
int Repositionable;
@@ -96,7 +96,7 @@ protected:
static void MoveAction(vtkAbstractWidget*);
// set the cursor to the correct shape based on State argument
- void SetCursor(int State) VTK_OVERRIDE;
+ void SetCursor(int State) override;
private:
vtkScalarBarWidget(const vtkScalarBarWidget&) VTK_DELETE_FUNCTION;
diff --git a/Interaction/Widgets/vtkSeedRepresentation.h b/Interaction/Widgets/vtkSeedRepresentation.h
index 1b5c430c46bb03d815143a9c5a1e0fdb815bd861..602778b982d4b3635cd9406b77c8c87b4a58a711 100644
--- a/Interaction/Widgets/vtkSeedRepresentation.h
+++ b/Interaction/Widgets/vtkSeedRepresentation.h
@@ -48,7 +48,7 @@ public:
* Standard VTK methods.
*/
vtkTypeMacro(vtkSeedRepresentation,vtkWidgetRepresentation);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -135,13 +135,13 @@ public:
/**
* These are methods that satisfy vtkWidgetRepresentation's API.
*/
- void BuildRepresentation() VTK_OVERRIDE;
- int ComputeInteractionState( int X, int Y, int modify = 0 ) VTK_OVERRIDE;
+ void BuildRepresentation() override;
+ int ComputeInteractionState( int X, int Y, int modify = 0 ) override;
//@}
protected:
vtkSeedRepresentation();
- ~vtkSeedRepresentation() VTK_OVERRIDE;
+ ~vtkSeedRepresentation() override;
// The handle and the rep used to close the handles
vtkHandleRepresentation *HandleRepresentation;
diff --git a/Interaction/Widgets/vtkSeedWidget.h b/Interaction/Widgets/vtkSeedWidget.h
index f09bad3d908a6d964c5c0011fbfcdd0b3fc23409..5cadd7574af1f6ea21074c29cebe3a85b34d8a97 100644
--- a/Interaction/Widgets/vtkSeedWidget.h
+++ b/Interaction/Widgets/vtkSeedWidget.h
@@ -90,7 +90,7 @@ public:
* Standard methods for a VTK class.
*/
vtkTypeMacro(vtkSeedWidget,vtkAbstractWidget);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
@@ -98,19 +98,19 @@ public:
* must be overridden because it is a composite widget and does more than
* its superclasses' vtkAbstractWidget::SetEnabled() method.
*/
- void SetEnabled(int) VTK_OVERRIDE;
+ void SetEnabled(int) override;
/**
* Set the current renderer. This method also propagates to all the child
* handle widgets, if any exist
*/
- void SetCurrentRenderer( vtkRenderer * ) VTK_OVERRIDE;
+ void SetCurrentRenderer( vtkRenderer * ) override;
/**
* Set the interactor. This method also propagates to all the child
* handle widgets, if any exist
*/
- void SetInteractor( vtkRenderWindowInteractor * ) VTK_OVERRIDE;
+ void SetInteractor( vtkRenderWindowInteractor * ) override;
/**
* Specify an instance of vtkWidgetRepresentation used to represent this
@@ -132,13 +132,13 @@ public:
/**
* Create the default widget representation if one is not set.
*/
- void CreateDefaultRepresentation() VTK_OVERRIDE;
+ void CreateDefaultRepresentation() override;
/**
* Methods to change the whether the widget responds to interaction.
* Overridden to pass the state to component widgets.
*/
- void SetProcessEvents(int) VTK_OVERRIDE;
+ void SetProcessEvents(int) override;
/**
* Method to be called when the seed widget should stop responding to
@@ -195,7 +195,7 @@ public:
protected:
vtkSeedWidget();
- ~vtkSeedWidget() VTK_OVERRIDE;
+ ~vtkSeedWidget() override;
int WidgetState;
diff --git a/Interaction/Widgets/vtkSliderRepresentation.h b/Interaction/Widgets/vtkSliderRepresentation.h
index 356ae0a25f164f2a156e4f0c24914d5362fb13b8..f8b3427875b047de3c138e0a2407749b2e52f48f 100644
--- a/Interaction/Widgets/vtkSliderRepresentation.h
+++ b/Interaction/Widgets/vtkSliderRepresentation.h
@@ -41,7 +41,7 @@ public:
* Standard methods for the class.
*/
vtkTypeMacro(vtkSliderRepresentation,vtkWidgetRepresentation);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -184,7 +184,7 @@ public:
protected:
vtkSliderRepresentation();
- ~vtkSliderRepresentation() VTK_OVERRIDE;
+ ~vtkSliderRepresentation() override;
// Values
double Value;
diff --git a/Interaction/Widgets/vtkSliderRepresentation2D.h b/Interaction/Widgets/vtkSliderRepresentation2D.h
index e902ce47548b067f7778b6692ca4a66324c15922..170ac4694f21fd67dafbcd3d1053a9f8dc876a3a 100644
--- a/Interaction/Widgets/vtkSliderRepresentation2D.h
+++ b/Interaction/Widgets/vtkSliderRepresentation2D.h
@@ -63,7 +63,7 @@ public:
* Standard methods for the class.
*/
vtkTypeMacro(vtkSliderRepresentation2D,vtkSliderRepresentation);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
@@ -91,8 +91,8 @@ public:
* Specify the label text for this widget. If the value is not set, or set
* to the empty string "", then the label text is not displayed.
*/
- void SetTitleText(const char*) VTK_OVERRIDE;
- const char* GetTitleText() VTK_OVERRIDE;
+ void SetTitleText(const char*) override;
+ const char* GetTitleText() override;
//@}
//@{
@@ -133,26 +133,26 @@ public:
* assumes that the parameter bounds[6] specifies the location in display space
* where the widget should be placed.
*/
- void PlaceWidget(double bounds[6]) VTK_OVERRIDE;
- void BuildRepresentation() VTK_OVERRIDE;
- void StartWidgetInteraction(double eventPos[2]) VTK_OVERRIDE;
- void WidgetInteraction(double newEventPos[2]) VTK_OVERRIDE;
- void Highlight(int) VTK_OVERRIDE;
+ void PlaceWidget(double bounds[6]) override;
+ void BuildRepresentation() override;
+ void StartWidgetInteraction(double eventPos[2]) override;
+ void WidgetInteraction(double newEventPos[2]) override;
+ void Highlight(int) override;
//@}
//@{
/**
* Methods supporting the rendering process.
*/
- void GetActors2D(vtkPropCollection*) VTK_OVERRIDE;
- void ReleaseGraphicsResources(vtkWindow*) VTK_OVERRIDE;
- int RenderOverlay(vtkViewport*) VTK_OVERRIDE;
- int RenderOpaqueGeometry(vtkViewport*) VTK_OVERRIDE;
+ void GetActors2D(vtkPropCollection*) override;
+ void ReleaseGraphicsResources(vtkWindow*) override;
+ int RenderOverlay(vtkViewport*) override;
+ int RenderOpaqueGeometry(vtkViewport*) override;
//@}
protected:
vtkSliderRepresentation2D();
- ~vtkSliderRepresentation2D() VTK_OVERRIDE;
+ ~vtkSliderRepresentation2D() override;
// Positioning the widget
vtkCoordinate *Point1Coordinate;
diff --git a/Interaction/Widgets/vtkSliderRepresentation3D.h b/Interaction/Widgets/vtkSliderRepresentation3D.h
index bec642bf1819b11b894b3bb40658efb12c9b3ad8..8213622ca0c2a81eaeb2521c986b21eb44aa856a 100644
--- a/Interaction/Widgets/vtkSliderRepresentation3D.h
+++ b/Interaction/Widgets/vtkSliderRepresentation3D.h
@@ -59,7 +59,7 @@ public:
* Standard methods for the class.
*/
vtkTypeMacro(vtkSliderRepresentation3D,vtkSliderRepresentation);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -93,8 +93,8 @@ public:
* Specify the title text for this widget. If the value is not set, or set
* to the empty string "", then the title text is not displayed.
*/
- void SetTitleText(const char*) VTK_OVERRIDE;
- const char* GetTitleText() VTK_OVERRIDE;
+ void SetTitleText(const char*) override;
+ const char* GetTitleText() override;
//@}
//@{
@@ -146,33 +146,33 @@ public:
/**
* Methods to interface with the vtkSliderWidget.
*/
- void PlaceWidget(double bounds[6]) VTK_OVERRIDE;
- void BuildRepresentation() VTK_OVERRIDE;
- void StartWidgetInteraction(double eventPos[2]) VTK_OVERRIDE;
- void WidgetInteraction(double newEventPos[2]) VTK_OVERRIDE;
- void Highlight(int) VTK_OVERRIDE;
+ void PlaceWidget(double bounds[6]) override;
+ void BuildRepresentation() override;
+ void StartWidgetInteraction(double eventPos[2]) override;
+ void WidgetInteraction(double newEventPos[2]) override;
+ void Highlight(int) override;
//@}
//@{
/**
* Methods supporting the rendering process.
*/
- double *GetBounds() VTK_OVERRIDE;
- void GetActors(vtkPropCollection*) VTK_OVERRIDE;
- void ReleaseGraphicsResources(vtkWindow*) VTK_OVERRIDE;
- int RenderOpaqueGeometry(vtkViewport*) VTK_OVERRIDE;
- int RenderTranslucentPolygonalGeometry(vtkViewport*) VTK_OVERRIDE;
- int HasTranslucentPolygonalGeometry() VTK_OVERRIDE;
+ double *GetBounds() override;
+ void GetActors(vtkPropCollection*) override;
+ void ReleaseGraphicsResources(vtkWindow*) override;
+ int RenderOpaqueGeometry(vtkViewport*) override;
+ int RenderTranslucentPolygonalGeometry(vtkViewport*) override;
+ int HasTranslucentPolygonalGeometry() override;
//@}
/**
* Override GetMTime to include point coordinates
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
protected:
vtkSliderRepresentation3D();
- ~vtkSliderRepresentation3D() VTK_OVERRIDE;
+ ~vtkSliderRepresentation3D() override;
// Positioning the widget
vtkCoordinate *Point1Coordinate;
@@ -192,7 +192,7 @@ protected:
vtkCellPicker *Picker;
// Register internal Pickers within PickingManager
- void RegisterPickers() VTK_OVERRIDE;
+ void RegisterPickers() override;
// Determine the parameter t along the slider
virtual double ComputePickPosition(double eventPos[2]);
diff --git a/Interaction/Widgets/vtkSliderWidget.h b/Interaction/Widgets/vtkSliderWidget.h
index 2f37069c407b7e329ebfeb26cb5e93fafcc020a0..7bad875db89105d62e6b20bbcdebb130da27a4a4 100644
--- a/Interaction/Widgets/vtkSliderWidget.h
+++ b/Interaction/Widgets/vtkSliderWidget.h
@@ -85,7 +85,7 @@ public:
* Standard macros.
*/
vtkTypeMacro(vtkSliderWidget,vtkAbstractWidget);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
@@ -129,11 +129,11 @@ public:
/**
* Create the default widget representation if one is not set.
*/
- void CreateDefaultRepresentation() VTK_OVERRIDE;
+ void CreateDefaultRepresentation() override;
protected:
vtkSliderWidget();
- ~vtkSliderWidget() VTK_OVERRIDE {}
+ ~vtkSliderWidget() override {}
// These are the events that are handled
static void SelectAction(vtkAbstractWidget*);
diff --git a/Interaction/Widgets/vtkSphereHandleRepresentation.h b/Interaction/Widgets/vtkSphereHandleRepresentation.h
index ff93ad879495bc982ae01a2b558004991429cbfa..b7aee2f8038481fdfbd02391c1aabc99a0f26f5c 100644
--- a/Interaction/Widgets/vtkSphereHandleRepresentation.h
+++ b/Interaction/Widgets/vtkSphereHandleRepresentation.h
@@ -51,7 +51,7 @@ public:
* Standard methods for instances of this class.
*/
vtkTypeMacro(vtkSphereHandleRepresentation,vtkHandleRepresentation);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -62,8 +62,8 @@ public:
* the superclasses' SetWorldPosition() and SetDisplayPosition() in
* order to set the focal point of the cursor properly.
*/
- void SetWorldPosition(double p[3]) VTK_OVERRIDE;
- void SetDisplayPosition(double p[3]) VTK_OVERRIDE;
+ void SetWorldPosition(double p[3]) override;
+ void SetDisplayPosition(double p[3]) override;
//@}
//@{
@@ -108,37 +108,37 @@ public:
* Overload the superclasses SetHandleSize() method to update internal
* variables.
*/
- void SetHandleSize(double size) VTK_OVERRIDE;
+ void SetHandleSize(double size) override;
//@{
/**
* Methods to make this class properly act like a vtkWidgetRepresentation.
*/
- double *GetBounds() VTK_OVERRIDE;
- void BuildRepresentation() VTK_OVERRIDE;
- void StartWidgetInteraction(double eventPos[2]) VTK_OVERRIDE;
- void WidgetInteraction(double eventPos[2]) VTK_OVERRIDE;
- int ComputeInteractionState(int X, int Y, int modify=0) VTK_OVERRIDE;
- void PlaceWidget(double bounds[6]) VTK_OVERRIDE;
+ double *GetBounds() override;
+ void BuildRepresentation() override;
+ void StartWidgetInteraction(double eventPos[2]) override;
+ void WidgetInteraction(double eventPos[2]) override;
+ int ComputeInteractionState(int X, int Y, int modify=0) override;
+ void PlaceWidget(double bounds[6]) override;
//@}
//@{
/**
* Methods to make this class behave as a vtkProp.
*/
- void ShallowCopy(vtkProp *prop) VTK_OVERRIDE;
- void DeepCopy(vtkProp *prop) VTK_OVERRIDE;
- void GetActors(vtkPropCollection *) VTK_OVERRIDE;
- void ReleaseGraphicsResources(vtkWindow *) VTK_OVERRIDE;
- int RenderOpaqueGeometry(vtkViewport *viewport) VTK_OVERRIDE;
- int RenderTranslucentPolygonalGeometry(vtkViewport *viewport) VTK_OVERRIDE;
- int HasTranslucentPolygonalGeometry() VTK_OVERRIDE;
+ void ShallowCopy(vtkProp *prop) override;
+ void DeepCopy(vtkProp *prop) override;
+ void GetActors(vtkPropCollection *) override;
+ void ReleaseGraphicsResources(vtkWindow *) override;
+ int RenderOpaqueGeometry(vtkViewport *viewport) override;
+ int RenderTranslucentPolygonalGeometry(vtkViewport *viewport) override;
+ int HasTranslucentPolygonalGeometry() override;
//@}
- void Highlight(int highlight) VTK_OVERRIDE;
+ void Highlight(int highlight) override;
protected:
vtkSphereHandleRepresentation();
- ~vtkSphereHandleRepresentation() VTK_OVERRIDE;
+ ~vtkSphereHandleRepresentation() override;
// the cursor3D
vtkActor *Actor;
@@ -152,7 +152,7 @@ protected:
double LastEventPosition[2];
// Register internal Pickers within PickingManager
- void RegisterPickers() VTK_OVERRIDE;
+ void RegisterPickers() override;
// Methods to manipulate the cursor
int ConstraintAxis;
diff --git a/Interaction/Widgets/vtkSphereRepresentation.h b/Interaction/Widgets/vtkSphereRepresentation.h
index fa49e34597dfea334a9d45a93d13949e4a0e9ce3..23d31c5e705d707b4c202ed2796899c2a29451f6 100644
--- a/Interaction/Widgets/vtkSphereRepresentation.h
+++ b/Interaction/Widgets/vtkSphereRepresentation.h
@@ -85,7 +85,7 @@ public:
* Standard methods for type information and to print out the contents of the class.
*/
vtkTypeMacro(vtkSphereRepresentation,vtkWidgetRepresentation);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
// Used to manage the state of the widget
@@ -280,29 +280,29 @@ public:
* version of place widget is available where the center and handle position
* are specified.
*/
- void PlaceWidget(double bounds[6]) VTK_OVERRIDE;
+ void PlaceWidget(double bounds[6]) override;
virtual void PlaceWidget(double center[3], double handlePosition[3]);
- void BuildRepresentation() VTK_OVERRIDE;
- int ComputeInteractionState(int X, int Y, int modify=0) VTK_OVERRIDE;
- void StartWidgetInteraction(double e[2]) VTK_OVERRIDE;
- void WidgetInteraction(double e[2]) VTK_OVERRIDE;
- double *GetBounds() VTK_OVERRIDE;
+ void BuildRepresentation() override;
+ int ComputeInteractionState(int X, int Y, int modify=0) override;
+ void StartWidgetInteraction(double e[2]) override;
+ void WidgetInteraction(double e[2]) override;
+ double *GetBounds() override;
//@}
//@{
/**
* Methods supporting, and required by, the rendering process.
*/
- void ReleaseGraphicsResources(vtkWindow*) VTK_OVERRIDE;
- int RenderOpaqueGeometry(vtkViewport*) VTK_OVERRIDE;
- int RenderTranslucentPolygonalGeometry(vtkViewport*) VTK_OVERRIDE;
- int RenderOverlay(vtkViewport*) VTK_OVERRIDE;
- int HasTranslucentPolygonalGeometry() VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow*) override;
+ int RenderOpaqueGeometry(vtkViewport*) override;
+ int RenderTranslucentPolygonalGeometry(vtkViewport*) override;
+ int RenderOverlay(vtkViewport*) override;
+ int HasTranslucentPolygonalGeometry() override;
//@}
protected:
vtkSphereRepresentation();
- ~vtkSphereRepresentation() VTK_OVERRIDE;
+ ~vtkSphereRepresentation() override;
// Manage how the representation appears
double LastEventPosition[3];
@@ -322,7 +322,7 @@ protected:
double LastPickPosition[3];
// Register internal Pickers within PickingManager
- void RegisterPickers() VTK_OVERRIDE;
+ void RegisterPickers() override;
// Methods to manipulate the sphere widget
void Translate(double *p1, double *p2);
diff --git a/Interaction/Widgets/vtkSphereWidget.h b/Interaction/Widgets/vtkSphereWidget.h
index 6545c2ebac8e71174d865c6260b617c2e4e820c3..d1747e6a77ec870adba006b0a0e809b31fd398d8 100644
--- a/Interaction/Widgets/vtkSphereWidget.h
+++ b/Interaction/Widgets/vtkSphereWidget.h
@@ -79,18 +79,18 @@ public:
static vtkSphereWidget *New();
vtkTypeMacro(vtkSphereWidget,vtk3DWidget);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
* Methods that satisfy the superclass' API.
*/
- void SetEnabled(int) VTK_OVERRIDE;
- void PlaceWidget(double bounds[6]) VTK_OVERRIDE;
- void PlaceWidget() VTK_OVERRIDE
+ void SetEnabled(int) override;
+ void PlaceWidget(double bounds[6]) override;
+ void PlaceWidget() override
{this->Superclass::PlaceWidget();}
void PlaceWidget(double xmin, double xmax, double ymin, double ymax,
- double zmin, double zmax) VTK_OVERRIDE
+ double zmin, double zmax) override
{this->Superclass::PlaceWidget(xmin,xmax,ymin,ymax,zmin,zmax);}
//@}
@@ -242,7 +242,7 @@ public:
protected:
vtkSphereWidget();
- ~vtkSphereWidget() VTK_OVERRIDE;
+ ~vtkSphereWidget() override;
// Manage the state of the widget
int State;
@@ -282,7 +282,7 @@ protected:
vtkCellPicker *Picker;
// Register internal Pickers within PickingManager
- void RegisterPickers() VTK_OVERRIDE;
+ void RegisterPickers() override;
// Methods to manipulate the sphere widget
int Translation;
@@ -308,7 +308,7 @@ protected:
int HandleVisibility;
double HandleDirection[3];
double HandlePosition[3];
- void SizeHandles() VTK_OVERRIDE;
+ void SizeHandles() override;
private:
vtkSphereWidget(const vtkSphereWidget&) VTK_DELETE_FUNCTION;
diff --git a/Interaction/Widgets/vtkSphereWidget2.h b/Interaction/Widgets/vtkSphereWidget2.h
index 43a91db544ab8d9afff1ab2095fe4d5a2b8dbc74..8b714703b9810680e71a140f31a12a89e8bfb33f 100644
--- a/Interaction/Widgets/vtkSphereWidget2.h
+++ b/Interaction/Widgets/vtkSphereWidget2.h
@@ -107,7 +107,7 @@ public:
* Standard class methods for type information and printing.
*/
vtkTypeMacro(vtkSphereWidget2,vtkAbstractWidget);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
@@ -135,11 +135,11 @@ public:
* Create the default widget representation if one is not set. By default,
* this is an instance of the vtkSphereRepresentation class.
*/
- void CreateDefaultRepresentation() VTK_OVERRIDE;
+ void CreateDefaultRepresentation() override;
protected:
vtkSphereWidget2();
- ~vtkSphereWidget2() VTK_OVERRIDE;
+ ~vtkSphereWidget2() override;
// Manage the state of the widget
int WidgetState;
diff --git a/Interaction/Widgets/vtkSplineRepresentation.h b/Interaction/Widgets/vtkSplineRepresentation.h
index 60d5ddae9cf8abe045be64d697c7e9d7087a39f8..119a6f389cdde401f7c04c46f43652f51472ff9c 100644
--- a/Interaction/Widgets/vtkSplineRepresentation.h
+++ b/Interaction/Widgets/vtkSplineRepresentation.h
@@ -49,7 +49,7 @@ class VTKINTERACTIONWIDGETS_EXPORT vtkSplineRepresentation : public vtkCurveRepr
public:
static vtkSplineRepresentation* New();
vtkTypeMacro(vtkSplineRepresentation, vtkCurveRepresentation);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Grab the polydata (including points) that defines the spline. The
@@ -58,12 +58,12 @@ public:
* either the InteractionEvent or EndInteraction events are invoked. The
* user provides the vtkPolyData and the points and polyline are added to it.
*/
- void GetPolyData(vtkPolyData *pd) VTK_OVERRIDE;
+ void GetPolyData(vtkPolyData *pd) override;
/**
* Set the number of handles for this widget.
*/
- void SetNumberOfHandles(int npts) VTK_OVERRIDE;
+ void SetNumberOfHandles(int npts) override;
//@{
/**
@@ -90,14 +90,14 @@ public:
/**
* Get the position of the spline handles.
*/
- vtkDoubleArray* GetHandlePositions() VTK_OVERRIDE;
+ vtkDoubleArray* GetHandlePositions() override;
/**
* Get the approximate vs. the true arc length of the spline. Calculated as
* the summed lengths of the individual straight line segments. Use
* SetResolution to control the accuracy.
*/
- double GetSummedLength() VTK_OVERRIDE;
+ double GetSummedLength() override;
/**
* Convenience method to allocate and set the handles from a vtkPoints
@@ -105,18 +105,18 @@ public:
* Closed to the on InteractionState and disregards the last point, otherwise Closed
* remains unchanged.
*/
- void InitializeHandles(vtkPoints* points) VTK_OVERRIDE;
+ void InitializeHandles(vtkPoints* points) override;
/**
* These are methods that satisfy vtkWidgetRepresentation's API. Note that a
* version of place widget is available where the center and handle position
* are specified.
*/
- void BuildRepresentation() VTK_OVERRIDE;
+ void BuildRepresentation() override;
protected:
vtkSplineRepresentation();
- ~vtkSplineRepresentation() VTK_OVERRIDE;
+ ~vtkSplineRepresentation() override;
// The spline
vtkParametricSpline *ParametricSpline;
@@ -126,7 +126,7 @@ protected:
int Resolution;
// Specialized method to insert a handle on the poly line.
- void InsertHandleOnLine(double* pos) VTK_OVERRIDE;
+ void InsertHandleOnLine(double* pos) override;
private:
vtkSplineRepresentation(const vtkSplineRepresentation&) VTK_DELETE_FUNCTION;
diff --git a/Interaction/Widgets/vtkSplineWidget.h b/Interaction/Widgets/vtkSplineWidget.h
index 215ee542e5c4667ba9d4cfbe3d8dbe9fb2d9ccc1..64d0f55cd4053346e14c9718e5ff6420483af640 100644
--- a/Interaction/Widgets/vtkSplineWidget.h
+++ b/Interaction/Widgets/vtkSplineWidget.h
@@ -110,18 +110,18 @@ public:
static vtkSplineWidget *New();
vtkTypeMacro(vtkSplineWidget,vtk3DWidget);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
* Methods that satisfy the superclass' API.
*/
- void SetEnabled(int) VTK_OVERRIDE;
- void PlaceWidget(double bounds[6]) VTK_OVERRIDE;
- void PlaceWidget() VTK_OVERRIDE
+ void SetEnabled(int) override;
+ void PlaceWidget(double bounds[6]) override;
+ void PlaceWidget() override
{this->Superclass::PlaceWidget();}
void PlaceWidget(double xmin, double xmax, double ymin, double ymax,
- double zmin, double zmax) VTK_OVERRIDE
+ double zmin, double zmax) override
{this->Superclass::PlaceWidget(xmin,xmax,ymin,ymax,zmin,zmax);}
//@}
@@ -287,7 +287,7 @@ public:
protected:
vtkSplineWidget();
- ~vtkSplineWidget() VTK_OVERRIDE;
+ ~vtkSplineWidget() override;
// Manage the state of the widget
int State;
@@ -345,7 +345,7 @@ protected:
vtkSphereSource **HandleGeometry;
void Initialize();
int HighlightHandle(vtkProp *prop); //returns handle index or -1 on fail
- void SizeHandles() VTK_OVERRIDE;
+ void SizeHandles() override;
void InsertHandleOnLine(double* pos);
void EraseHandle(const int&);
@@ -356,7 +356,7 @@ protected:
int CurrentHandleIndex;
// Register internal Pickers within PickingManager
- void RegisterPickers() VTK_OVERRIDE;
+ void RegisterPickers() override;
// Methods to manipulate the spline.
void MovePoint(double *p1, double *p2);
diff --git a/Interaction/Widgets/vtkSplineWidget2.h b/Interaction/Widgets/vtkSplineWidget2.h
index 3d8aa9e38e32177a3f74819d9c87f17d5a46521a..53399a2e024ac48a2a66524c360b077b9b7b1770 100644
--- a/Interaction/Widgets/vtkSplineWidget2.h
+++ b/Interaction/Widgets/vtkSplineWidget2.h
@@ -36,7 +36,7 @@ class VTKINTERACTIONWIDGETS_EXPORT vtkSplineWidget2 : public vtkAbstractWidget
public:
static vtkSplineWidget2* New();
vtkTypeMacro(vtkSplineWidget2, vtkAbstractWidget);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Specify an instance of vtkWidgetRepresentation used to represent this
@@ -53,11 +53,11 @@ public:
* Create the default widget representation if one is not set. By default,
* this is an instance of the vtkSplineRepresentation class.
*/
- void CreateDefaultRepresentation() VTK_OVERRIDE;
+ void CreateDefaultRepresentation() override;
protected:
vtkSplineWidget2();
- ~vtkSplineWidget2() VTK_OVERRIDE;
+ ~vtkSplineWidget2() override;
int WidgetState;
enum _WidgetState {Start=0,Active};
diff --git a/Interaction/Widgets/vtkTensorProbeRepresentation.h b/Interaction/Widgets/vtkTensorProbeRepresentation.h
index 518a7b9b21cfa6d0b0e9975a3b35b404a60a5e6c..24120f5f4105bec32eafe50f5513aaf51dac3f4f 100644
--- a/Interaction/Widgets/vtkTensorProbeRepresentation.h
+++ b/Interaction/Widgets/vtkTensorProbeRepresentation.h
@@ -45,15 +45,15 @@ public:
* Standard methods for instances of this class.
*/
vtkTypeMacro(vtkTensorProbeRepresentation,vtkWidgetRepresentation);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
/**
* See vtkWidgetRepresentation for details.
*/
- void BuildRepresentation() VTK_OVERRIDE;
- int RenderOpaqueGeometry(vtkViewport *) VTK_OVERRIDE;
+ void BuildRepresentation() override;
+ int RenderOpaqueGeometry(vtkViewport *) override;
//@}
//@{
@@ -93,13 +93,13 @@ public:
/**
* See vtkProp for details.
*/
- void GetActors(vtkPropCollection *) VTK_OVERRIDE;
- void ReleaseGraphicsResources(vtkWindow *) VTK_OVERRIDE;
+ void GetActors(vtkPropCollection *) override;
+ void ReleaseGraphicsResources(vtkWindow *) override;
//@}
protected:
vtkTensorProbeRepresentation();
- ~vtkTensorProbeRepresentation() VTK_OVERRIDE;
+ ~vtkTensorProbeRepresentation() override;
void FindClosestPointOnPolyline(
double displayPos[2], double closestWorldPos[3], vtkIdType &cellId,
diff --git a/Interaction/Widgets/vtkTensorProbeWidget.h b/Interaction/Widgets/vtkTensorProbeWidget.h
index c04fd43fc21f88aadc3a14d9cbddcb743d196423..4755e3c79ee649e18bf5e06061e816dba3de56d9 100644
--- a/Interaction/Widgets/vtkTensorProbeWidget.h
+++ b/Interaction/Widgets/vtkTensorProbeWidget.h
@@ -50,7 +50,7 @@ public:
* Standard VTK class macros.
*/
vtkTypeMacro(vtkTensorProbeWidget, vtkAbstractWidget);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
@@ -73,11 +73,11 @@ public:
/**
* See vtkWidgetRepresentation for details.
*/
- void CreateDefaultRepresentation() VTK_OVERRIDE;
+ void CreateDefaultRepresentation() override;
protected:
vtkTensorProbeWidget();
- ~vtkTensorProbeWidget() VTK_OVERRIDE;
+ ~vtkTensorProbeWidget() override;
// 1 when the probe has been selected, for instance when dragging it around
int Selected;
diff --git a/Interaction/Widgets/vtkTerrainContourLineInterpolator.h b/Interaction/Widgets/vtkTerrainContourLineInterpolator.h
index 783b632dc1f4e61e759a1b04a01b6acfc4d8a458..fa08d0f58154c118dbe10ce8237fcd3fbcf66d04 100644
--- a/Interaction/Widgets/vtkTerrainContourLineInterpolator.h
+++ b/Interaction/Widgets/vtkTerrainContourLineInterpolator.h
@@ -62,7 +62,7 @@ public:
*/
vtkTypeMacro(vtkTerrainContourLineInterpolator,
vtkContourLineInterpolator);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
@@ -74,7 +74,7 @@ public:
*/
int InterpolateLine( vtkRenderer *ren,
vtkContourRepresentation *rep,
- int idx1, int idx2 ) VTK_OVERRIDE;
+ int idx1, int idx2 ) override;
/**
* The interpolator is given a chance to update the node.
@@ -83,7 +83,7 @@ public:
*/
int UpdateNode( vtkRenderer *,
vtkContourRepresentation *,
- double * vtkNotUsed(node), int vtkNotUsed(idx) ) VTK_OVERRIDE;
+ double * vtkNotUsed(node), int vtkNotUsed(idx) ) override;
//@{
/**
@@ -106,7 +106,7 @@ public:
protected:
vtkTerrainContourLineInterpolator();
- ~vtkTerrainContourLineInterpolator() VTK_OVERRIDE;
+ ~vtkTerrainContourLineInterpolator() override;
vtkImageData *ImageData; // height field data
vtkProjectedTerrainPath *Projector;
diff --git a/Interaction/Widgets/vtkTerrainDataPointPlacer.h b/Interaction/Widgets/vtkTerrainDataPointPlacer.h
index f1f4157afae9c6395678e3d07dd895686bfdd6f2..8f88918ce0c9d421fa80dc3596a9a2a8e08c1bfd 100644
--- a/Interaction/Widgets/vtkTerrainDataPointPlacer.h
+++ b/Interaction/Widgets/vtkTerrainDataPointPlacer.h
@@ -57,7 +57,7 @@ public:
* Standard methods for instances of this class.
*/
vtkTypeMacro(vtkTerrainDataPointPlacer,vtkPointPlacer);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
// Descuription:
@@ -88,7 +88,7 @@ public:
int ComputeWorldPosition( vtkRenderer *ren,
double displayPos[2],
double worldPos[3],
- double worldOrient[9] ) VTK_OVERRIDE;
+ double worldOrient[9] ) override;
/**
* Given a renderer, a display position, and a reference world
@@ -100,25 +100,25 @@ public:
double displayPos[2],
double refWorldPos[3],
double worldPos[3],
- double worldOrient[9] ) VTK_OVERRIDE;
+ double worldOrient[9] ) override;
/**
* Given a world position check the validity of this
* position according to the constraints of the placer
*/
- int ValidateWorldPosition( double worldPos[3] ) VTK_OVERRIDE;
+ int ValidateWorldPosition( double worldPos[3] ) override;
/**
* Given a display position, check the validity of this position.
*/
- int ValidateDisplayPosition( vtkRenderer *, double displayPos[2] ) VTK_OVERRIDE;
+ int ValidateDisplayPosition( vtkRenderer *, double displayPos[2] ) override;
/**
* Given a world position and a world orientation,
* validate it according to the constraints of the placer.
*/
int ValidateWorldPosition( double worldPos[3],
- double worldOrient[9] ) VTK_OVERRIDE;
+ double worldOrient[9] ) override;
//@{
/**
@@ -129,7 +129,7 @@ public:
protected:
vtkTerrainDataPointPlacer();
- ~vtkTerrainDataPointPlacer() VTK_OVERRIDE;
+ ~vtkTerrainDataPointPlacer() override;
// The props that represents the terrain data (one or more) in a rendered
// scene
diff --git a/Interaction/Widgets/vtkTextRepresentation.cxx b/Interaction/Widgets/vtkTextRepresentation.cxx
index 134f5dae32791c0da65f7b58f2ec488c791d1298..06fe227adbf1a7f1e0497c05d110d6ce83b2ba29 100644
--- a/Interaction/Widgets/vtkTextRepresentation.cxx
+++ b/Interaction/Widgets/vtkTextRepresentation.cxx
@@ -32,7 +32,7 @@ public:
{
this->Target = t;
}
- void Execute(vtkObject* o, unsigned long event, void *p) VTK_OVERRIDE
+ void Execute(vtkObject* o, unsigned long event, void *p) override
{
if (this->Target)
{
diff --git a/Interaction/Widgets/vtkTextRepresentation.h b/Interaction/Widgets/vtkTextRepresentation.h
index e58c88d741b4bcf4dad0b2084cd09dacbc5eb9be..52d3e9ed1ef2882a4b6232f9c39648ac15c92810 100644
--- a/Interaction/Widgets/vtkTextRepresentation.h
+++ b/Interaction/Widgets/vtkTextRepresentation.h
@@ -48,7 +48,7 @@ public:
* Standard VTK methods.
*/
vtkTypeMacro(vtkTextRepresentation,vtkBorderRepresentation);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -71,8 +71,8 @@ public:
/**
* Satisfy the superclasses API.
*/
- void BuildRepresentation() VTK_OVERRIDE;
- void GetSize(double size[2]) VTK_OVERRIDE
+ void BuildRepresentation() override;
+ void GetSize(double size[2]) override
{size[0]=2.0; size[1]=2.0;}
//@{
@@ -80,12 +80,12 @@ public:
* These methods are necessary to make this representation behave as
* a vtkProp.
*/
- void GetActors2D(vtkPropCollection*) VTK_OVERRIDE;
- void ReleaseGraphicsResources(vtkWindow*) VTK_OVERRIDE;
- int RenderOverlay(vtkViewport*) VTK_OVERRIDE;
- int RenderOpaqueGeometry(vtkViewport*) VTK_OVERRIDE;
- int RenderTranslucentPolygonalGeometry(vtkViewport*) VTK_OVERRIDE;
- int HasTranslucentPolygonalGeometry() VTK_OVERRIDE;
+ void GetActors2D(vtkPropCollection*) override;
+ void ReleaseGraphicsResources(vtkWindow*) override;
+ int RenderOverlay(vtkViewport*) override;
+ int RenderOpaqueGeometry(vtkViewport*) override;
+ int RenderTranslucentPolygonalGeometry(vtkViewport*) override;
+ int HasTranslucentPolygonalGeometry() override;
//@}
enum
@@ -120,8 +120,8 @@ public:
* Set the text position, by overiding the same function of
* vtkBorderRepresentation so that the Modified() will be called.
*/
- void SetPosition(double x, double y) VTK_OVERRIDE;
- void SetPosition(double pos[2]) VTK_OVERRIDE
+ void SetPosition(double x, double y) override;
+ void SetPosition(double pos[2]) override
{ this->SetPosition(pos[0], pos[1]);};
//@}
@@ -135,7 +135,7 @@ public:
protected:
vtkTextRepresentation();
- ~vtkTextRepresentation() VTK_OVERRIDE;
+ ~vtkTextRepresentation() override;
// Initialize text actor
virtual void InitializeTextActor();
diff --git a/Interaction/Widgets/vtkTextWidget.h b/Interaction/Widgets/vtkTextWidget.h
index 8105cdf647d49af80de6930070ddabeeb7d26016..995f6b555e724ce3445208efd5ed8674b7a8c2d9 100644
--- a/Interaction/Widgets/vtkTextWidget.h
+++ b/Interaction/Widgets/vtkTextWidget.h
@@ -50,7 +50,7 @@ public:
* Standard VTK methods.
*/
vtkTypeMacro(vtkTextWidget,vtkBorderWidget);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
@@ -76,11 +76,11 @@ public:
/**
* Create the default widget representation if one is not set.
*/
- void CreateDefaultRepresentation() VTK_OVERRIDE;
+ void CreateDefaultRepresentation() override;
protected:
vtkTextWidget();
- ~vtkTextWidget() VTK_OVERRIDE;
+ ~vtkTextWidget() override;
private:
vtkTextWidget(const vtkTextWidget&) VTK_DELETE_FUNCTION;
diff --git a/Interaction/Widgets/vtkTexturedButtonRepresentation.h b/Interaction/Widgets/vtkTexturedButtonRepresentation.h
index bc1a1728659b87d424224d64dd01915417d7861f..d22f7afc32ea28f8fa479d22be7c449c189db172 100644
--- a/Interaction/Widgets/vtkTexturedButtonRepresentation.h
+++ b/Interaction/Widgets/vtkTexturedButtonRepresentation.h
@@ -74,7 +74,7 @@ public:
* Standard methods for instances of the class.
*/
vtkTypeMacro(vtkTexturedButtonRepresentation,vtkButtonRepresentation);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -144,28 +144,28 @@ public:
/**
* Provide the necessary methods to satisfy the vtkWidgetRepresentation API.
*/
- int ComputeInteractionState(int X, int Y, int modify=0) VTK_OVERRIDE;
- void PlaceWidget(double bounds[6]) VTK_OVERRIDE;
- void BuildRepresentation() VTK_OVERRIDE;
- void Highlight(int state) VTK_OVERRIDE;
+ int ComputeInteractionState(int X, int Y, int modify=0) override;
+ void PlaceWidget(double bounds[6]) override;
+ void BuildRepresentation() override;
+ void Highlight(int state) override;
//@}
//@{
/**
* Provide the necessary methods to satisfy the rendering API.
*/
- void ShallowCopy(vtkProp *prop) VTK_OVERRIDE;
- double *GetBounds() VTK_OVERRIDE;
- void GetActors(vtkPropCollection *pc) VTK_OVERRIDE;
- void ReleaseGraphicsResources(vtkWindow*) VTK_OVERRIDE;
- int RenderOpaqueGeometry(vtkViewport*) VTK_OVERRIDE;
- int RenderTranslucentPolygonalGeometry(vtkViewport*) VTK_OVERRIDE;
- int HasTranslucentPolygonalGeometry() VTK_OVERRIDE;
+ void ShallowCopy(vtkProp *prop) override;
+ double *GetBounds() override;
+ void GetActors(vtkPropCollection *pc) override;
+ void ReleaseGraphicsResources(vtkWindow*) override;
+ int RenderOpaqueGeometry(vtkViewport*) override;
+ int RenderTranslucentPolygonalGeometry(vtkViewport*) override;
+ int HasTranslucentPolygonalGeometry() override;
//@}
protected:
vtkTexturedButtonRepresentation();
- ~vtkTexturedButtonRepresentation() VTK_OVERRIDE;
+ ~vtkTexturedButtonRepresentation() override;
// Representing the button
vtkActor *Actor;
@@ -190,7 +190,7 @@ protected:
vtkCellPicker *Picker;
// Register internal Pickers within PickingManager
- void RegisterPickers() VTK_OVERRIDE;
+ void RegisterPickers() override;
private:
vtkTexturedButtonRepresentation(const vtkTexturedButtonRepresentation&) VTK_DELETE_FUNCTION;
diff --git a/Interaction/Widgets/vtkTexturedButtonRepresentation2D.h b/Interaction/Widgets/vtkTexturedButtonRepresentation2D.h
index 06e47cad2a076241c272dd077f4d53dea00b8da5..7a73a7afc245323a7d12151e30a750d142ed50ee 100644
--- a/Interaction/Widgets/vtkTexturedButtonRepresentation2D.h
+++ b/Interaction/Widgets/vtkTexturedButtonRepresentation2D.h
@@ -69,7 +69,7 @@ public:
* Standard methods for the class.
*/
vtkTypeMacro(vtkTexturedButtonRepresentation2D,vtkButtonRepresentation);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -116,9 +116,9 @@ public:
/**
* Provide the necessary methods to satisfy the vtkWidgetRepresentation API.
*/
- int ComputeInteractionState(int X, int Y, int modify=0) VTK_OVERRIDE;
- void BuildRepresentation() VTK_OVERRIDE;
- void Highlight(int state) VTK_OVERRIDE;
+ int ComputeInteractionState(int X, int Y, int modify=0) override;
+ void BuildRepresentation() override;
+ void Highlight(int state) override;
//@}
/**
@@ -128,7 +128,7 @@ public:
* set to zero. Note that PlaceWidget() is typically called at the end of configuring
* the button representation.
*/
- void PlaceWidget(double bounds[6]) VTK_OVERRIDE;
+ void PlaceWidget(double bounds[6]) override;
/**
* This alternative PlaceWidget() method can be used to anchor the button
@@ -146,17 +146,17 @@ public:
/**
* Provide the necessary methods to satisfy the rendering API.
*/
- void ShallowCopy(vtkProp *prop) VTK_OVERRIDE;
- double *GetBounds() VTK_OVERRIDE;
- void GetActors(vtkPropCollection *pc) VTK_OVERRIDE;
- void ReleaseGraphicsResources(vtkWindow*) VTK_OVERRIDE;
- int RenderOverlay(vtkViewport*) VTK_OVERRIDE;
- int HasTranslucentPolygonalGeometry() VTK_OVERRIDE;
+ void ShallowCopy(vtkProp *prop) override;
+ double *GetBounds() override;
+ void GetActors(vtkPropCollection *pc) override;
+ void ReleaseGraphicsResources(vtkWindow*) override;
+ int RenderOverlay(vtkViewport*) override;
+ int HasTranslucentPolygonalGeometry() override;
//@}
protected:
vtkTexturedButtonRepresentation2D();
- ~vtkTexturedButtonRepresentation2D() VTK_OVERRIDE;
+ ~vtkTexturedButtonRepresentation2D() override;
// Representing the button
vtkBalloonRepresentation *Balloon;
diff --git a/Interaction/Widgets/vtkWidgetCallbackMapper.h b/Interaction/Widgets/vtkWidgetCallbackMapper.h
index 730b07aa99b0b35a9d7d65d129f41351fdd621af..e0f92783e9cfc878aa453476567bd1f75bd98380 100644
--- a/Interaction/Widgets/vtkWidgetCallbackMapper.h
+++ b/Interaction/Widgets/vtkWidgetCallbackMapper.h
@@ -51,7 +51,7 @@ public:
* Standard macros.
*/
vtkTypeMacro(vtkWidgetCallbackMapper,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -99,7 +99,7 @@ public:
protected:
vtkWidgetCallbackMapper();
- ~vtkWidgetCallbackMapper() VTK_OVERRIDE;
+ ~vtkWidgetCallbackMapper() override;
// Translates VTK events into widget events
vtkWidgetEventTranslator *EventTranslator;
diff --git a/Interaction/Widgets/vtkWidgetEvent.h b/Interaction/Widgets/vtkWidgetEvent.h
index 17b14feaa4da4fdd82f9ed89c0628f349edcbbc8..f7fd03e4063c51436f27244d7d963671b9aea656 100644
--- a/Interaction/Widgets/vtkWidgetEvent.h
+++ b/Interaction/Widgets/vtkWidgetEvent.h
@@ -39,7 +39,7 @@ public:
* Standard macros.
*/
vtkTypeMacro(vtkWidgetEvent,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
@@ -87,7 +87,7 @@ public:
protected:
vtkWidgetEvent() {}
- ~vtkWidgetEvent() VTK_OVERRIDE {}
+ ~vtkWidgetEvent() override {}
private:
vtkWidgetEvent(const vtkWidgetEvent&) VTK_DELETE_FUNCTION;
diff --git a/Interaction/Widgets/vtkWidgetEventTranslator.h b/Interaction/Widgets/vtkWidgetEventTranslator.h
index 70b2f37f24a8e2a239da21e180e383ed2083d3a6..46a484f573c16362e44a0e9dc9e753fb2fff7f7b 100644
--- a/Interaction/Widgets/vtkWidgetEventTranslator.h
+++ b/Interaction/Widgets/vtkWidgetEventTranslator.h
@@ -58,7 +58,7 @@ public:
* Standard macros.
*/
vtkTypeMacro(vtkWidgetEventTranslator,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -120,7 +120,7 @@ public:
protected:
// Constructors/destructors made public for widgets to use
vtkWidgetEventTranslator();
- ~vtkWidgetEventTranslator() VTK_OVERRIDE;
+ ~vtkWidgetEventTranslator() override;
// Map VTK events to widget events
vtkEventMap *EventMap;
diff --git a/Interaction/Widgets/vtkWidgetRepresentation.h b/Interaction/Widgets/vtkWidgetRepresentation.h
index b2d1551d571208163c55a871bd5e6ed09495de4e..d7019b4b8d0e1c7f6e8322035b5f3b113039aa1f 100644
--- a/Interaction/Widgets/vtkWidgetRepresentation.h
+++ b/Interaction/Widgets/vtkWidgetRepresentation.h
@@ -65,7 +65,7 @@ public:
* Standard methods for instances of this class.
*/
vtkTypeMacro(vtkWidgetRepresentation,vtkProp);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -212,21 +212,21 @@ public:
* (i.e., not implementing the Render() methods properly) or leaking graphics resources
* (i.e., not implementing ReleaseGraphicsResources() properly).
*/
- double *GetBounds() VTK_OVERRIDE {return nullptr;}
- void ShallowCopy(vtkProp *prop) VTK_OVERRIDE;
- void GetActors(vtkPropCollection *) VTK_OVERRIDE {}
- void GetActors2D(vtkPropCollection *) VTK_OVERRIDE {}
- void GetVolumes(vtkPropCollection *) VTK_OVERRIDE {}
- void ReleaseGraphicsResources(vtkWindow *) VTK_OVERRIDE {}
- int RenderOverlay(vtkViewport *vtkNotUsed(viewport)) VTK_OVERRIDE {return 0;}
- int RenderOpaqueGeometry(vtkViewport *vtkNotUsed(viewport)) VTK_OVERRIDE {return 0;}
- int RenderTranslucentPolygonalGeometry(vtkViewport *vtkNotUsed(viewport)) VTK_OVERRIDE {return 0;}
- int RenderVolumetricGeometry(vtkViewport *vtkNotUsed(viewport)) VTK_OVERRIDE {return 0;}
- int HasTranslucentPolygonalGeometry() VTK_OVERRIDE { return 0; }
+ double *GetBounds() override {return nullptr;}
+ void ShallowCopy(vtkProp *prop) override;
+ void GetActors(vtkPropCollection *) override {}
+ void GetActors2D(vtkPropCollection *) override {}
+ void GetVolumes(vtkPropCollection *) override {}
+ void ReleaseGraphicsResources(vtkWindow *) override {}
+ int RenderOverlay(vtkViewport *vtkNotUsed(viewport)) override {return 0;}
+ int RenderOpaqueGeometry(vtkViewport *vtkNotUsed(viewport)) override {return 0;}
+ int RenderTranslucentPolygonalGeometry(vtkViewport *vtkNotUsed(viewport)) override {return 0;}
+ int RenderVolumetricGeometry(vtkViewport *vtkNotUsed(viewport)) override {return 0;}
+ int HasTranslucentPolygonalGeometry() override { return 0; }
protected:
vtkWidgetRepresentation();
- ~vtkWidgetRepresentation() VTK_OVERRIDE;
+ ~vtkWidgetRepresentation() override;
// The renderer in which this widget is placed
vtkWeakPointer<vtkRenderer> Renderer;
diff --git a/Interaction/Widgets/vtkWidgetSet.h b/Interaction/Widgets/vtkWidgetSet.h
index f275a1c7b06369cd05402add9ebb754425029e08..4e771a26a8c6ee06c00cd6b4c79306ba4747e314 100644
--- a/Interaction/Widgets/vtkWidgetSet.h
+++ b/Interaction/Widgets/vtkWidgetSet.h
@@ -121,7 +121,7 @@ public:
* Standard methods for a VTK class.
*/
vtkTypeMacro(vtkWidgetSet,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -192,7 +192,7 @@ public:
protected:
vtkWidgetSet();
- ~vtkWidgetSet() VTK_OVERRIDE;
+ ~vtkWidgetSet() override;
private:
vtkWidgetSet(const vtkWidgetSet&) VTK_DELETE_FUNCTION;
diff --git a/Interaction/Widgets/vtkXYPlotWidget.h b/Interaction/Widgets/vtkXYPlotWidget.h
index fcb5a933010aa84d29a45634595e8fc34d3aee6e..ea00d659e7457e4bb6aef1f25fddaf0a6348fabe 100644
--- a/Interaction/Widgets/vtkXYPlotWidget.h
+++ b/Interaction/Widgets/vtkXYPlotWidget.h
@@ -42,7 +42,7 @@ class VTKINTERACTIONWIDGETS_EXPORT vtkXYPlotWidget : public vtkInteractorObserve
public:
static vtkXYPlotWidget *New();
vtkTypeMacro(vtkXYPlotWidget,vtkInteractorObserver);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -55,11 +55,11 @@ public:
/**
* Methods for turning the interactor observer on and off.
*/
- void SetEnabled(int) VTK_OVERRIDE;
+ void SetEnabled(int) override;
protected:
vtkXYPlotWidget();
- ~vtkXYPlotWidget() VTK_OVERRIDE;
+ ~vtkXYPlotWidget() override;
// the actor that is used
vtkXYPlotActor *XYPlotActor;
diff --git a/Parallel/Core/vtkCommunicator.cxx b/Parallel/Core/vtkCommunicator.cxx
index a6acbc68e350e55abbf73ba5116967d5af8049d2..80e5ce702772a2dd8b9bb3f2de5a88dbe6693e13 100644
--- a/Parallel/Core/vtkCommunicator.cxx
+++ b/Parallel/Core/vtkCommunicator.cxx
@@ -61,7 +61,7 @@ class vtkCommunicator##name##Class \
: public vtkCommunicator::Operation \
{ \
public: \
- void Function(const void *A, void *B, vtkIdType length, int datatype) VTK_OVERRIDE { \
+ void Function(const void *A, void *B, vtkIdType length, int datatype) override { \
switch (datatype) \
{ \
vtkTemplateMacro(vtkCommunicator##name##Func \
@@ -70,7 +70,7 @@ public: \
length)); \
} \
} \
- int Commutative() VTK_OVERRIDE { return 1; } \
+ int Commutative() override { return 1; } \
};
#define STANDARD_OPERATION_FLOAT_OVERRIDE(name) \
diff --git a/Parallel/Core/vtkCommunicator.h b/Parallel/Core/vtkCommunicator.h
index 501f553cb684315377d8502d10c1093b22e35319..8cab52c785f40fa6105efaf513e5ad84f7321a65 100644
--- a/Parallel/Core/vtkCommunicator.h
+++ b/Parallel/Core/vtkCommunicator.h
@@ -53,7 +53,7 @@ class VTKPARALLELCORE_EXPORT vtkCommunicator : public vtkObject
public:
vtkTypeMacro(vtkCommunicator, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -1301,7 +1301,7 @@ protected:
int ReadDataArray(vtkDataArray *object);
vtkCommunicator();
- ~vtkCommunicator() VTK_OVERRIDE;
+ ~vtkCommunicator() override;
// Internal methods called by Send/Receive(vtkDataObject *... ) above.
int SendElementalDataObject(vtkDataObject* data, int remoteHandle, int tag);
diff --git a/Parallel/Core/vtkDummyCommunicator.h b/Parallel/Core/vtkDummyCommunicator.h
index ec74a9b20f5a3af8e9c945155383234524e2308d..2ef1f9d76f79e19dc6ea8900e6e3d2ba8e521ac3 100644
--- a/Parallel/Core/vtkDummyCommunicator.h
+++ b/Parallel/Core/vtkDummyCommunicator.h
@@ -36,18 +36,18 @@ class VTKPARALLELCORE_EXPORT vtkDummyCommunicator : public vtkCommunicator
public:
vtkTypeMacro(vtkDummyCommunicator, vtkCommunicator);
static vtkDummyCommunicator *New();
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
//@{
/**
* Since there is no one to communicate with, these methods just report an
* error.
*/
- int SendVoidArray(const void *, vtkIdType, int, int, int) VTK_OVERRIDE {
+ int SendVoidArray(const void *, vtkIdType, int, int, int) override {
vtkWarningMacro("There is no one to send to.");
return 0;
}
- int ReceiveVoidArray(void *, vtkIdType, int, int, int) VTK_OVERRIDE {
+ int ReceiveVoidArray(void *, vtkIdType, int, int, int) override {
vtkWarningMacro("There is no one to receive from.");
return 0;
}
@@ -55,7 +55,7 @@ public:
protected:
vtkDummyCommunicator();
- ~vtkDummyCommunicator() VTK_OVERRIDE;
+ ~vtkDummyCommunicator() override;
private:
vtkDummyCommunicator(const vtkDummyCommunicator &) VTK_DELETE_FUNCTION;
diff --git a/Parallel/Core/vtkDummyController.h b/Parallel/Core/vtkDummyController.h
index 74bafafa50ae27be4d5b6a667f621c028dc0f1e4..be7157709cb632c5fe170a1b823b2cc90a1fa0c8 100644
--- a/Parallel/Core/vtkDummyController.h
+++ b/Parallel/Core/vtkDummyController.h
@@ -34,15 +34,15 @@ class VTKPARALLELCORE_EXPORT vtkDummyController : public vtkMultiProcessControll
public:
static vtkDummyController *New();
vtkTypeMacro(vtkDummyController,vtkMultiProcessController);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* This method is for setting up the processes.
*/
- void Initialize(int*, char***, int) VTK_OVERRIDE {}
- void Initialize(int*, char***) VTK_OVERRIDE {}
- void Finalize() VTK_OVERRIDE {}
- void Finalize(int) VTK_OVERRIDE {}
+ void Initialize(int*, char***, int) override {}
+ void Initialize(int*, char***) override {}
+ void Finalize() override {}
+ void Finalize(int) override {}
/**
* This method always returns 0.
@@ -52,17 +52,17 @@ public:
/**
* Directly calls the single method.
*/
- void SingleMethodExecute() VTK_OVERRIDE;
+ void SingleMethodExecute() override;
/**
* Directly calls multiple method 0.
*/
- void MultipleMethodExecute() VTK_OVERRIDE;
+ void MultipleMethodExecute() override;
/**
* Does nothing.
*/
- void CreateOutputWindow() VTK_OVERRIDE {}
+ void CreateOutputWindow() override {}
//@{
/**
@@ -76,7 +76,7 @@ public:
protected:
vtkDummyController();
- ~vtkDummyController() VTK_OVERRIDE;
+ ~vtkDummyController() override;
private:
vtkDummyController(const vtkDummyController&) VTK_DELETE_FUNCTION;
diff --git a/Parallel/Core/vtkFieldDataSerializer.h b/Parallel/Core/vtkFieldDataSerializer.h
index bfb905900b166017fac496d538232c48cab5fea8..cd650e6616c3169703f878455250044ddb70a02e 100644
--- a/Parallel/Core/vtkFieldDataSerializer.h
+++ b/Parallel/Core/vtkFieldDataSerializer.h
@@ -44,7 +44,7 @@ class VTKPARALLELCORE_EXPORT vtkFieldDataSerializer : public vtkObject
public:
static vtkFieldDataSerializer* New();
vtkTypeMacro(vtkFieldDataSerializer,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Serializes the metadata of the given field data instance, i.e., the
@@ -111,7 +111,7 @@ class VTKPARALLELCORE_EXPORT vtkFieldDataSerializer : public vtkObject
protected:
vtkFieldDataSerializer();
- ~vtkFieldDataSerializer() VTK_OVERRIDE;
+ ~vtkFieldDataSerializer() override;
/**
* Given an input data array and list of tuples, it extracts the selected
diff --git a/Parallel/Core/vtkMultiProcessController.h b/Parallel/Core/vtkMultiProcessController.h
index d01f2544d4ff1dc88cedf983c3a5359287c7f7a4..394f87825872ae945878836983c3415db2e824ea 100644
--- a/Parallel/Core/vtkMultiProcessController.h
+++ b/Parallel/Core/vtkMultiProcessController.h
@@ -77,7 +77,7 @@ class VTKPARALLELCORE_EXPORT vtkMultiProcessController : public vtkObject
{
public:
vtkTypeMacro(vtkMultiProcessController,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* This method is for setting up the processes.
@@ -1423,7 +1423,7 @@ public:
protected:
vtkMultiProcessController();
- ~vtkMultiProcessController() VTK_OVERRIDE;
+ ~vtkMultiProcessController() override;
/**
* Implementation for TriggerRMI() provides subclasses an opportunity to
diff --git a/Parallel/Core/vtkPDirectory.h b/Parallel/Core/vtkPDirectory.h
index 31642a50604c435ace21aa83181e43e61d156eaa..b90fdbe919ec96030d62a0eb94d58cfad8d61122 100644
--- a/Parallel/Core/vtkPDirectory.h
+++ b/Parallel/Core/vtkPDirectory.h
@@ -36,7 +36,7 @@ class VTKPARALLELCORE_EXPORT vtkPDirectory : public vtkObject
public:
static vtkPDirectory *New();
vtkTypeMacro(vtkPDirectory,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -88,7 +88,7 @@ class VTKPARALLELCORE_EXPORT vtkPDirectory : public vtkObject
protected:
vtkPDirectory();
- ~vtkPDirectory() VTK_OVERRIDE;
+ ~vtkPDirectory() override;
private:
// Array of Files
diff --git a/Parallel/Core/vtkPSystemTools.h b/Parallel/Core/vtkPSystemTools.h
index fbced560c8ceb953cbf5e8f5a5debf5abbf52ee1..14eb8e6041302e25cbde29141ffe85fb35686bb5 100644
--- a/Parallel/Core/vtkPSystemTools.h
+++ b/Parallel/Core/vtkPSystemTools.h
@@ -35,7 +35,7 @@ class VTKPARALLELCORE_EXPORT vtkPSystemTools : public vtkObject
public:
static vtkPSystemTools *New();
vtkTypeMacro(vtkPSystemTools,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Given a string on process proc, broadcast that string to
@@ -109,7 +109,7 @@ class VTKPARALLELCORE_EXPORT vtkPSystemTools : public vtkObject
protected:
vtkPSystemTools() {}
- ~vtkPSystemTools() VTK_OVERRIDE {}
+ ~vtkPSystemTools() override {}
private:
vtkPSystemTools(const vtkPSystemTools&) VTK_DELETE_FUNCTION;
diff --git a/Parallel/Core/vtkProcess.h b/Parallel/Core/vtkProcess.h
index 084c8ec5ef3582bfc15cb0c6c8b4adf1791f101d..6a1f6484442815e4a31d919e2ab7c57149e7c76b 100644
--- a/Parallel/Core/vtkProcess.h
+++ b/Parallel/Core/vtkProcess.h
@@ -47,7 +47,7 @@ class VTKPARALLELCORE_EXPORT vtkProcess : public vtkObject
{
public:
vtkTypeMacro(vtkProcess,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Entry point of the process.
diff --git a/Parallel/Core/vtkProcessGroup.h b/Parallel/Core/vtkProcessGroup.h
index 5463a136cde9bb9161880d8f0821b5dfd304bc46..aad6be3c920c3ea02fe34124779cb9a5ae08374a 100644
--- a/Parallel/Core/vtkProcessGroup.h
+++ b/Parallel/Core/vtkProcessGroup.h
@@ -56,7 +56,7 @@ class VTKPARALLELCORE_EXPORT vtkProcessGroup : public vtkObject
public:
vtkTypeMacro(vtkProcessGroup, vtkObject);
static vtkProcessGroup *New();
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
//@{
/**
@@ -139,7 +139,7 @@ public:
protected:
vtkProcessGroup();
- ~vtkProcessGroup() VTK_OVERRIDE;
+ ~vtkProcessGroup() override;
int *ProcessIds;
int NumberOfProcessIds;
diff --git a/Parallel/Core/vtkSocketCommunicator.h b/Parallel/Core/vtkSocketCommunicator.h
index dc77e5d154e1ef0ca18fbabaebe0114de02993c4..e4b2d9a90a6b10086a14fbf38568fd69b6ac6faa 100644
--- a/Parallel/Core/vtkSocketCommunicator.h
+++ b/Parallel/Core/vtkSocketCommunicator.h
@@ -59,7 +59,7 @@ class VTKPARALLELCORE_EXPORT vtkSocketCommunicator : public vtkCommunicator
public:
static vtkSocketCommunicator *New();
vtkTypeMacro(vtkSocketCommunicator,vtkCommunicator);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -96,7 +96,7 @@ public:
/**
* Set the number of processes you will be using.
*/
- void SetNumberOfProcesses(int num) VTK_OVERRIDE;
+ void SetNumberOfProcesses(int num) override;
//------------------ Communication --------------------
@@ -106,16 +106,16 @@ public:
* Send functions defined in the superclass.
*/
int SendVoidArray(const void *data, vtkIdType length, int type,
- int remoteHandle, int tag) VTK_OVERRIDE;
+ int remoteHandle, int tag) override;
int ReceiveVoidArray(void *data, vtkIdType length, int type,
- int remoteHandle, int tag) VTK_OVERRIDE;
+ int remoteHandle, int tag) override;
//@}
/**
* This class foolishly breaks the conventions of the superclass, so this
* overload fixes the method.
*/
- void Barrier() VTK_OVERRIDE;
+ void Barrier() override;
//@{
/**
@@ -124,35 +124,35 @@ public:
* errors instead.
*/
int BroadcastVoidArray(void *data, vtkIdType length, int type,
- int srcProcessId) VTK_OVERRIDE;
+ int srcProcessId) override;
int GatherVoidArray(const void *sendBuffer, void *recvBuffer,
- vtkIdType length, int type, int destProcessId) VTK_OVERRIDE;
+ vtkIdType length, int type, int destProcessId) override;
int GatherVVoidArray(const void *sendBuffer, void *recvBuffer,
vtkIdType sendLength, vtkIdType *recvLengths,
- vtkIdType *offsets, int type, int destProcessId) VTK_OVERRIDE;
+ vtkIdType *offsets, int type, int destProcessId) override;
int ScatterVoidArray(const void *sendBuffer, void *recvBuffer,
- vtkIdType length, int type, int srcProcessId) VTK_OVERRIDE;
+ vtkIdType length, int type, int srcProcessId) override;
int ScatterVVoidArray(const void *sendBuffer, void *recvBuffer,
vtkIdType *sendLengths, vtkIdType *offsets,
vtkIdType recvLength, int type,
- int srcProcessId) VTK_OVERRIDE;
+ int srcProcessId) override;
int AllGatherVoidArray(const void *sendBuffer, void *recvBuffer,
- vtkIdType length, int type) VTK_OVERRIDE;
+ vtkIdType length, int type) override;
int AllGatherVVoidArray(const void *sendBuffer, void *recvBuffer,
vtkIdType sendLength, vtkIdType *recvLengths,
- vtkIdType *offsets, int type) VTK_OVERRIDE;
+ vtkIdType *offsets, int type) override;
int ReduceVoidArray(const void *sendBuffer, void *recvBuffer,
vtkIdType length, int type,
- int operation, int destProcessId) VTK_OVERRIDE;
+ int operation, int destProcessId) override;
int ReduceVoidArray(const void *sendBuffer, void *recvBuffer,
vtkIdType length, int type,
- Operation *operation, int destProcessId) VTK_OVERRIDE;
+ Operation *operation, int destProcessId) override;
int AllReduceVoidArray(const void *sendBuffer, void *recvBuffer,
vtkIdType length, int type,
- int operation) VTK_OVERRIDE;
+ int operation) override;
int AllReduceVoidArray(const void *sendBuffer, void *recvBuffer,
vtkIdType length, int type,
- Operation *operation) VTK_OVERRIDE;
+ Operation *operation) override;
//@}
//@{
@@ -266,7 +266,7 @@ protected:
ostream* LogStream;
vtkSocketCommunicator();
- ~vtkSocketCommunicator() VTK_OVERRIDE;
+ ~vtkSocketCommunicator() override;
// Wrappers around send/recv calls to implement loops. Return 1 for
// success, and 0 for failure.
diff --git a/Parallel/Core/vtkSocketController.h b/Parallel/Core/vtkSocketController.h
index a7f977a88c6ce980a02007a03db080889228a71d..537c86f378acdd05e0dcbb2bf5e481b36798f72f 100644
--- a/Parallel/Core/vtkSocketController.h
+++ b/Parallel/Core/vtkSocketController.h
@@ -51,38 +51,38 @@ class VTKPARALLELCORE_EXPORT vtkSocketController : public vtkMultiProcessControl
public:
static vtkSocketController *New();
vtkTypeMacro(vtkSocketController,vtkMultiProcessController);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* This method is for initialiazing sockets.
* One of these is REQUIRED for Windows.
*/
- void Initialize(int* argc, char*** argv, int) VTK_OVERRIDE
+ void Initialize(int* argc, char*** argv, int) override
{ this->Initialize(argc,argv); }
- void Initialize(int* argc, char*** argv) VTK_OVERRIDE;
+ void Initialize(int* argc, char*** argv) override;
virtual void Initialize()
{ this->Initialize(nullptr,nullptr); }
/**
* Does not apply to sockets. Does nothing.
*/
- void Finalize() VTK_OVERRIDE {}
- void Finalize(int) VTK_OVERRIDE {}
+ void Finalize() override {}
+ void Finalize(int) override {}
/**
* Does not apply to sockets. Does nothing.
*/
- void SingleMethodExecute() VTK_OVERRIDE {}
+ void SingleMethodExecute() override {}
/**
* Does not apply to sockets. Does nothing.
*/
- void MultipleMethodExecute() VTK_OVERRIDE {}
+ void MultipleMethodExecute() override {}
/**
* Does not apply to sockets. Does nothing.
*/
- void CreateOutputWindow() VTK_OVERRIDE {}
+ void CreateOutputWindow() override {}
/**
* Wait for connection on a given port, forwarded
@@ -130,7 +130,7 @@ public:
protected:
vtkSocketController();
- ~vtkSocketController() VTK_OVERRIDE;
+ ~vtkSocketController() override;
// Initialize only once, finialize on destruction.
static int Initialized;
diff --git a/Parallel/Core/vtkSubCommunicator.h b/Parallel/Core/vtkSubCommunicator.h
index 831017bc9fbda40356cb24c7c37e5ad84b9a92e1..5ca2f00bba8cafb567569ff7c39a94c0ab6a189a 100644
--- a/Parallel/Core/vtkSubCommunicator.h
+++ b/Parallel/Core/vtkSubCommunicator.h
@@ -56,7 +56,7 @@ class VTKPARALLELCORE_EXPORT vtkSubCommunicator : public vtkCommunicator
public:
vtkTypeMacro(vtkSubCommunicator, vtkCommunicator);
static vtkSubCommunicator *New();
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
//@{
/**
@@ -71,14 +71,14 @@ public:
* Implementation for abstract supercalss.
*/
int SendVoidArray(const void *data, vtkIdType length, int type,
- int remoteHandle, int tag) VTK_OVERRIDE;
+ int remoteHandle, int tag) override;
int ReceiveVoidArray(void *data, vtkIdType length, int type,
- int remoteHandle, int tag) VTK_OVERRIDE;
+ int remoteHandle, int tag) override;
//@}
protected:
vtkSubCommunicator();
- ~vtkSubCommunicator() VTK_OVERRIDE;
+ ~vtkSubCommunicator() override;
vtkProcessGroup *Group;
diff --git a/Parallel/Core/vtkSubGroup.h b/Parallel/Core/vtkSubGroup.h
index 6c9ee6d3510dcff8b2d3c55d22ccee9fa2396b50..6b9bdb2f1465442100117083fde5ec673e3f1482 100644
--- a/Parallel/Core/vtkSubGroup.h
+++ b/Parallel/Core/vtkSubGroup.h
@@ -52,7 +52,7 @@ class VTKPARALLELCORE_EXPORT vtkSubGroup : public vtkObject
{
public:
vtkTypeMacro(vtkSubGroup, vtkObject);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
static vtkSubGroup *New();
// The wrapper gets confused here and falls down.
@@ -106,7 +106,7 @@ public:
protected:
vtkSubGroup();
- ~vtkSubGroup() VTK_OVERRIDE;
+ ~vtkSubGroup() override;
private:
int computeFanInTargets();
diff --git a/Parallel/MPI/Testing/Cxx/TestProcess.cxx b/Parallel/MPI/Testing/Cxx/TestProcess.cxx
index 0ace13f0b963c3e75fb0d0f112ed980c51db015e..85789e6bc871f20b286b5402f75e65e4f5187de6 100644
--- a/Parallel/MPI/Testing/Cxx/TestProcess.cxx
+++ b/Parallel/MPI/Testing/Cxx/TestProcess.cxx
@@ -29,7 +29,7 @@ public:
static MyProcess *New();
vtkTypeMacro(MyProcess, vtkProcess);
- virtual void Execute() VTK_OVERRIDE;
+ virtual void Execute() override;
void SetArgs(int anArgc,
char *anArgv[]);
diff --git a/Parallel/MPI/vtkMPICommunicator.h b/Parallel/MPI/vtkMPICommunicator.h
index 4a9be0d288bf557dc33c6ff3d57b667b4549c0e0..57a28c5f8acf7f8efdda672e67ee99049ea0b1b4 100644
--- a/Parallel/MPI/vtkMPICommunicator.h
+++ b/Parallel/MPI/vtkMPICommunicator.h
@@ -64,7 +64,7 @@ public:
};
vtkTypeMacro( vtkMPICommunicator,vtkCommunicator);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Creates an empty communicator.
@@ -98,9 +98,9 @@ public:
* and 0 otherwise.
*/
virtual int SendVoidArray(const void *data, vtkIdType length, int type,
- int remoteProcessId, int tag) VTK_OVERRIDE;
+ int remoteProcessId, int tag) override;
virtual int ReceiveVoidArray(void *data, vtkIdType length, int type,
- int remoteProcessId, int tag) VTK_OVERRIDE;
+ int remoteProcessId, int tag) override;
//@}
//@{
@@ -163,37 +163,37 @@ public:
* the equivalent MPI commands. Return values are 1 for success
* and 0 otherwise.
*/
- virtual void Barrier() VTK_OVERRIDE;
+ virtual void Barrier() override;
virtual int BroadcastVoidArray(void *data, vtkIdType length, int type,
- int srcProcessId) VTK_OVERRIDE;
+ int srcProcessId) override;
virtual int GatherVoidArray(const void *sendBuffer, void *recvBuffer,
- vtkIdType length, int type, int destProcessId) VTK_OVERRIDE;
+ vtkIdType length, int type, int destProcessId) override;
virtual int GatherVVoidArray(const void *sendBuffer, void *recvBuffer,
vtkIdType sendLength, vtkIdType *recvLengths,
- vtkIdType *offsets, int type, int destProcessId) VTK_OVERRIDE;
+ vtkIdType *offsets, int type, int destProcessId) override;
virtual int ScatterVoidArray(const void *sendBuffer, void *recvBuffer,
- vtkIdType length, int type, int srcProcessId) VTK_OVERRIDE;
+ vtkIdType length, int type, int srcProcessId) override;
virtual int ScatterVVoidArray(const void *sendBuffer, void *recvBuffer,
vtkIdType *sendLengths, vtkIdType *offsets,
vtkIdType recvLength, int type,
- int srcProcessId) VTK_OVERRIDE;
+ int srcProcessId) override;
virtual int AllGatherVoidArray(const void *sendBuffer, void *recvBuffer,
- vtkIdType length, int type) VTK_OVERRIDE;
+ vtkIdType length, int type) override;
virtual int AllGatherVVoidArray(const void *sendBuffer, void *recvBuffer,
vtkIdType sendLength, vtkIdType *recvLengths,
- vtkIdType *offsets, int type) VTK_OVERRIDE;
+ vtkIdType *offsets, int type) override;
virtual int ReduceVoidArray(const void *sendBuffer, void *recvBuffer,
vtkIdType length, int type,
- int operation, int destProcessId) VTK_OVERRIDE;
+ int operation, int destProcessId) override;
virtual int ReduceVoidArray(const void *sendBuffer, void *recvBuffer,
vtkIdType length, int type,
- Operation *operation, int destProcessId) VTK_OVERRIDE;
+ Operation *operation, int destProcessId) override;
virtual int AllReduceVoidArray(const void *sendBuffer, void *recvBuffer,
vtkIdType length, int type,
- int operation) VTK_OVERRIDE;
+ int operation) override;
virtual int AllReduceVoidArray(const void *sendBuffer, void *recvBuffer,
vtkIdType length, int type,
- Operation *operation) VTK_OVERRIDE;
+ Operation *operation) override;
//@}
//@{
diff --git a/Parallel/MPI/vtkMPIController.cxx b/Parallel/MPI/vtkMPIController.cxx
index 06da1a419240a702d5cc32457c75a72fa61f395a..e65ee3c9120c1e5f910b2899b0ee1a6c55f1d0e3 100644
--- a/Parallel/MPI/vtkMPIController.cxx
+++ b/Parallel/MPI/vtkMPIController.cxx
@@ -38,7 +38,7 @@ class vtkMPIOutputWindow : public vtkOutputWindow
public:
vtkTypeMacro(vtkMPIOutputWindow,vtkOutputWindow);
- void DisplayText(const char* t) VTK_OVERRIDE
+ void DisplayText(const char* t) override
{
if (this->Controller && vtkMPIController::Initialized)
{
diff --git a/Parallel/MPI/vtkMPIController.h b/Parallel/MPI/vtkMPIController.h
index 39c55bc48ae55477d1c69e384ec4791fb368459c..7dff8d26fd1aa74f64256838ddb50826d3810ab9 100644
--- a/Parallel/MPI/vtkMPIController.h
+++ b/Parallel/MPI/vtkMPIController.h
@@ -59,7 +59,7 @@ public:
static vtkMPIController *New();
vtkTypeMacro(vtkMPIController,vtkMultiProcessController);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* This method is for setting up the processes.
@@ -72,11 +72,11 @@ public:
* usually MPI implementations add their own arguments during
* startup).
*/
- virtual void Initialize(int* argc, char*** argv) VTK_OVERRIDE
+ virtual void Initialize(int* argc, char*** argv) override
{ this->Initialize(argc, argv, 0); }
virtual void Initialize(int* vtkNotUsed(argc), char*** vtkNotUsed(argv),
- int initializedExternally) VTK_OVERRIDE;
+ int initializedExternally) override;
/**
* Same as Initialize(0, 0, 1). Mainly for calling from wrapped languages.
@@ -88,29 +88,29 @@ public:
* the end of the program if MPI was initialized with
* Initialize()
*/
- virtual void Finalize() VTK_OVERRIDE { this->Finalize(0); }
+ virtual void Finalize() override { this->Finalize(0); }
- virtual void Finalize(int finalizedExternally) VTK_OVERRIDE;
+ virtual void Finalize(int finalizedExternally) override;
/**
* Execute the SingleMethod (as define by SetSingleMethod) using
* this->NumberOfProcesses processes.
*/
- virtual void SingleMethodExecute() VTK_OVERRIDE;
+ virtual void SingleMethodExecute() override;
/**
* Execute the MultipleMethods (as define by calling SetMultipleMethod
* for each of the required this->NumberOfProcesses methods) using
* this->NumberOfProcesses processes.
*/
- virtual void MultipleMethodExecute() VTK_OVERRIDE;
+ virtual void MultipleMethodExecute() override;
/**
* This method can be used to tell the controller to create
* a special output window in which all messages are preceded
* by the process id.
*/
- virtual void CreateOutputWindow() VTK_OVERRIDE;
+ virtual void CreateOutputWindow() override;
/**
* Given an MPI error code, return a string which contains
@@ -130,9 +130,9 @@ public:
*/
void SetCommunicator(vtkMPICommunicator* comm);
- virtual vtkMPIController *CreateSubController(vtkProcessGroup *group) VTK_OVERRIDE;
+ virtual vtkMPIController *CreateSubController(vtkProcessGroup *group) override;
- virtual vtkMPIController *PartitionController(int localColor, int localKey) VTK_OVERRIDE;
+ virtual vtkMPIController *PartitionController(int localColor, int localKey) override;
/**
* This method sends data to another process (non-blocking).
@@ -321,7 +321,7 @@ protected:
* instead of Send.
*/
virtual void TriggerRMIInternal(int remoteProcessId,
- void* arg, int argLength, int rmiTag, bool propagate) VTK_OVERRIDE;
+ void* arg, int argLength, int rmiTag, bool propagate) override;
// MPI communicator created when Initialize() called.
// This is a copy of MPI_COMM_WORLD but uses a new
diff --git a/Parallel/MPI/vtkMPIEventLog.h b/Parallel/MPI/vtkMPIEventLog.h
index f2f2fe4d6ad711833e1e0c94cf8a199e7a67be92..0062cced6a6192f5136f5cfc38944fce4726ecb4 100644
--- a/Parallel/MPI/vtkMPIEventLog.h
+++ b/Parallel/MPI/vtkMPIEventLog.h
@@ -78,7 +78,7 @@ public:
void StopLogging();
//@}
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
diff --git a/Parallel/MPI4Py/vtkMPI4PyCommunicator.h b/Parallel/MPI4Py/vtkMPI4PyCommunicator.h
index 03cd550998fd59860fdf36a9c9aaa29dcc75d15f..ad337788e34cb98c01ab9d89c1dd6621752b1404 100644
--- a/Parallel/MPI4Py/vtkMPI4PyCommunicator.h
+++ b/Parallel/MPI4Py/vtkMPI4PyCommunicator.h
@@ -38,7 +38,7 @@ class VTKPARALLELMPI4PY_EXPORT vtkMPI4PyCommunicator : public vtkObject
public:
vtkTypeMacro(vtkMPI4PyCommunicator, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkMPI4PyCommunicator* New();
vtkMPI4PyCommunicator();
diff --git a/Rendering/Annotation/vtkAnnotatedCubeActor.h b/Rendering/Annotation/vtkAnnotatedCubeActor.h
index cafc0772e75a86cd6dfe73f9df0f475b4e512bb8..6069a9b05e24c61de4b03b9436df2b8028a2fe35 100644
--- a/Rendering/Annotation/vtkAnnotatedCubeActor.h
+++ b/Rendering/Annotation/vtkAnnotatedCubeActor.h
@@ -59,39 +59,39 @@ class VTKRENDERINGANNOTATION_EXPORT vtkAnnotatedCubeActor : public vtkProp3D
public:
static vtkAnnotatedCubeActor *New();
vtkTypeMacro(vtkAnnotatedCubeActor,vtkProp3D);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* For some exporters and other other operations we must be
* able to collect all the actors or volumes. These methods
* are used in that process.
*/
- void GetActors(vtkPropCollection *) VTK_OVERRIDE;
+ void GetActors(vtkPropCollection *) override;
//@{
/**
* Support the standard render methods.
*/
- int RenderOpaqueGeometry(vtkViewport *viewport) VTK_OVERRIDE;
- int RenderTranslucentPolygonalGeometry(vtkViewport *viewport) VTK_OVERRIDE;
+ int RenderOpaqueGeometry(vtkViewport *viewport) override;
+ int RenderTranslucentPolygonalGeometry(vtkViewport *viewport) override;
//@}
/**
* Does this prop have some translucent polygonal geometry?
*/
- int HasTranslucentPolygonalGeometry() VTK_OVERRIDE;
+ int HasTranslucentPolygonalGeometry() override;
/**
* Shallow copy of an axes actor. Overloads the virtual vtkProp method.
*/
- void ShallowCopy(vtkProp *prop) VTK_OVERRIDE;
+ void ShallowCopy(vtkProp *prop) override;
/**
* Release any graphics resources that are being consumed by this actor.
* The parameter window could be used to determine which graphic
* resources to release.
*/
- void ReleaseGraphicsResources(vtkWindow *) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *) override;
//@{
/**
@@ -99,13 +99,13 @@ public:
* method GetBounds(double bounds[6]) is available from the superclass.)
*/
void GetBounds(double bounds[6]);
- double *GetBounds() VTK_OVERRIDE;
+ double *GetBounds() override;
//@}
/**
* Get the actors mtime plus consider its properties and texture if set.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
//@{
/**
@@ -199,7 +199,7 @@ public:
protected:
vtkAnnotatedCubeActor();
- ~vtkAnnotatedCubeActor() VTK_OVERRIDE;
+ ~vtkAnnotatedCubeActor() override;
vtkCubeSource *CubeSource;
vtkActor *CubeActor;
diff --git a/Rendering/Annotation/vtkArcPlotter.h b/Rendering/Annotation/vtkArcPlotter.h
index 48b6a2b8ef093e7a7f1d28096e1bd71d1f32ef81..fe1322b00d891bf56a80dd4fdaff7ce1dc516a92 100644
--- a/Rendering/Annotation/vtkArcPlotter.h
+++ b/Rendering/Annotation/vtkArcPlotter.h
@@ -66,7 +66,7 @@ public:
static vtkArcPlotter *New();
vtkTypeMacro(vtkArcPlotter,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -162,13 +162,13 @@ public:
/**
* New GetMTime because of camera dependency.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
protected:
vtkArcPlotter();
- ~vtkArcPlotter() VTK_OVERRIDE;
+ ~vtkArcPlotter() override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
int OffsetPoint(vtkIdType ptId, vtkPoints *inPts, double n[3],
vtkPoints *newPts, double offset,
double *range, double val);
diff --git a/Rendering/Annotation/vtkAxesActor.h b/Rendering/Annotation/vtkAxesActor.h
index 35ce5af00c5d928d4f254f41ddc7539ee257fcde..27a88e23359a151fcaee59d4b33eac010707a3fd 100644
--- a/Rendering/Annotation/vtkAxesActor.h
+++ b/Rendering/Annotation/vtkAxesActor.h
@@ -67,40 +67,40 @@ class VTKRENDERINGANNOTATION_EXPORT vtkAxesActor : public vtkProp3D
public:
static vtkAxesActor *New();
vtkTypeMacro(vtkAxesActor,vtkProp3D);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* For some exporters and other other operations we must be
* able to collect all the actors or volumes. These methods
* are used in that process.
*/
- void GetActors(vtkPropCollection *) VTK_OVERRIDE;
+ void GetActors(vtkPropCollection *) override;
//@{
/**
* Support the standard render methods.
*/
- int RenderOpaqueGeometry(vtkViewport *viewport) VTK_OVERRIDE;
- int RenderTranslucentPolygonalGeometry(vtkViewport *viewport) VTK_OVERRIDE;
- int RenderOverlay(vtkViewport *viewport) VTK_OVERRIDE;
+ int RenderOpaqueGeometry(vtkViewport *viewport) override;
+ int RenderTranslucentPolygonalGeometry(vtkViewport *viewport) override;
+ int RenderOverlay(vtkViewport *viewport) override;
//@}
/**
* Does this prop have some translucent polygonal geometry?
*/
- int HasTranslucentPolygonalGeometry() VTK_OVERRIDE;
+ int HasTranslucentPolygonalGeometry() override;
/**
* Shallow copy of an axes actor. Overloads the virtual vtkProp method.
*/
- void ShallowCopy(vtkProp *prop) VTK_OVERRIDE;
+ void ShallowCopy(vtkProp *prop) override;
/**
* Release any graphics resources that are being consumed by this actor.
* The parameter window could be used to determine which graphic
* resources to release.
*/
- void ReleaseGraphicsResources(vtkWindow *) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *) override;
//@{
/**
@@ -108,13 +108,13 @@ public:
* method GetBounds(double bounds[6]) is available from the superclass.)
*/
void GetBounds(double bounds[6]);
- double *GetBounds() VTK_OVERRIDE;
+ double *GetBounds() override;
//@}
/**
* Get the actors mtime plus consider its properties and texture if set.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
/**
* Return the mtime of anything that would cause the rendered image to
@@ -122,7 +122,7 @@ public:
* prop plus anything else it depends on such as properties, textures
* etc.
*/
- vtkMTimeType GetRedrawMTime() VTK_OVERRIDE;
+ vtkMTimeType GetRedrawMTime() override;
//@{
/**
@@ -300,7 +300,7 @@ public:
protected:
vtkAxesActor();
- ~vtkAxesActor() VTK_OVERRIDE;
+ ~vtkAxesActor() override;
vtkCylinderSource *CylinderSource;
vtkLineSource *LineSource;
diff --git a/Rendering/Annotation/vtkAxisActor.h b/Rendering/Annotation/vtkAxisActor.h
index 93abcb3a12437799b9fb43f972fd1f2b62295edb..994757c93cbf590e4a6bae7d00203cc94e0e6524 100644
--- a/Rendering/Annotation/vtkAxisActor.h
+++ b/Rendering/Annotation/vtkAxisActor.h
@@ -72,7 +72,7 @@ class VTKRENDERINGANNOTATION_EXPORT vtkAxisActor : public vtkActor
{
public:
vtkTypeMacro(vtkAxisActor, vtkActor);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Instantiate object.
@@ -114,7 +114,7 @@ public:
*/
void SetBounds(const double bounds[6]);
void SetBounds(double xmin, double xmax, double ymin, double ymax, double zmin, double zmax);
- double* GetBounds(void) VTK_OVERRIDE;
+ double* GetBounds(void) override;
void GetBounds(double bounds[6]);
//@}
@@ -470,11 +470,11 @@ public:
/**
* Draw the axis.
*/
- int RenderOpaqueGeometry(vtkViewport* viewport) VTK_OVERRIDE;
+ int RenderOpaqueGeometry(vtkViewport* viewport) override;
virtual int RenderTranslucentGeometry(vtkViewport* viewport);
- int RenderTranslucentPolygonalGeometry(vtkViewport* viewport) VTK_OVERRIDE;
- int RenderOverlay(vtkViewport* viewport) VTK_OVERRIDE;
- int HasTranslucentPolygonalGeometry() VTK_OVERRIDE;
+ int RenderTranslucentPolygonalGeometry(vtkViewport* viewport) override;
+ int RenderOverlay(vtkViewport* viewport) override;
+ int HasTranslucentPolygonalGeometry() override;
//@}
/**
@@ -482,7 +482,7 @@ public:
* The parameter window could be used to determine which graphic
* resources to release.
*/
- void ReleaseGraphicsResources(vtkWindow*) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow*) override;
double ComputeMaxLabelLength(const double[3]);
double ComputeTitleLength(const double[3]);
@@ -680,7 +680,7 @@ public:
protected:
vtkAxisActor();
- ~vtkAxisActor() VTK_OVERRIDE;
+ ~vtkAxisActor() override;
char* Title;
char* Exponent;
diff --git a/Rendering/Annotation/vtkAxisActor2D.h b/Rendering/Annotation/vtkAxisActor2D.h
index 8b85da921b204895a1ffe4d7e6f63ddf6afbe279..77e5a3f753e73615a4c97b98e212bb39c4db8eac 100644
--- a/Rendering/Annotation/vtkAxisActor2D.h
+++ b/Rendering/Annotation/vtkAxisActor2D.h
@@ -70,7 +70,7 @@ class VTKRENDERINGANNOTATION_EXPORT vtkAxisActor2D : public vtkActor2D
{
public:
vtkTypeMacro(vtkAxisActor2D,vtkActor2D);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Instantiate object.
@@ -319,22 +319,22 @@ public:
/**
* Draw the axis.
*/
- int RenderOverlay(vtkViewport* viewport) VTK_OVERRIDE;
- int RenderOpaqueGeometry(vtkViewport* viewport) VTK_OVERRIDE;
- int RenderTranslucentPolygonalGeometry(vtkViewport *) VTK_OVERRIDE {return 0;}
+ int RenderOverlay(vtkViewport* viewport) override;
+ int RenderOpaqueGeometry(vtkViewport* viewport) override;
+ int RenderTranslucentPolygonalGeometry(vtkViewport *) override {return 0;}
//@}
/**
* Does this prop have some translucent polygonal geometry?
*/
- int HasTranslucentPolygonalGeometry() VTK_OVERRIDE;
+ int HasTranslucentPolygonalGeometry() override;
/**
* Release any graphics resources that are being consumed by this actor.
* The parameter window could be used to determine which graphic
* resources to release.
*/
- void ReleaseGraphicsResources(vtkWindow *) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *) override;
/**
* This method computes the range of the axis given an input range.
@@ -380,11 +380,11 @@ public:
/**
* Shallow copy of an axis actor. Overloads the virtual vtkProp method.
*/
- void ShallowCopy(vtkProp *prop) VTK_OVERRIDE;
+ void ShallowCopy(vtkProp *prop) override;
protected:
vtkAxisActor2D();
- ~vtkAxisActor2D() VTK_OVERRIDE;
+ ~vtkAxisActor2D() override;
vtkTextProperty *TitleTextProperty;
vtkTextProperty *LabelTextProperty;
diff --git a/Rendering/Annotation/vtkAxisFollower.h b/Rendering/Annotation/vtkAxisFollower.h
index 7b52b4c61feac56296b38c302469eb9d313369cf..1ffcee651df4c4251a43ce507f663c8952bfd751 100644
--- a/Rendering/Annotation/vtkAxisFollower.h
+++ b/Rendering/Annotation/vtkAxisFollower.h
@@ -42,7 +42,7 @@ class VTKRENDERINGANNOTATION_EXPORT vtkAxisFollower : public vtkFollower
{
public:
vtkTypeMacro(vtkAxisFollower,vtkFollower);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Creates a follower with no camera set
@@ -132,9 +132,9 @@ public:
* property, texture map and then mapper. If a property hasn't been
* assigned, then the actor will create one automatically.
*/
- int RenderOpaqueGeometry(vtkViewport *viewport) VTK_OVERRIDE;
- int RenderTranslucentPolygonalGeometry(vtkViewport *viewport) VTK_OVERRIDE;
- void Render(vtkRenderer *ren) VTK_OVERRIDE;
+ int RenderOpaqueGeometry(vtkViewport *viewport) override;
+ int RenderTranslucentPolygonalGeometry(vtkViewport *viewport) override;
+ void Render(vtkRenderer *ren) override;
//@}
/**
@@ -146,7 +146,7 @@ public:
/**
* Shallow copy of a follower. Overloads the virtual vtkProp method.
*/
- void ShallowCopy(vtkProp *prop) VTK_OVERRIDE;
+ void ShallowCopy(vtkProp *prop) override;
/**
* Calculate scale factor to maintain same size of a object
@@ -157,7 +157,7 @@ public:
protected:
vtkAxisFollower();
- ~vtkAxisFollower() VTK_OVERRIDE;
+ ~vtkAxisFollower() override;
void CalculateOrthogonalVectors(double Rx[3], double Ry[3], double Rz[3],
vtkAxisActor *axis1, double *dop,
@@ -197,7 +197,7 @@ private:
void operator =(const vtkAxisFollower&) VTK_DELETE_FUNCTION;
// hide the two parameter Render() method from the user and the compiler.
- void Render(vtkRenderer *, vtkMapper *) VTK_OVERRIDE {}
+ void Render(vtkRenderer *, vtkMapper *) override {}
};
#endif // vtkAxisFollower_h
diff --git a/Rendering/Annotation/vtkBarChartActor.h b/Rendering/Annotation/vtkBarChartActor.h
index cc9b83f901f2cfa7888a8761d5ae5c8c9cf7cee1..f93b3e3ee4148501c45a56467ccf6d3ce751963e 100644
--- a/Rendering/Annotation/vtkBarChartActor.h
+++ b/Rendering/Annotation/vtkBarChartActor.h
@@ -55,7 +55,7 @@ public:
* Standard methods for type information and printing.
*/
vtkTypeMacro(vtkBarChartActor,vtkActor2D);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
@@ -170,26 +170,26 @@ public:
/**
* Draw the bar plot.
*/
- int RenderOverlay(vtkViewport*) VTK_OVERRIDE;
- int RenderOpaqueGeometry(vtkViewport*) VTK_OVERRIDE;
- int RenderTranslucentPolygonalGeometry(vtkViewport* ) VTK_OVERRIDE {return 0;}
+ int RenderOverlay(vtkViewport*) override;
+ int RenderOpaqueGeometry(vtkViewport*) override;
+ int RenderTranslucentPolygonalGeometry(vtkViewport* ) override {return 0;}
//@}
/**
* Does this prop have some translucent polygonal geometry?
*/
- int HasTranslucentPolygonalGeometry() VTK_OVERRIDE;
+ int HasTranslucentPolygonalGeometry() override;
/**
* Release any graphics resources that are being consumed by this actor.
* The parameter window could be used to determine which graphic
* resources to release.
*/
- void ReleaseGraphicsResources(vtkWindow *) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *) override;
protected:
vtkBarChartActor();
- ~vtkBarChartActor() VTK_OVERRIDE;
+ ~vtkBarChartActor() override;
private:
vtkDataObject *Input; // List of data sets to plot
diff --git a/Rendering/Annotation/vtkCaptionActor2D.h b/Rendering/Annotation/vtkCaptionActor2D.h
index ed8efba155275919f2f7ddc3dbe1bb05a3c1d9c8..e1bb117fddca511f98c85ddc27d53ad5b28ea3b8 100644
--- a/Rendering/Annotation/vtkCaptionActor2D.h
+++ b/Rendering/Annotation/vtkCaptionActor2D.h
@@ -75,7 +75,7 @@ class VTKRENDERINGANNOTATION_EXPORT vtkCaptionActor2D : public vtkActor2D
{
public:
vtkTypeMacro(vtkCaptionActor2D,vtkActor2D);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkCaptionActor2D *New();
@@ -190,7 +190,7 @@ public:
* Shallow copy of this scaled text actor. Overloads the virtual
* vtkProp method.
*/
- void ShallowCopy(vtkProp *prop) VTK_OVERRIDE;
+ void ShallowCopy(vtkProp *prop) override;
//@{
/**
@@ -209,7 +209,7 @@ public:
* The parameter window could be used to determine which graphic
* resources to release.
*/
- void ReleaseGraphicsResources(vtkWindow *) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *) override;
//@{
/**
@@ -217,19 +217,19 @@ public:
* DO NOT USE THIS METHOD OUTSIDE OF THE RENDERING PROCESS.
* Draw the legend box to the screen.
*/
- int RenderOpaqueGeometry(vtkViewport* viewport) VTK_OVERRIDE;
- int RenderTranslucentPolygonalGeometry(vtkViewport* ) VTK_OVERRIDE {return 0;}
- int RenderOverlay(vtkViewport* viewport) VTK_OVERRIDE;
+ int RenderOpaqueGeometry(vtkViewport* viewport) override;
+ int RenderTranslucentPolygonalGeometry(vtkViewport* ) override {return 0;}
+ int RenderOverlay(vtkViewport* viewport) override;
//@}
/**
* Does this prop have some translucent polygonal geometry?
*/
- int HasTranslucentPolygonalGeometry() VTK_OVERRIDE;
+ int HasTranslucentPolygonalGeometry() override;
protected:
vtkCaptionActor2D();
- ~vtkCaptionActor2D() VTK_OVERRIDE;
+ ~vtkCaptionActor2D() override;
vtkCoordinate *AttachmentPointCoordinate;
diff --git a/Rendering/Annotation/vtkConvexHull2D.h b/Rendering/Annotation/vtkConvexHull2D.h
index d8263b6c0b6e0f0eb7ce769ef88f01b09f190bfa..f3cebf5ca2c152a3eb6cd398924cf83952098bb5 100644
--- a/Rendering/Annotation/vtkConvexHull2D.h
+++ b/Rendering/Annotation/vtkConvexHull2D.h
@@ -65,7 +65,7 @@ class VTKRENDERINGANNOTATION_EXPORT vtkConvexHull2D: public vtkPolyDataAlgorithm
public:
static vtkConvexHull2D *New();
vtkTypeMacro(vtkConvexHull2D, vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -127,7 +127,7 @@ public:
/**
* The modified time of this filter.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
//@{
/**
@@ -141,13 +141,13 @@ public:
protected:
vtkConvexHull2D();
- ~vtkConvexHull2D() VTK_OVERRIDE;
+ ~vtkConvexHull2D() override;
/**
* This is called by the superclass. This is the method you should override.
*/
int RequestData(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
private:
vtkConvexHull2D(const vtkConvexHull2D&) VTK_DELETE_FUNCTION;
diff --git a/Rendering/Annotation/vtkCornerAnnotation.h b/Rendering/Annotation/vtkCornerAnnotation.h
index 60622e0d751dcc63c13b3c743feb5110b5f53e7d..f9891c8c06bc1afd3db15b2da4877409be5dd7cd 100644
--- a/Rendering/Annotation/vtkCornerAnnotation.h
+++ b/Rendering/Annotation/vtkCornerAnnotation.h
@@ -48,7 +48,7 @@ class VTKRENDERINGANNOTATION_EXPORT vtkCornerAnnotation : public vtkActor2D
{
public:
vtkTypeMacro(vtkCornerAnnotation,vtkActor2D);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Instantiate object with a rectangle in normaled view coordinates
@@ -60,15 +60,15 @@ public:
/**
* Draw the scalar bar and annotation text to the screen.
*/
- int RenderOpaqueGeometry(vtkViewport* viewport) VTK_OVERRIDE;
- int RenderTranslucentPolygonalGeometry(vtkViewport* ) VTK_OVERRIDE {return 0;};
- int RenderOverlay(vtkViewport* viewport) VTK_OVERRIDE;
+ int RenderOpaqueGeometry(vtkViewport* viewport) override;
+ int RenderTranslucentPolygonalGeometry(vtkViewport* ) override {return 0;};
+ int RenderOverlay(vtkViewport* viewport) override;
//@}
/**
* Does this prop have some translucent polygonal geometry?
*/
- int HasTranslucentPolygonalGeometry() VTK_OVERRIDE;
+ int HasTranslucentPolygonalGeometry() override;
//@{
/**
@@ -112,7 +112,7 @@ public:
* The parameter window could be used to determine which graphic
* resources to release.
*/
- void ReleaseGraphicsResources(vtkWindow *) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *) override;
//@{
/**
@@ -196,7 +196,7 @@ public:
protected:
vtkCornerAnnotation();
- ~vtkCornerAnnotation() VTK_OVERRIDE;
+ ~vtkCornerAnnotation() override;
double MaximumLineHeight;
diff --git a/Rendering/Annotation/vtkCubeAxesActor.h b/Rendering/Annotation/vtkCubeAxesActor.h
index 1c6f1a7e58e3ae97e4b5147ffb1e401eb7f82a78..fb10e29f23c90431c4283f037e2040dfd8f3e9f9 100644
--- a/Rendering/Annotation/vtkCubeAxesActor.h
+++ b/Rendering/Annotation/vtkCubeAxesActor.h
@@ -68,7 +68,7 @@ class VTKRENDERINGANNOTATION_EXPORT vtkCubeAxesActor : public vtkActor
{
public:
vtkTypeMacro(vtkCubeAxesActor,vtkActor);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Instantiate object with label format "6.3g" and the number of labels
@@ -80,11 +80,11 @@ public:
/**
* Draw the axes as per the vtkProp superclass' API.
*/
- int RenderOpaqueGeometry(vtkViewport*) VTK_OVERRIDE;
+ int RenderOpaqueGeometry(vtkViewport*) override;
virtual int RenderTranslucentGeometry(vtkViewport*);
- int RenderTranslucentPolygonalGeometry(vtkViewport*) VTK_OVERRIDE;
- int RenderOverlay(vtkViewport*) VTK_OVERRIDE;
- int HasTranslucentPolygonalGeometry() VTK_OVERRIDE;
+ int RenderTranslucentPolygonalGeometry(vtkViewport*) override;
+ int RenderOverlay(vtkViewport*) override;
+ int HasTranslucentPolygonalGeometry() override;
//@}
//@{
@@ -104,7 +104,7 @@ public:
*/
vtkSetVector6Macro(Bounds,double);
using Superclass::GetBounds;
- double *GetBounds() VTK_OVERRIDE { return this->Bounds; }
+ double *GetBounds() override { return this->Bounds; }
//@}
//@{
@@ -265,7 +265,7 @@ public:
* The parameter window could be used to determine which graphic
* resources to release.
*/
- void ReleaseGraphicsResources(vtkWindow *) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *) override;
//@{
/**
@@ -605,7 +605,7 @@ public:
protected:
vtkCubeAxesActor();
- ~vtkCubeAxesActor() VTK_OVERRIDE;
+ ~vtkCubeAxesActor() override;
/**
* Computes a bounding sphere used to determine the sticky bounding box.
diff --git a/Rendering/Annotation/vtkCubeAxesActor2D.h b/Rendering/Annotation/vtkCubeAxesActor2D.h
index 1d8ad54200ac8705328fc920f900c3a3a4d714c9..7e0d9ce0999e0ef6f9e2bdccead147e129f00e26 100644
--- a/Rendering/Annotation/vtkCubeAxesActor2D.h
+++ b/Rendering/Annotation/vtkCubeAxesActor2D.h
@@ -60,7 +60,7 @@ class VTKRENDERINGANNOTATION_EXPORT vtkCubeAxesActor2D : public vtkActor2D
{
public:
vtkTypeMacro(vtkCubeAxesActor2D,vtkActor2D);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Instantiate object with bold, italic, and shadow enabled; font family
@@ -73,15 +73,15 @@ public:
/**
* Draw the axes as per the vtkProp superclass' API.
*/
- int RenderOverlay(vtkViewport*) VTK_OVERRIDE;
- int RenderOpaqueGeometry(vtkViewport*) VTK_OVERRIDE;
- int RenderTranslucentPolygonalGeometry(vtkViewport *) VTK_OVERRIDE {return 0;}
+ int RenderOverlay(vtkViewport*) override;
+ int RenderOpaqueGeometry(vtkViewport*) override;
+ int RenderTranslucentPolygonalGeometry(vtkViewport *) override {return 0;}
//@}
/**
* Does this prop have some translucent polygonal geometry?
*/
- int HasTranslucentPolygonalGeometry() VTK_OVERRIDE;
+ int HasTranslucentPolygonalGeometry() override;
//@{
/**
@@ -112,7 +112,7 @@ public:
* sure that the min's are less than the max's.
*/
vtkSetVector6Macro(Bounds,double);
- double *GetBounds() VTK_OVERRIDE;
+ double *GetBounds() override;
void GetBounds(double& xmin, double& xmax, double& ymin, double& ymax,
double& zmin, double& zmax);
void GetBounds(double bounds[6]);
@@ -305,7 +305,7 @@ public:
* The parameter window could be used to determine which graphic
* resources to release.
*/
- void ReleaseGraphicsResources(vtkWindow *) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *) override;
//@{
/**
@@ -329,7 +329,7 @@ public:
protected:
vtkCubeAxesActor2D();
- ~vtkCubeAxesActor2D() VTK_OVERRIDE;
+ ~vtkCubeAxesActor2D() override;
vtkCubeAxesActor2DConnection* ConnectionHolder;
@@ -391,7 +391,7 @@ protected:
private:
// hide the superclass' ShallowCopy() from the user and the compiler.
- void ShallowCopy(vtkProp *prop) VTK_OVERRIDE { this->vtkProp::ShallowCopy( prop ); };
+ void ShallowCopy(vtkProp *prop) override { this->vtkProp::ShallowCopy( prop ); };
private:
vtkCubeAxesActor2D(const vtkCubeAxesActor2D&) VTK_DELETE_FUNCTION;
void operator=(const vtkCubeAxesActor2D&) VTK_DELETE_FUNCTION;
diff --git a/Rendering/Annotation/vtkGraphAnnotationLayersFilter.h b/Rendering/Annotation/vtkGraphAnnotationLayersFilter.h
index b8984761fd08d810213feab451057a89e98631fe..b31f95f0650c5bfaea9821e249f310276d66dfe0 100644
--- a/Rendering/Annotation/vtkGraphAnnotationLayersFilter.h
+++ b/Rendering/Annotation/vtkGraphAnnotationLayersFilter.h
@@ -63,7 +63,7 @@ class VTKRENDERINGANNOTATION_EXPORT vtkGraphAnnotationLayersFilter: public vtkPo
public:
static vtkGraphAnnotationLayersFilter *New();
vtkTypeMacro(vtkGraphAnnotationLayersFilter, vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -109,22 +109,22 @@ public:
/**
* The modified time of this filter.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
protected:
vtkGraphAnnotationLayersFilter();
- ~vtkGraphAnnotationLayersFilter() VTK_OVERRIDE;
+ ~vtkGraphAnnotationLayersFilter() override;
/**
* This is called by the superclass. This is the method you should override.
*/
int RequestData(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
/**
* Set the input to vtkGraph and vtkAnnotationLayers.
*/
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
private:
vtkGraphAnnotationLayersFilter(const vtkGraphAnnotationLayersFilter&) VTK_DELETE_FUNCTION;
diff --git a/Rendering/Annotation/vtkLeaderActor2D.h b/Rendering/Annotation/vtkLeaderActor2D.h
index 4aaba716cfe64360eb1433cc01b35025ffaff069..2e53e8122cc6cd93aa049df4907f2d1985f20612 100644
--- a/Rendering/Annotation/vtkLeaderActor2D.h
+++ b/Rendering/Annotation/vtkLeaderActor2D.h
@@ -57,7 +57,7 @@ class VTKRENDERINGANNOTATION_EXPORT vtkLeaderActor2D : public vtkActor2D
{
public:
vtkTypeMacro(vtkLeaderActor2D,vtkActor2D);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Instantiate object.
@@ -195,22 +195,22 @@ public:
/**
* Methods required by vtkProp and vtkActor2D superclasses.
*/
- int RenderOverlay(vtkViewport* viewport) VTK_OVERRIDE;
- int RenderOpaqueGeometry(vtkViewport* viewport) VTK_OVERRIDE;
- int RenderTranslucentPolygonalGeometry(vtkViewport *) VTK_OVERRIDE {return 0;}
+ int RenderOverlay(vtkViewport* viewport) override;
+ int RenderOpaqueGeometry(vtkViewport* viewport) override;
+ int RenderTranslucentPolygonalGeometry(vtkViewport *) override {return 0;}
//@}
/**
* Does this prop have some translucent polygonal geometry?
*/
- int HasTranslucentPolygonalGeometry() VTK_OVERRIDE;
+ int HasTranslucentPolygonalGeometry() override;
- void ReleaseGraphicsResources(vtkWindow *) VTK_OVERRIDE;
- void ShallowCopy(vtkProp *prop) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *) override;
+ void ShallowCopy(vtkProp *prop) override;
protected:
vtkLeaderActor2D();
- ~vtkLeaderActor2D() VTK_OVERRIDE;
+ ~vtkLeaderActor2D() override;
// Internal helper methods
virtual void BuildLeader(vtkViewport *viewport);
diff --git a/Rendering/Annotation/vtkLegendBoxActor.h b/Rendering/Annotation/vtkLegendBoxActor.h
index 309211ecfda0688969c24f85e49fef422c1796b4..e5fadb631962456f1540b9379063640cb20e86c0 100644
--- a/Rendering/Annotation/vtkLegendBoxActor.h
+++ b/Rendering/Annotation/vtkLegendBoxActor.h
@@ -59,7 +59,7 @@ class VTKRENDERINGANNOTATION_EXPORT vtkLegendBoxActor : public vtkActor2D
{
public:
vtkTypeMacro(vtkLegendBoxActor,vtkActor2D);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Instantiate object with a rectangle in normaled view coordinates
@@ -200,7 +200,7 @@ public:
* Shallow copy of this scaled text actor. Overloads the virtual
* vtkProp method.
*/
- void ShallowCopy(vtkProp *prop) VTK_OVERRIDE;
+ void ShallowCopy(vtkProp *prop) override;
/**
* WARNING: INTERNAL METHOD - NOT INTENDED FOR GENERAL USE
@@ -209,7 +209,7 @@ public:
* The parameter window could be used to determine which graphic
* resources to release.
*/
- void ReleaseGraphicsResources(vtkWindow *) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *) override;
//@{
/**
@@ -217,19 +217,19 @@ public:
* DO NOT USE THIS METHOD OUTSIDE OF THE RENDERING PROCESS.
* Draw the legend box to the screen.
*/
- int RenderOpaqueGeometry(vtkViewport* viewport) VTK_OVERRIDE;
- int RenderTranslucentPolygonalGeometry(vtkViewport* ) VTK_OVERRIDE {return 0;};
- int RenderOverlay(vtkViewport* viewport) VTK_OVERRIDE;
+ int RenderOpaqueGeometry(vtkViewport* viewport) override;
+ int RenderTranslucentPolygonalGeometry(vtkViewport* ) override {return 0;};
+ int RenderOverlay(vtkViewport* viewport) override;
//@}
/**
* Does this prop have some translucent polygonal geometry?
*/
- int HasTranslucentPolygonalGeometry() VTK_OVERRIDE;
+ int HasTranslucentPolygonalGeometry() override;
protected:
vtkLegendBoxActor();
- ~vtkLegendBoxActor() VTK_OVERRIDE;
+ ~vtkLegendBoxActor() override;
void InitializeEntries();
diff --git a/Rendering/Annotation/vtkLegendScaleActor.h b/Rendering/Annotation/vtkLegendScaleActor.h
index 583caea7db6d47df00b3734207e647955fc571b1..9a1fd256cb17f5fb778e9ea9e7fc10cdd7fbd092 100644
--- a/Rendering/Annotation/vtkLegendScaleActor.h
+++ b/Rendering/Annotation/vtkLegendScaleActor.h
@@ -63,7 +63,7 @@ public:
* Standard methods for the class.
*/
vtkTypeMacro(vtkLegendScaleActor,vtkProp);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
enum AttributeLocation
@@ -204,15 +204,15 @@ public:
* Standard methods supporting the rendering process.
*/
virtual void BuildRepresentation(vtkViewport *viewport);
- void GetActors2D(vtkPropCollection*) VTK_OVERRIDE;
- void ReleaseGraphicsResources(vtkWindow*) VTK_OVERRIDE;
- int RenderOverlay(vtkViewport*) VTK_OVERRIDE;
- int RenderOpaqueGeometry(vtkViewport*) VTK_OVERRIDE;
+ void GetActors2D(vtkPropCollection*) override;
+ void ReleaseGraphicsResources(vtkWindow*) override;
+ int RenderOverlay(vtkViewport*) override;
+ int RenderOpaqueGeometry(vtkViewport*) override;
//@}
protected:
vtkLegendScaleActor();
- ~vtkLegendScaleActor() VTK_OVERRIDE;
+ ~vtkLegendScaleActor() override;
int LabelMode;
int RightBorderOffset;
diff --git a/Rendering/Annotation/vtkParallelCoordinatesActor.h b/Rendering/Annotation/vtkParallelCoordinatesActor.h
index d7aea62dad0838059ba82b95e8627f139167dd16..84ef49a0b05370ff02925cc2c15885caf8d32626 100644
--- a/Rendering/Annotation/vtkParallelCoordinatesActor.h
+++ b/Rendering/Annotation/vtkParallelCoordinatesActor.h
@@ -79,7 +79,7 @@ class VTKRENDERINGANNOTATION_EXPORT vtkParallelCoordinatesActor : public vtkActo
{
public:
vtkTypeMacro(vtkParallelCoordinatesActor,vtkActor2D);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Instantiate object with autorange computation;
@@ -149,15 +149,15 @@ public:
/**
* Draw the parallel coordinates plot.
*/
- int RenderOpaqueGeometry(vtkViewport*) VTK_OVERRIDE;
- int RenderOverlay(vtkViewport*) VTK_OVERRIDE;
- int RenderTranslucentPolygonalGeometry(vtkViewport *) VTK_OVERRIDE {return 0;}
+ int RenderOpaqueGeometry(vtkViewport*) override;
+ int RenderOverlay(vtkViewport*) override;
+ int RenderTranslucentPolygonalGeometry(vtkViewport *) override {return 0;}
//@}
/**
* Does this prop have some translucent polygonal geometry?
*/
- int HasTranslucentPolygonalGeometry() VTK_OVERRIDE;
+ int HasTranslucentPolygonalGeometry() override;
/**
* Set the input to the parallel coordinates actor. Creates
@@ -181,11 +181,11 @@ public:
* The parameter window could be used to determine which graphic
* resources to release.
*/
- void ReleaseGraphicsResources(vtkWindow *) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *) override;
protected:
vtkParallelCoordinatesActor();
- ~vtkParallelCoordinatesActor() VTK_OVERRIDE;
+ ~vtkParallelCoordinatesActor() override;
private:
diff --git a/Rendering/Annotation/vtkPieChartActor.h b/Rendering/Annotation/vtkPieChartActor.h
index d6f83ec41e14522267a9bd5c415ee25e3717f660..427a429c18ddae8e1010c94d931f80aa31985a4d 100644
--- a/Rendering/Annotation/vtkPieChartActor.h
+++ b/Rendering/Annotation/vtkPieChartActor.h
@@ -57,7 +57,7 @@ public:
* Standard methods for type information and printing.
*/
vtkTypeMacro(vtkPieChartActor,vtkActor2D);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
@@ -167,26 +167,26 @@ public:
/**
* Draw the pie plot.
*/
- int RenderOverlay(vtkViewport*) VTK_OVERRIDE;
- int RenderOpaqueGeometry(vtkViewport*) VTK_OVERRIDE;
- int RenderTranslucentPolygonalGeometry(vtkViewport* ) VTK_OVERRIDE {return 0;}
+ int RenderOverlay(vtkViewport*) override;
+ int RenderOpaqueGeometry(vtkViewport*) override;
+ int RenderTranslucentPolygonalGeometry(vtkViewport* ) override {return 0;}
//@}
/**
* Does this prop have some translucent polygonal geometry?
*/
- int HasTranslucentPolygonalGeometry() VTK_OVERRIDE;
+ int HasTranslucentPolygonalGeometry() override;
/**
* Release any graphics resources that are being consumed by this actor.
* The parameter window could be used to determine which graphic
* resources to release.
*/
- void ReleaseGraphicsResources(vtkWindow *) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *) override;
protected:
vtkPieChartActor();
- ~vtkPieChartActor() VTK_OVERRIDE;
+ ~vtkPieChartActor() override;
private:
diff --git a/Rendering/Annotation/vtkPolarAxesActor.h b/Rendering/Annotation/vtkPolarAxesActor.h
index 31a0b6468ffe6ce6b8a4c084b987840def6596fb..83c5ce3f03516acc75f4421d89ccc27af481c5ba 100644
--- a/Rendering/Annotation/vtkPolarAxesActor.h
+++ b/Rendering/Annotation/vtkPolarAxesActor.h
@@ -55,7 +55,7 @@ class VTKRENDERINGANNOTATION_EXPORT vtkPolarAxesActor : public vtkActor
{
public:
vtkTypeMacro(vtkPolarAxesActor, vtkActor);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Instantiate object with label format "6.3g" and the number of labels
@@ -67,9 +67,9 @@ public:
/**
* Draw the polar axes
*/
- int RenderOpaqueGeometry(vtkViewport*) VTK_OVERRIDE;
- int RenderOverlay(vtkViewport*) VTK_OVERRIDE;
- int RenderTranslucentPolygonalGeometry(vtkViewport*) VTK_OVERRIDE { return 0; };
+ int RenderOpaqueGeometry(vtkViewport*) override;
+ int RenderOverlay(vtkViewport*) override;
+ int RenderTranslucentPolygonalGeometry(vtkViewport*) override { return 0; };
//@}
//@{
@@ -253,7 +253,7 @@ public:
* The parameter window could be used to determine which graphic
* resources to release.
*/
- void ReleaseGraphicsResources(vtkWindow*) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow*) override;
//@{
/**
@@ -678,7 +678,7 @@ public:
* sure that the min's are less than the max's.
*/
vtkSetVector6Macro(Bounds, double);
- double* GetBounds() VTK_OVERRIDE;
+ double* GetBounds() override;
void GetBounds(
double& xmin, double& xmax, double& ymin, double& ymax, double& zmin, double& zmax);
void GetBounds(double bounds[6]);
@@ -694,7 +694,7 @@ public:
protected:
vtkPolarAxesActor();
- ~vtkPolarAxesActor() VTK_OVERRIDE;
+ ~vtkPolarAxesActor() override;
/**
* Check consistency of vtkPolarAxesActor members.
diff --git a/Rendering/Annotation/vtkProp3DAxisFollower.h b/Rendering/Annotation/vtkProp3DAxisFollower.h
index a19265015898ae40645df1aec33f0781b6bed6f1..16b4f4951e5f7e1711ae20bf0f25c6421c855a92 100644
--- a/Rendering/Annotation/vtkProp3DAxisFollower.h
+++ b/Rendering/Annotation/vtkProp3DAxisFollower.h
@@ -50,7 +50,7 @@ class VTKRENDERINGANNOTATION_EXPORT vtkProp3DAxisFollower
* Standard VTK methods for type and printing.
*/
vtkTypeMacro(vtkProp3DAxisFollower,vtkProp3DFollower);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -133,12 +133,12 @@ class VTKRENDERINGANNOTATION_EXPORT vtkProp3DAxisFollower
* Generate the matrix based on ivars. This method overloads its superclasses
* ComputeMatrix() method due to the special vtkProp3DAxisFollower matrix operations.
*/
- void ComputeMatrix() VTK_OVERRIDE;
+ void ComputeMatrix() override;
/**
* Shallow copy of a follower. Overloads the virtual vtkProp method.
*/
- void ShallowCopy(vtkProp *prop) VTK_OVERRIDE;
+ void ShallowCopy(vtkProp *prop) override;
/**
* Calculate scale factor to maintain same size of a object
@@ -153,9 +153,9 @@ class VTKRENDERINGANNOTATION_EXPORT vtkProp3DAxisFollower
* property, texture map and then mapper. If a property hasn't been
* assigned, then the actor will create one automatically.
*/
- int RenderOpaqueGeometry(vtkViewport *viewport) VTK_OVERRIDE;
- int RenderTranslucentPolygonalGeometry(vtkViewport *viewport) VTK_OVERRIDE;
- int RenderVolumetricGeometry(vtkViewport *viewport) VTK_OVERRIDE;
+ int RenderOpaqueGeometry(vtkViewport *viewport) override;
+ int RenderTranslucentPolygonalGeometry(vtkViewport *viewport) override;
+ int RenderVolumetricGeometry(vtkViewport *viewport) override;
//@}
virtual void SetViewport(vtkViewport* viewport);
@@ -163,7 +163,7 @@ class VTKRENDERINGANNOTATION_EXPORT vtkProp3DAxisFollower
protected:
vtkProp3DAxisFollower();
- ~vtkProp3DAxisFollower() VTK_OVERRIDE;
+ ~vtkProp3DAxisFollower() override;
void CalculateOrthogonalVectors(double Rx[3], double Ry[3], double Rz[3],
vtkAxisActor *axis1, double *dop,
diff --git a/Rendering/Annotation/vtkScalarBarActor.h b/Rendering/Annotation/vtkScalarBarActor.h
index 83f920a0addb1734a038aa6fe3c2dc9ef951092a..375c616fb7b63c04bd45c7954039d291c7d3b62b 100644
--- a/Rendering/Annotation/vtkScalarBarActor.h
+++ b/Rendering/Annotation/vtkScalarBarActor.h
@@ -78,7 +78,7 @@ class VTKRENDERINGANNOTATION_EXPORT vtkScalarBarActor : public vtkActor2D
{
public:
vtkTypeMacro(vtkScalarBarActor, vtkActor2D);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Instantiate object with 64 maximum colors; 5 labels; %%-#6.3g label
@@ -91,22 +91,22 @@ public:
/**
* Draw the scalar bar and annotation text to the screen.
*/
- int RenderOpaqueGeometry(vtkViewport* viewport) VTK_OVERRIDE;
- int RenderTranslucentPolygonalGeometry(vtkViewport*) VTK_OVERRIDE { return 0; };
- int RenderOverlay(vtkViewport* viewport) VTK_OVERRIDE;
+ int RenderOpaqueGeometry(vtkViewport* viewport) override;
+ int RenderTranslucentPolygonalGeometry(vtkViewport*) override { return 0; };
+ int RenderOverlay(vtkViewport* viewport) override;
//@}
/**
* Does this prop have some translucent polygonal geometry?
*/
- int HasTranslucentPolygonalGeometry() VTK_OVERRIDE;
+ int HasTranslucentPolygonalGeometry() override;
/**
* Release any graphics resources that are being consumed by this actor.
* The parameter window could be used to determine which graphic
* resources to release.
*/
- void ReleaseGraphicsResources(vtkWindow*) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow*) override;
/**
* Fills rect with the dimensions of the scalar bar in viewport coordinates.
@@ -220,7 +220,7 @@ public:
/**
* Shallow copy of a scalar bar actor. Overloads the virtual vtkProp method.
*/
- void ShallowCopy(vtkProp* prop) VTK_OVERRIDE;
+ void ShallowCopy(vtkProp* prop) override;
//@{
/**
@@ -482,7 +482,7 @@ public:
protected:
vtkScalarBarActor();
- ~vtkScalarBarActor() VTK_OVERRIDE;
+ ~vtkScalarBarActor() override;
/**
* Called from within \a RenderOpaqueGeometry when the internal state
diff --git a/Rendering/Annotation/vtkSpiderPlotActor.h b/Rendering/Annotation/vtkSpiderPlotActor.h
index 991473557880a77983076d88a7cea2146e5d156c..cc3e0e05875439074785a47b35bccd57eeaf3a51 100644
--- a/Rendering/Annotation/vtkSpiderPlotActor.h
+++ b/Rendering/Annotation/vtkSpiderPlotActor.h
@@ -77,7 +77,7 @@ public:
* Standard methods for type information and printing.
*/
vtkTypeMacro(vtkSpiderPlotActor,vtkActor2D);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
@@ -218,26 +218,26 @@ public:
/**
* Draw the spider plot.
*/
- int RenderOverlay(vtkViewport*) VTK_OVERRIDE;
- int RenderOpaqueGeometry(vtkViewport*) VTK_OVERRIDE;
- int RenderTranslucentPolygonalGeometry(vtkViewport* ) VTK_OVERRIDE {return 0;}
+ int RenderOverlay(vtkViewport*) override;
+ int RenderOpaqueGeometry(vtkViewport*) override;
+ int RenderTranslucentPolygonalGeometry(vtkViewport* ) override {return 0;}
//@}
/**
* Does this prop have some translucent polygonal geometry?
*/
- int HasTranslucentPolygonalGeometry() VTK_OVERRIDE;
+ int HasTranslucentPolygonalGeometry() override;
/**
* Release any graphics resources that are being consumed by this actor.
* The parameter window could be used to determine which graphic
* resources to release.
*/
- void ReleaseGraphicsResources(vtkWindow *) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *) override;
protected:
vtkSpiderPlotActor();
- ~vtkSpiderPlotActor() VTK_OVERRIDE;
+ ~vtkSpiderPlotActor() override;
private:
diff --git a/Rendering/Annotation/vtkXYPlotActor.h b/Rendering/Annotation/vtkXYPlotActor.h
index 79dd8330a301ea5640db5c858aa8c0745612d35e..d66bc0d3cb86cd28c2f7aa09e033fdd8ff9a6307 100644
--- a/Rendering/Annotation/vtkXYPlotActor.h
+++ b/Rendering/Annotation/vtkXYPlotActor.h
@@ -128,7 +128,7 @@ class VTKRENDERINGANNOTATION_EXPORT vtkXYPlotActor : public vtkActor2D
{
public:
vtkTypeMacro(vtkXYPlotActor,vtkActor2D);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Instantiate object with autorange computation; bold, italic, and shadows
@@ -718,7 +718,7 @@ enum Alignment {
/**
* Take into account the modified time of internal helper classes.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
/**
* Write the XY Ploat Actor as a CSV (comma separated value) representation.
@@ -731,22 +731,22 @@ enum Alignment {
* DO NOT USE THIS METHOD OUTSIDE OF THE RENDERING PROCESS.
* Draw the x-y plot.
*/
- int RenderOpaqueGeometry(vtkViewport*) VTK_OVERRIDE;
- int RenderOverlay(vtkViewport*) VTK_OVERRIDE;
- int RenderTranslucentPolygonalGeometry(vtkViewport *) VTK_OVERRIDE {return 0;}
+ int RenderOpaqueGeometry(vtkViewport*) override;
+ int RenderOverlay(vtkViewport*) override;
+ int RenderTranslucentPolygonalGeometry(vtkViewport *) override {return 0;}
//@}
/**
* Does this prop have some translucent polygonal geometry?
*/
- int HasTranslucentPolygonalGeometry() VTK_OVERRIDE;
+ int HasTranslucentPolygonalGeometry() override;
/**
* Release any graphics resources that are being consumed by this actor.
* The parameter window could be used to determine which graphic
* resources to release.
*/
- void ReleaseGraphicsResources(vtkWindow *) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *) override;
//@{
/**
@@ -848,7 +848,7 @@ enum Alignment {
protected:
vtkXYPlotActor();
- ~vtkXYPlotActor() VTK_OVERRIDE;
+ ~vtkXYPlotActor() override;
vtkXYPlotActorConnections* InputConnectionHolder;
char** SelectedInputScalars; // list of data set arrays to plot
diff --git a/Rendering/Context2D/Testing/Cxx/TestContext2D.cxx b/Rendering/Context2D/Testing/Cxx/TestContext2D.cxx
index cb24c93242137ac078476c1f10dc9eb0aaca4cf2..44055d593c1c49de0830ee1d8cbcc772e6538a8c 100644
--- a/Rendering/Context2D/Testing/Cxx/TestContext2D.cxx
+++ b/Rendering/Context2D/Testing/Cxx/TestContext2D.cxx
@@ -38,7 +38,7 @@ public:
static ContextItem *New();
vtkTypeMacro(ContextItem, vtkContextItem);
- bool Paint(vtkContext2D* painter) VTK_OVERRIDE;
+ bool Paint(vtkContext2D* painter) override;
bool Succeeded;
};
diff --git a/Rendering/Context2D/vtkAbstractContextBufferId.h b/Rendering/Context2D/vtkAbstractContextBufferId.h
index a7194fc4a307f1e4a50b64e9dad4180dcc7f99a2..ab3eea2a23cccd77f02b46ee8a699c339ebff00f 100644
--- a/Rendering/Context2D/vtkAbstractContextBufferId.h
+++ b/Rendering/Context2D/vtkAbstractContextBufferId.h
@@ -47,7 +47,7 @@ class VTKRENDERINGCONTEXT2D_EXPORT vtkAbstractContextBufferId : public vtkObject
{
public:
vtkTypeMacro(vtkAbstractContextBufferId, vtkObject);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
static vtkAbstractContextBufferId * New();
@@ -131,7 +131,7 @@ public:
protected:
vtkAbstractContextBufferId();
- ~vtkAbstractContextBufferId() VTK_OVERRIDE;
+ ~vtkAbstractContextBufferId() override;
int Width;
int Height;
diff --git a/Rendering/Context2D/vtkAbstractContextItem.h b/Rendering/Context2D/vtkAbstractContextItem.h
index 7a769d2aedc8aab8470967b42074bba8bf9f0f98..f264372e86f5b3814c548d18bd29ebde9c5f0e5d 100644
--- a/Rendering/Context2D/vtkAbstractContextItem.h
+++ b/Rendering/Context2D/vtkAbstractContextItem.h
@@ -41,7 +41,7 @@ class VTKRENDERINGCONTEXT2D_EXPORT vtkAbstractContextItem : public vtkObject
{
public:
vtkTypeMacro(vtkAbstractContextItem, vtkObject);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
/**
* Perform any updates to the item that may be necessary before rendering.
@@ -290,7 +290,7 @@ public:
protected:
vtkAbstractContextItem();
- ~vtkAbstractContextItem() VTK_OVERRIDE;
+ ~vtkAbstractContextItem() override;
/**
* Point to the scene the item is on - can be null.
diff --git a/Rendering/Context2D/vtkBlockItem.h b/Rendering/Context2D/vtkBlockItem.h
index 0b7345366b96ab0bb4990cb477d13231d4746c4b..443758b0e230e69727e07575757b30445695967d 100644
--- a/Rendering/Context2D/vtkBlockItem.h
+++ b/Rendering/Context2D/vtkBlockItem.h
@@ -35,44 +35,44 @@ class VTKRENDERINGCONTEXT2D_EXPORT vtkBlockItem : public vtkContextItem
{
public:
vtkTypeMacro(vtkBlockItem, vtkContextItem);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
static vtkBlockItem *New();
/**
* Paint event for the item.
*/
- bool Paint(vtkContext2D *painter) VTK_OVERRIDE;
+ bool Paint(vtkContext2D *painter) override;
/**
* Returns 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 enter event.
*/
- bool MouseEnterEvent(const vtkContextMouseEvent &mouse) VTK_OVERRIDE;
+ bool MouseEnterEvent(const vtkContextMouseEvent &mouse) override;
/**
* Mouse move event.
*/
- bool MouseMoveEvent(const vtkContextMouseEvent &mouse) VTK_OVERRIDE;
+ bool MouseMoveEvent(const vtkContextMouseEvent &mouse) override;
/**
* Mouse leave event.
*/
- bool MouseLeaveEvent(const vtkContextMouseEvent &mouse) VTK_OVERRIDE;
+ bool MouseLeaveEvent(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 block label.
@@ -108,7 +108,7 @@ public:
protected:
vtkBlockItem();
- ~vtkBlockItem() VTK_OVERRIDE;
+ ~vtkBlockItem() override;
float Dimensions[4];
diff --git a/Rendering/Context2D/vtkBrush.h b/Rendering/Context2D/vtkBrush.h
index 1218a844f8f030c7f35af9df213bd0f39313ec98..29e8fa7c94eecd6c63bed5f115d0363d8b8dfc76 100644
--- a/Rendering/Context2D/vtkBrush.h
+++ b/Rendering/Context2D/vtkBrush.h
@@ -38,7 +38,7 @@ class VTKRENDERINGCONTEXT2D_EXPORT vtkBrush : public vtkObject
{
public:
vtkTypeMacro(vtkBrush, vtkObject);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
static vtkBrush *New();
@@ -174,7 +174,7 @@ public:
protected:
vtkBrush();
- ~vtkBrush() VTK_OVERRIDE;
+ ~vtkBrush() override;
// Storage of the color in RGBA format (0-255 per channel).
unsigned char* Color;
diff --git a/Rendering/Context2D/vtkContext2D.h b/Rendering/Context2D/vtkContext2D.h
index d0af1f0b387530c2d362303c9c940f502c59b60e..72134102cb6a890d92937923feac594c1fa0ff11 100644
--- a/Rendering/Context2D/vtkContext2D.h
+++ b/Rendering/Context2D/vtkContext2D.h
@@ -53,7 +53,7 @@ class VTKRENDERINGCONTEXT2D_EXPORT vtkContext2D : public vtkObject
{
public:
vtkTypeMacro(vtkContext2D, vtkObject);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
/**
* Creates a 2D Painter object.
@@ -550,7 +550,7 @@ public:
protected:
vtkContext2D();
- ~vtkContext2D() VTK_OVERRIDE;
+ ~vtkContext2D() override;
vtkContextDevice2D *Device; // The underlying device
vtkTransform2D *Transform; // Current transform
diff --git a/Rendering/Context2D/vtkContext3D.h b/Rendering/Context2D/vtkContext3D.h
index c405b5641cee442fa8147c2ac326535406c32d57..5896cde58f2cc08ee34c8ab15a7310e94a0d480a 100644
--- a/Rendering/Context2D/vtkContext3D.h
+++ b/Rendering/Context2D/vtkContext3D.h
@@ -41,7 +41,7 @@ class VTKRENDERINGCONTEXT2D_EXPORT vtkContext3D : public vtkObject
{
public:
vtkTypeMacro(vtkContext3D, vtkObject);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
/**
* Creates a 3D context object.
@@ -158,7 +158,7 @@ public:
protected:
vtkContext3D();
- ~vtkContext3D() VTK_OVERRIDE;
+ ~vtkContext3D() override;
vtkSmartPointer<vtkContextDevice3D> Device; // The underlying device
vtkSmartPointer<vtkTransform> Transform; // Current transform
diff --git a/Rendering/Context2D/vtkContextActor.h b/Rendering/Context2D/vtkContextActor.h
index 600374a52f2ffc9c48469a0bb30998750766ca94..e4cf5554c9529b95c62433b6c94f2b3568c099e7 100644
--- a/Rendering/Context2D/vtkContextActor.h
+++ b/Rendering/Context2D/vtkContextActor.h
@@ -37,7 +37,7 @@ class vtkContextScene;
class VTKRENDERINGCONTEXT2D_EXPORT vtkContextActor : public vtkProp
{
public:
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
vtkTypeMacro(vtkContextActor,vtkProp);
static vtkContextActor* New();
@@ -45,7 +45,7 @@ public:
/**
* We only render in the overlay for the context scene.
*/
- int RenderOverlay(vtkViewport *viewport) VTK_OVERRIDE;
+ int RenderOverlay(vtkViewport *viewport) override;
//@{
/**
@@ -78,11 +78,11 @@ public:
* The parameter window could be used to determine which graphic
* resources to release.
*/
- void ReleaseGraphicsResources(vtkWindow *window) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *window) override;
protected:
vtkContextActor();
- ~vtkContextActor() VTK_OVERRIDE;
+ ~vtkContextActor() override;
/**
* Initialize the actor - right now we just decide which device to initialize.
diff --git a/Rendering/Context2D/vtkContextClip.h b/Rendering/Context2D/vtkContextClip.h
index bc31661f4bfc7884195d27f7c906c79f5b815083..9be3b8f34f81db348ab9af696d12aeb529b9eb62 100644
--- a/Rendering/Context2D/vtkContextClip.h
+++ b/Rendering/Context2D/vtkContextClip.h
@@ -34,7 +34,7 @@ class VTKRENDERINGCONTEXT2D_EXPORT vtkContextClip : public vtkAbstractContextIte
{
public:
vtkTypeMacro(vtkContextClip, vtkAbstractContextItem);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
/**
* Creates a vtkContextClip object.
@@ -46,12 +46,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 item, called whenever the item needs to be drawn.
*/
- bool Paint(vtkContext2D *painter) VTK_OVERRIDE;
+ bool Paint(vtkContext2D *painter) override;
/**
* Set the origin, width and height of the clipping rectangle. These are in
@@ -70,7 +70,7 @@ public:
protected:
vtkContextClip();
- ~vtkContextClip() VTK_OVERRIDE;
+ ~vtkContextClip() override;
float Dims[4];
diff --git a/Rendering/Context2D/vtkContextDevice2D.h b/Rendering/Context2D/vtkContextDevice2D.h
index 7958c1d3471681c7ca2fbbffb7aacc362c4de4da..66d9af7f8b09d53998fa220df22449c9c31cdb64 100644
--- a/Rendering/Context2D/vtkContextDevice2D.h
+++ b/Rendering/Context2D/vtkContextDevice2D.h
@@ -51,7 +51,7 @@ class VTKRENDERINGCONTEXT2D_EXPORT vtkContextDevice2D : public vtkObject
{
public:
vtkTypeMacro(vtkContextDevice2D, vtkObject);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
static vtkContextDevice2D * New();
@@ -408,7 +408,7 @@ public:
protected:
vtkContextDevice2D();
- ~vtkContextDevice2D() VTK_OVERRIDE;
+ ~vtkContextDevice2D() override;
/**
* Store the width and height of the device in pixels.
diff --git a/Rendering/Context2D/vtkContextDevice3D.h b/Rendering/Context2D/vtkContextDevice3D.h
index 395cb8a77439f41d31097c2230cf59af19366e1a..afd102394ed41d1b0852a8545ea5ddbfc42779a8 100644
--- a/Rendering/Context2D/vtkContextDevice3D.h
+++ b/Rendering/Context2D/vtkContextDevice3D.h
@@ -42,7 +42,7 @@ class VTKRENDERINGCONTEXT2D_EXPORT vtkContextDevice3D : public vtkObject
{
public:
vtkTypeMacro(vtkContextDevice3D, vtkObject);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
static vtkContextDevice3D * New();
@@ -138,7 +138,7 @@ public:
protected:
vtkContextDevice3D();
- ~vtkContextDevice3D() VTK_OVERRIDE;
+ ~vtkContextDevice3D() override;
private:
vtkContextDevice3D(const vtkContextDevice3D &) VTK_DELETE_FUNCTION;
diff --git a/Rendering/Context2D/vtkContextItem.h b/Rendering/Context2D/vtkContextItem.h
index 4992716aea34fd8664f3585a97ad6e80e9eb2705..6637f69c168fc4dc5bcbc40f2819cfcd59f09508 100644
--- a/Rendering/Context2D/vtkContextItem.h
+++ b/Rendering/Context2D/vtkContextItem.h
@@ -32,7 +32,7 @@ class VTKRENDERINGCONTEXT2D_EXPORT vtkContextItem : public vtkAbstractContextIte
{
public:
vtkTypeMacro(vtkContextItem, vtkAbstractContextItem);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
//@{
/**
@@ -51,7 +51,7 @@ public:
protected:
vtkContextItem();
- ~vtkContextItem() VTK_OVERRIDE;
+ ~vtkContextItem() override;
double Opacity;
diff --git a/Rendering/Context2D/vtkContextMapper2D.h b/Rendering/Context2D/vtkContextMapper2D.h
index 6bdcd0dbea543cc9f01dcec9c73d5d14d52c0d88..c5c5f8196d60c30bdefe529ae410b50b806625b4 100644
--- a/Rendering/Context2D/vtkContextMapper2D.h
+++ b/Rendering/Context2D/vtkContextMapper2D.h
@@ -38,7 +38,7 @@ class VTKRENDERINGCONTEXT2D_EXPORT vtkContextMapper2D : public vtkAlgorithm
{
public:
vtkTypeMacro(vtkContextMapper2D, vtkAlgorithm);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
static vtkContextMapper2D *New();
//@{
@@ -66,12 +66,12 @@ public:
protected:
vtkContextMapper2D();
- ~vtkContextMapper2D() VTK_OVERRIDE;
+ ~vtkContextMapper2D() override;
/**
* Specify the types of input we can handle.
*/
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
private:
vtkContextMapper2D(const vtkContextMapper2D &) VTK_DELETE_FUNCTION;
diff --git a/Rendering/Context2D/vtkContextScene.h b/Rendering/Context2D/vtkContextScene.h
index 8e5cf67f49bff821692611024cb1163b097b06b4..1a8aba7096826d742db63f562a53b3b6dcb98057 100644
--- a/Rendering/Context2D/vtkContextScene.h
+++ b/Rendering/Context2D/vtkContextScene.h
@@ -48,7 +48,7 @@ class VTKRENDERINGCONTEXT2D_EXPORT vtkContextScene : public vtkObject
{
public:
vtkTypeMacro(vtkContextScene, vtkObject);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
/**
* Creates a 2D Painter object.
@@ -241,7 +241,7 @@ public:
protected:
vtkContextScene();
- ~vtkContextScene() VTK_OVERRIDE;
+ ~vtkContextScene() override;
/**
* Process a rubber band selection event.
diff --git a/Rendering/Context2D/vtkContextTransform.h b/Rendering/Context2D/vtkContextTransform.h
index 4000c0814b38958624daa9048349ef7d845b5662..259c9834f22ca328e1c35063e2adfc729a75d8d2 100644
--- a/Rendering/Context2D/vtkContextTransform.h
+++ b/Rendering/Context2D/vtkContextTransform.h
@@ -37,7 +37,7 @@ class VTKRENDERINGCONTEXT2D_EXPORT vtkContextTransform : public vtkAbstractConte
{
public:
vtkTypeMacro(vtkContextTransform, vtkAbstractContextItem);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
/**
* Creates a vtkContextTransform object.
@@ -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 item, called whenever the item needs to be drawn.
*/
- bool Paint(vtkContext2D *painter) VTK_OVERRIDE;
+ bool Paint(vtkContext2D *painter) override;
/**
* Reset the transform to the identity transformation.
@@ -86,12 +86,12 @@ public:
/**
* Transforms a point to the parent coordinate system.
*/
- vtkVector2f MapToParent(const vtkVector2f& point) VTK_OVERRIDE;
+ vtkVector2f MapToParent(const vtkVector2f& point) override;
/**
* Transforms a point from the parent coordinate system.
*/
- vtkVector2f MapFromParent(const vtkVector2f& point) VTK_OVERRIDE;
+ vtkVector2f MapFromParent(const vtkVector2f& point) override;
//@{
/**
@@ -186,26 +186,26 @@ public:
/**
* Returns true if the transform is interactive, false otherwise.
*/
- bool Hit(const vtkContextMouseEvent &mouse) VTK_OVERRIDE;
+ bool Hit(const vtkContextMouseEvent &mouse) override;
/**
* Mouse press event. Keep track of zoom anchor position.
*/
- bool MouseButtonPressEvent(const vtkContextMouseEvent &mouse) VTK_OVERRIDE;
+ bool MouseButtonPressEvent(const vtkContextMouseEvent &mouse) override;
/**
* Mouse move event. Perform pan or zoom as specified by the mouse bindings.
*/
- bool MouseMoveEvent(const vtkContextMouseEvent &mouse) VTK_OVERRIDE;
+ bool MouseMoveEvent(const vtkContextMouseEvent &mouse) override;
/**
* Mouse wheel event. Perform pan or zoom as specified by mouse bindings.
*/
- bool MouseWheelEvent(const vtkContextMouseEvent &mouse, int delta) VTK_OVERRIDE;
+ bool MouseWheelEvent(const vtkContextMouseEvent &mouse, int delta) override;
protected:
vtkContextTransform();
- ~vtkContextTransform() VTK_OVERRIDE;
+ ~vtkContextTransform() override;
vtkSmartPointer<vtkTransform2D> Transform;
diff --git a/Rendering/Context2D/vtkImageItem.h b/Rendering/Context2D/vtkImageItem.h
index 7e4edd01249751b8b6f9fd8701ed75d6058b8cd0..ba8c4e5825a54b1763fcb2b1be0ad5aa1056ae2e 100644
--- a/Rendering/Context2D/vtkImageItem.h
+++ b/Rendering/Context2D/vtkImageItem.h
@@ -35,14 +35,14 @@ class VTKRENDERINGCONTEXT2D_EXPORT vtkImageItem : public vtkContextItem
{
public:
vtkTypeMacro(vtkImageItem, vtkContextItem);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
static vtkImageItem *New();
/**
* Paint event for the item.
*/
- bool Paint(vtkContext2D *painter) VTK_OVERRIDE;
+ bool Paint(vtkContext2D *painter) override;
/**
* Set the image of the item.
@@ -72,7 +72,7 @@ public:
protected:
vtkImageItem();
- ~vtkImageItem() VTK_OVERRIDE;
+ ~vtkImageItem() override;
float Position[2];
diff --git a/Rendering/Context2D/vtkMarkerUtilities.h b/Rendering/Context2D/vtkMarkerUtilities.h
index c80f89de77977953d30f36f28c35513b6331fb09..dcdd4f6d0c0a100ab6568ac4ac5cba364165cdab 100644
--- a/Rendering/Context2D/vtkMarkerUtilities.h
+++ b/Rendering/Context2D/vtkMarkerUtilities.h
@@ -38,7 +38,7 @@ class VTKRENDERINGCONTEXT2D_EXPORT vtkMarkerUtilities : public vtkObject
{
public:
vtkTypeMacro(vtkMarkerUtilities, vtkObject);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
/**
* Enum containing various marker styles that can be used in a plot.
@@ -59,7 +59,7 @@ public:
protected:
vtkMarkerUtilities();
- ~vtkMarkerUtilities() VTK_OVERRIDE;
+ ~vtkMarkerUtilities() override;
private:
vtkMarkerUtilities(const vtkMarkerUtilities &) VTK_DELETE_FUNCTION;
diff --git a/Rendering/Context2D/vtkPen.h b/Rendering/Context2D/vtkPen.h
index ff3b450cebca9c37c361367046eaf657f4452d66..ad857ca138e5a27836e19a8e42f46c5522d0394c 100644
--- a/Rendering/Context2D/vtkPen.h
+++ b/Rendering/Context2D/vtkPen.h
@@ -37,7 +37,7 @@ class VTKRENDERINGCONTEXT2D_EXPORT vtkPen : public vtkObject
{
public:
vtkTypeMacro(vtkPen, vtkObject);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
static vtkPen *New();
@@ -155,7 +155,7 @@ public:
protected:
vtkPen();
- ~vtkPen() VTK_OVERRIDE;
+ ~vtkPen() override;
//@{
/**
diff --git a/Rendering/Context2D/vtkPolyDataItem.h b/Rendering/Context2D/vtkPolyDataItem.h
index 1442600904005d6f4700c95f260747cac27985bb..6cf06d78e2a4d136258c86efe271f54ab76e40ef 100644
--- a/Rendering/Context2D/vtkPolyDataItem.h
+++ b/Rendering/Context2D/vtkPolyDataItem.h
@@ -35,14 +35,14 @@ class VTKRENDERINGCONTEXT2D_EXPORT vtkPolyDataItem : public vtkContextItem
{
public:
vtkTypeMacro(vtkPolyDataItem, vtkContextItem);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkPolyDataItem *New();
/**
* Paint event for the item.
*/
- bool Paint(vtkContext2D* painter) VTK_OVERRIDE;
+ bool Paint(vtkContext2D* painter) override;
/**
* Set the PolyData of the item.
@@ -72,7 +72,7 @@ public:
protected:
vtkPolyDataItem();
- ~vtkPolyDataItem() VTK_OVERRIDE;
+ ~vtkPolyDataItem() override;
float Position[2];
diff --git a/Rendering/Context2D/vtkPropItem.h b/Rendering/Context2D/vtkPropItem.h
index 95a3fdd82c4e224ea009aa733ed27a421fde601c..a751589c003d6e34361f31280e9c89e3741b4a8c 100644
--- a/Rendering/Context2D/vtkPropItem.h
+++ b/Rendering/Context2D/vtkPropItem.h
@@ -36,10 +36,10 @@ class VTKRENDERINGCONTEXT2D_EXPORT vtkPropItem: public vtkAbstractContextItem
public:
static vtkPropItem *New();
vtkTypeMacro(vtkPropItem, vtkAbstractContextItem)
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
- bool Paint(vtkContext2D *painter) VTK_OVERRIDE;
- void ReleaseGraphicsResources() VTK_OVERRIDE;
+ bool Paint(vtkContext2D *painter) override;
+ void ReleaseGraphicsResources() override;
/**
* The actor to render.
@@ -49,7 +49,7 @@ public:
protected:
vtkPropItem();
- ~vtkPropItem() VTK_OVERRIDE;
+ ~vtkPropItem() override;
// Sync the active vtkCamera with the GL state set by the painter.
virtual void UpdateTransforms();
diff --git a/Rendering/Context2D/vtkTooltipItem.h b/Rendering/Context2D/vtkTooltipItem.h
index 70a578ec61070022a023bf6b107ea2c1ec329c66..adc050ed58610e77b0c603f1f7390e7a6deb44cd 100644
--- a/Rendering/Context2D/vtkTooltipItem.h
+++ b/Rendering/Context2D/vtkTooltipItem.h
@@ -40,7 +40,7 @@ class VTKRENDERINGCONTEXT2D_EXPORT vtkTooltipItem : public vtkContextItem
{
public:
vtkTypeMacro(vtkTooltipItem, vtkContextItem);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
/**
* Creates a 2D Chart object.
@@ -96,16 +96,16 @@ public:
/**
* Update the geometry of the tooltip.
*/
- void Update() VTK_OVERRIDE;
+ void Update() override;
/**
* Paint event for the tooltip.
*/
- bool Paint(vtkContext2D *painter) VTK_OVERRIDE;
+ bool Paint(vtkContext2D *painter) override;
protected:
vtkTooltipItem();
- ~vtkTooltipItem() VTK_OVERRIDE;
+ ~vtkTooltipItem() override;
vtkVector2f PositionVector;
float* Position;
diff --git a/Rendering/ContextOpenGL/vtkOpenGL2ContextDevice2D.h b/Rendering/ContextOpenGL/vtkOpenGL2ContextDevice2D.h
index e61d412351f7d2dd1a0e92cc7abaabc7da855559..7123dd6df6cf24e887bac6243ca5168edaa0744c 100644
--- a/Rendering/ContextOpenGL/vtkOpenGL2ContextDevice2D.h
+++ b/Rendering/ContextOpenGL/vtkOpenGL2ContextDevice2D.h
@@ -41,7 +41,7 @@ class VTKRENDERINGCONTEXTOPENGL_EXPORT vtkOpenGL2ContextDevice2D :
{
public:
vtkTypeMacro(vtkOpenGL2ContextDevice2D, vtkOpenGLContextDevice2D);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
/**
* Creates a 2D Painter object.
@@ -60,20 +60,20 @@ public:
* which has nc_comps components
*/
void DrawPointSprites(vtkImageData *sprite, float *points, int n,
- unsigned char* colors = 0, int nc_comps = 0) VTK_OVERRIDE;
+ unsigned char* colors = 0, int nc_comps = 0) override;
/**
* Draw the supplied image at the given x, y (p[0], p[1]) (bottom corner),
* scaled by scale (1.0 would match the image).
*/
- void DrawImage(float p[2], float scale, vtkImageData *image) VTK_OVERRIDE;
+ void DrawImage(float p[2], float scale, vtkImageData *image) override;
/**
* Draw the supplied image at the given position. The origin, width, and
* height are specified by the supplied vtkRectf variable pos. The image
* will be drawn scaled to that size.
*/
- void DrawImage(const vtkRectf& pos, vtkImageData *image) VTK_OVERRIDE;
+ void DrawImage(const vtkRectf& pos, vtkImageData *image) override;
/**
* Draw the supplied PolyData at the given x, y (p[0], p[1]) (bottom corner),
@@ -82,23 +82,23 @@ public:
* @warning This functionality is not supported with the legacy OpenGL backend.
*/
void DrawPolyData(float p[2], float scale, vtkPolyData* polyData,
- vtkUnsignedCharArray* colors, int scalarMode) VTK_OVERRIDE;
+ vtkUnsignedCharArray* colors, int scalarMode) override;
/**
* Release any graphics resources that are being consumed by this device.
* The parameter window could be used to determine which graphic
* resources to release.
*/
- void ReleaseGraphicsResources(vtkWindow *window) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *window) override;
protected:
vtkOpenGL2ContextDevice2D();
- ~vtkOpenGL2ContextDevice2D() VTK_OVERRIDE;
+ ~vtkOpenGL2ContextDevice2D() override;
/**
* Load the OpenGL extensions we need.
*/
- bool LoadExtensions(vtkOpenGLExtensionManager *m) VTK_OVERRIDE;
+ bool LoadExtensions(vtkOpenGLExtensionManager *m) override;
private:
vtkOpenGL2ContextDevice2D(const vtkOpenGL2ContextDevice2D &) VTK_DELETE_FUNCTION;
diff --git a/Rendering/ContextOpenGL/vtkOpenGLContextActor.h b/Rendering/ContextOpenGL/vtkOpenGLContextActor.h
index 8532c3bcb9dd9620b66fda6bd99fbfdbfc43cc99..b035f3cd90f4cc7e79810c270f7a1fd350ee703d 100644
--- a/Rendering/ContextOpenGL/vtkOpenGLContextActor.h
+++ b/Rendering/ContextOpenGL/vtkOpenGLContextActor.h
@@ -30,7 +30,7 @@
class VTKRENDERINGCONTEXTOPENGL_EXPORT vtkOpenGLContextActor : public vtkContextActor
{
public:
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
vtkTypeMacro(vtkOpenGLContextActor, vtkContextActor);
static vtkOpenGLContextActor* New();
@@ -40,16 +40,16 @@ public:
* The parameter window could be used to determine which graphic
* resources to release.
*/
- void ReleaseGraphicsResources(vtkWindow *window) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *window) override;
protected:
vtkOpenGLContextActor();
- ~vtkOpenGLContextActor() VTK_OVERRIDE;
+ ~vtkOpenGLContextActor() override;
/**
* Initialize the actor - right now we just decide which device to initialize.
*/
- void Initialize(vtkViewport* viewport) VTK_OVERRIDE;
+ void Initialize(vtkViewport* viewport) override;
private:
vtkOpenGLContextActor(const vtkOpenGLContextActor&) VTK_DELETE_FUNCTION;
diff --git a/Rendering/ContextOpenGL/vtkOpenGLContextBufferId.h b/Rendering/ContextOpenGL/vtkOpenGLContextBufferId.h
index 3bc3ce497673e27c5a219a4847101975e143aacb..aa24625bc56dadf1f1bfed12101bf106f95ac3ad 100644
--- a/Rendering/ContextOpenGL/vtkOpenGLContextBufferId.h
+++ b/Rendering/ContextOpenGL/vtkOpenGLContextBufferId.h
@@ -35,7 +35,7 @@ class VTKRENDERINGCONTEXTOPENGL_EXPORT vtkOpenGLContextBufferId : public vtkAbst
{
public:
vtkTypeMacro(vtkOpenGLContextBufferId, vtkAbstractContextBufferId);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
/**
* Creates a 2D Painter object.
@@ -45,21 +45,21 @@ public:
/**
* Release any graphics resources that are being consumed by this object.
*/
- void ReleaseGraphicsResources() VTK_OVERRIDE;
+ void ReleaseGraphicsResources() override;
//@{
/**
* Set/Get the OpenGL context owning the texture object resource.
*/
- void SetContext(vtkRenderWindow *context) VTK_OVERRIDE;
- vtkRenderWindow *GetContext() VTK_OVERRIDE;
+ void SetContext(vtkRenderWindow *context) override;
+ vtkRenderWindow *GetContext() override;
//@}
/**
* Returns if the context supports the required extensions.
* \pre context_is_set: this->GetContext()!=0
*/
- bool IsSupported() VTK_OVERRIDE;
+ bool IsSupported() override;
/**
* Allocate the memory for at least Width*Height elements.
@@ -67,12 +67,12 @@ public:
* \pre positive_height: GetHeight()>0
* \pre context_is_set: this->GetContext()!=0
*/
- void Allocate() VTK_OVERRIDE;
+ void Allocate() override;
/**
* Tell if the buffer has been allocated.
*/
- bool IsAllocated() const VTK_OVERRIDE;
+ bool IsAllocated() const override;
/**
* Copy the contents of the current read buffer to the internal texture
@@ -80,7 +80,7 @@ public:
* \pre is_allocated: this->IsAllocated()
*/
void SetValues(int srcXmin,
- int srcYmin) VTK_OVERRIDE;
+ int srcYmin) override;
/**
* Return item under abscissa x and ordinate y.
@@ -90,11 +90,11 @@ public:
* \pre is_allocated: IsAllocated()
* \post valid_result: result>=-1
*/
- vtkIdType GetPickedItem(int x, int y) VTK_OVERRIDE;
+ vtkIdType GetPickedItem(int x, int y) override;
protected:
vtkOpenGLContextBufferId();
- ~vtkOpenGLContextBufferId() VTK_OVERRIDE;
+ ~vtkOpenGLContextBufferId() override;
vtkOpenGLRenderWindow *Context;
vtkTextureObject *Texture;
diff --git a/Rendering/ContextOpenGL/vtkOpenGLContextDevice2D.h b/Rendering/ContextOpenGL/vtkOpenGLContextDevice2D.h
index 1a1aaf51d0e5180b984fbf7c2e984692dfb567b9..932c1979d1b86973fdb37128e7da19904b173f65 100644
--- a/Rendering/ContextOpenGL/vtkOpenGLContextDevice2D.h
+++ b/Rendering/ContextOpenGL/vtkOpenGLContextDevice2D.h
@@ -46,7 +46,7 @@ class VTKRENDERINGCONTEXTOPENGL_EXPORT vtkOpenGLContextDevice2D : public vtkCont
{
public:
vtkTypeMacro(vtkOpenGLContextDevice2D, vtkContextDevice2D);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
/**
* Creates a 2D Painter object.
@@ -60,7 +60,7 @@ public:
* \sa DrawLines()
*/
void DrawPoly(float *f, int n, unsigned char *colors = 0,
- int nc_comps = 0) VTK_OVERRIDE;
+ int nc_comps = 0) override;
/**
* Draw lines using the points - memory layout is as follows:
@@ -69,7 +69,7 @@ public:
* \sa DrawPoly()
*/
void DrawLines(float *f, int n, unsigned char *colors = 0,
- int nc_comps = 0) VTK_OVERRIDE;
+ int nc_comps = 0) override;
/**
* Draw a series of points - fastest code path due to memory
@@ -77,7 +77,7 @@ public:
* which has nc_comps components.
*/
void DrawPoints(float *points, int n, unsigned char* colors = 0,
- int nc_comps = 0) VTK_OVERRIDE;
+ int nc_comps = 0) override;
/**
* Draw a series of point sprites, images centred at the points supplied.
@@ -86,7 +86,7 @@ public:
* array which has nc_comps components - this part is optional.
*/
void DrawPointSprites(vtkImageData *sprite, float *points, int n,
- unsigned char* colors = 0, int nc_comps = 0) VTK_OVERRIDE;
+ unsigned char* colors = 0, int nc_comps = 0) override;
/**
* Draw a series of markers centered at the points supplied. The \a shape
@@ -100,7 +100,7 @@ public:
* \param nc_comps is the number of components for the color.
*/
void DrawMarkers(int shape, bool highlight, float *points, int n,
- unsigned char *colors = 0, int nc_comps = 0) VTK_OVERRIDE;
+ unsigned char *colors = 0, int nc_comps = 0) override;
//@{
/**
@@ -115,17 +115,17 @@ public:
/**
* Draws a rectangle
*/
- void DrawQuad(float *points, int n) VTK_OVERRIDE;
+ void DrawQuad(float *points, int n) override;
/**
* Draws a rectangle
*/
- void DrawQuadStrip(float *points, int n) VTK_OVERRIDE;
+ void DrawQuadStrip(float *points, int n) override;
/**
* Draw a polygon using the specified number of points.
*/
- void DrawPolygon(float *, int) VTK_OVERRIDE;
+ void DrawPolygon(float *, int) override;
/**
* Draw an elliptic wedge with center at x, y, outer radii outRx, outRy,
@@ -140,7 +140,7 @@ public:
*/
void DrawEllipseWedge(float x, float y, float outRx, float outRy,
float inRx, float inRy, float startAngle,
- float stopAngle) VTK_OVERRIDE;
+ float stopAngle) override;
/**
* Draw an elliptic arc with center at x,y with radii rX and rY between
@@ -149,13 +149,13 @@ public:
* \pre positive_rY: rY>=0
*/
void DrawEllipticArc(float x, float y, float rX, float rY,
- float startAngle, float stopAngle) VTK_OVERRIDE;
+ float startAngle, float stopAngle) override;
/**
* Draw some text to the screen!
*/
- void DrawString(float *point, const vtkStdString &string) VTK_OVERRIDE;
+ void DrawString(float *point, const vtkStdString &string) override;
/**
* Compute the bounds of the supplied string. The bounds will be copied to the
@@ -166,12 +166,12 @@ public:
* NOTE: This function does not take account of the text rotation.
*/
void ComputeStringBounds(const vtkStdString &string,
- float bounds[4]) VTK_OVERRIDE;
+ float bounds[4]) override;
/**
* Draw some text to the screen.
*/
- void DrawString(float *point, const vtkUnicodeString &string) VTK_OVERRIDE;
+ void DrawString(float *point, const vtkUnicodeString &string) override;
/**
* Compute the bounds of the supplied string. The bounds will be copied to the
@@ -182,33 +182,33 @@ public:
* NOTE: This function does not take account of the text rotation.
*/
void ComputeStringBounds(const vtkUnicodeString &string,
- float bounds[4]) VTK_OVERRIDE;
+ float bounds[4]) override;
/**
* Compute the bounds of the supplied string while taking into account the
* justification of the currently applied text property. Simple rotations
* (0, 90, 180, 270 degrees) are also propertly taken into account.
*/
- void ComputeJustifiedStringBounds(const char* string, float bounds[4]) VTK_OVERRIDE;
+ void ComputeJustifiedStringBounds(const char* string, float bounds[4]) override;
/**
* Draw text using MathText markup for mathematical equations. See
* http://matplotlib.sourceforge.net/users/mathtext.html for more information.
*/
- void DrawMathTextString(float point[2], const vtkStdString &string) VTK_OVERRIDE;
+ void DrawMathTextString(float point[2], const vtkStdString &string) override;
/**
* Draw the supplied image at the given x, y (p[0], p[1]) (bottom corner),
* scaled by scale (1.0 would match the image).
*/
- void DrawImage(float p[2], float scale, vtkImageData *image) VTK_OVERRIDE;
+ void DrawImage(float p[2], float scale, vtkImageData *image) override;
/**
* Draw the supplied image at the given position. The origin, width, and
* height are specified by the supplied vtkRectf variable pos. The image
* will be drawn scaled to that size.
*/
- void DrawImage(const vtkRectf& pos, vtkImageData *image) VTK_OVERRIDE;
+ void DrawImage(const vtkRectf& pos, vtkImageData *image) override;
/**
* Draw the supplied PolyData at the given x, y (p[0], p[1]) (bottom corner),
@@ -217,12 +217,12 @@ public:
* @warning This functionality is not supported with the legacy OpenGL backend.
*/
void DrawPolyData(float p[2], float scale, vtkPolyData* polyData,
- vtkUnsignedCharArray* colors, int scalarMode) VTK_OVERRIDE;
+ vtkUnsignedCharArray* colors, int scalarMode) override;
/**
* Set the color for the device using unsigned char of length 4, RGBA.
*/
- void SetColor4(unsigned char color[4]) VTK_OVERRIDE;
+ void SetColor4(unsigned char color[4]) override;
/**
* Set the color for the device using unsigned char of length 3, RGB.
@@ -232,68 +232,68 @@ public:
/**
* Set the texture for the device, it is used to fill the polygons
*/
- void SetTexture(vtkImageData* image, int properties = 0) VTK_OVERRIDE;
+ void SetTexture(vtkImageData* image, int properties = 0) override;
/**
* Set the point size for glyphs/sprites.
*/
- void SetPointSize(float size) VTK_OVERRIDE;
+ void SetPointSize(float size) override;
/**
* Set the line width for glyphs/sprites.
*/
- void SetLineWidth(float width) VTK_OVERRIDE;
+ void SetLineWidth(float width) override;
/**
* Set the line type type (using anonymous enum in vtkPen).
*/
- void SetLineType(int type) VTK_OVERRIDE;
+ void SetLineType(int type) override;
/**
* Multiply the current model view matrix by the supplied one.
*/
- void MultiplyMatrix(vtkMatrix3x3 *m) VTK_OVERRIDE;
+ void MultiplyMatrix(vtkMatrix3x3 *m) override;
/**
* Set the model view matrix for the display
*/
- void SetMatrix(vtkMatrix3x3 *m) VTK_OVERRIDE;
+ void SetMatrix(vtkMatrix3x3 *m) override;
/**
* Set the model view matrix for the display
*/
- void GetMatrix(vtkMatrix3x3 *m) VTK_OVERRIDE;
+ void GetMatrix(vtkMatrix3x3 *m) override;
/**
* Push the current matrix onto the stack.
*/
- void PushMatrix() VTK_OVERRIDE;
+ void PushMatrix() override;
/**
* Pop the current matrix off of the stack.
*/
- void PopMatrix() VTK_OVERRIDE;
+ void PopMatrix() override;
/**
* Supply an int array of length 4 with x1, y1, width, height specifying
* clipping for the display.
*/
- void SetClipping(int *x) VTK_OVERRIDE;
+ void SetClipping(int *x) override;
/**
* Disable clipping of the display.
*/
- void EnableClipping(bool enable) VTK_OVERRIDE;
+ void EnableClipping(bool enable) override;
/**
* Begin drawing, pass in the viewport to set up the view.
*/
- void Begin(vtkViewport* viewport) VTK_OVERRIDE;
+ void Begin(vtkViewport* viewport) override;
/**
* End drawing, clean up the view.
*/
- void End() VTK_OVERRIDE;
+ void End() override;
/**
* Start BufferId creation Mode.
@@ -302,7 +302,7 @@ public:
* \pre bufferId_exists: bufferId!=0
* \post started: GetBufferIdMode()
*/
- void BufferIdModeBegin(vtkAbstractContextBufferId *bufferId) VTK_OVERRIDE;
+ void BufferIdModeBegin(vtkAbstractContextBufferId *bufferId) override;
/**
* Finalize BufferId creation Mode. It makes sure that the content of the
@@ -311,7 +311,7 @@ public:
* \pre started: GetBufferIdMode()
* \post done: !GetBufferIdMode()
*/
- void BufferIdModeEnd() VTK_OVERRIDE;
+ void BufferIdModeEnd() override;
/**
* Force the use of the freetype based render strategy. If Qt is available
@@ -347,7 +347,7 @@ public:
protected:
vtkOpenGLContextDevice2D();
- ~vtkOpenGLContextDevice2D() VTK_OVERRIDE;
+ ~vtkOpenGLContextDevice2D() override;
/**
* Factorized code called by DrawEllipseWedge() and DrawEllipticArc()
diff --git a/Rendering/ContextOpenGL/vtkOpenGLContextDevice3D.h b/Rendering/ContextOpenGL/vtkOpenGLContextDevice3D.h
index 49caa2e90f035367d5e46adbc4dacd8820bc8fc0..a2469831192d11a740dcee0284b4e4610259c911 100644
--- a/Rendering/ContextOpenGL/vtkOpenGLContextDevice3D.h
+++ b/Rendering/ContextOpenGL/vtkOpenGLContextDevice3D.h
@@ -36,7 +36,7 @@ class VTKRENDERINGCONTEXTOPENGL_EXPORT vtkOpenGLContextDevice3D : public vtkCont
{
public:
vtkTypeMacro(vtkOpenGLContextDevice3D, vtkContextDevice3D);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
static vtkOpenGLContextDevice3D * New();
@@ -44,75 +44,75 @@ public:
* Draw a polyline between the specified points.
* \sa DrawLines()
*/
- void DrawPoly(const float *verts, int n, const unsigned char *colors, int nc) VTK_OVERRIDE;
+ void DrawPoly(const float *verts, int n, const unsigned char *colors, int nc) override;
/**
* Draw lines defined by specified pair of points.
* \sa DrawPoly()
*/
- void DrawLines(const float *verts, int n, const unsigned char *colors, int nc) VTK_OVERRIDE;
+ void DrawLines(const float *verts, int n, const unsigned char *colors, int nc) override;
/**
* Draw points at the vertex positions specified.
*/
void DrawPoints(const float *verts, int n,
- const unsigned char *colors, int nc) VTK_OVERRIDE;
+ const unsigned char *colors, int nc) override;
/**
* Draw triangles to generate the specified mesh.
*/
void DrawTriangleMesh(const float *mesh, int n,
- const unsigned char *colors, int nc) VTK_OVERRIDE;
+ const unsigned char *colors, int nc) override;
/**
* Apply the supplied pen which controls the outlines of shapes, as well as
* lines, points and related primitives. This makes a deep copy of the vtkPen
* object in the vtkContext2D, it does not hold a pointer to the supplied object.
*/
- void ApplyPen(vtkPen *pen) VTK_OVERRIDE;
+ void ApplyPen(vtkPen *pen) override;
/**
* Apply the supplied brush which controls the outlines of shapes, as well as
* lines, points and related primitives. This makes a deep copy of the vtkBrush
* object in the vtkContext2D, it does not hold a pointer to the supplied object.
*/
- void ApplyBrush(vtkBrush *brush) VTK_OVERRIDE;
+ void ApplyBrush(vtkBrush *brush) override;
/**
* Set the model view matrix for the display
*/
- void SetMatrix(vtkMatrix4x4 *m) VTK_OVERRIDE;
+ void SetMatrix(vtkMatrix4x4 *m) override;
/**
* Set the model view matrix for the display
*/
- void GetMatrix(vtkMatrix4x4 *m) VTK_OVERRIDE;
+ void GetMatrix(vtkMatrix4x4 *m) override;
/**
* Multiply the current model view matrix by the supplied one
*/
- void MultiplyMatrix(vtkMatrix4x4 *m) VTK_OVERRIDE;
+ void MultiplyMatrix(vtkMatrix4x4 *m) override;
/**
* Push the current matrix onto the stack.
*/
- void PushMatrix() VTK_OVERRIDE;
+ void PushMatrix() override;
/**
* Pop the current matrix off of the stack.
*/
- void PopMatrix() VTK_OVERRIDE;
+ void PopMatrix() override;
/**
* Supply a float array of length 4 with x1, y1, width, height specifying
* clipping region for the device in pixels.
*/
- void SetClipping(const vtkRecti &rect) VTK_OVERRIDE;
+ void SetClipping(const vtkRecti &rect) override;
/**
* Enable or disable the clipping of the scene.
*/
- void EnableClipping(bool enable) VTK_OVERRIDE;
+ void EnableClipping(bool enable) override;
//@{
/**
@@ -122,13 +122,13 @@ public:
* clipping plane: Ax + By + Cz + D = 0. This is the equation format
* expected by glClipPlane.
*/
- void EnableClippingPlane(int i, double *planeEquation) VTK_OVERRIDE;
- void DisableClippingPlane(int i) VTK_OVERRIDE;
+ void EnableClippingPlane(int i, double *planeEquation) override;
+ void DisableClippingPlane(int i) override;
//@}
protected:
vtkOpenGLContextDevice3D();
- ~vtkOpenGLContextDevice3D() VTK_OVERRIDE;
+ ~vtkOpenGLContextDevice3D() override;
/**
* Begin drawing, turn on the depth buffer.
diff --git a/Rendering/ContextOpenGL/vtkOpenGLPropItem.h b/Rendering/ContextOpenGL/vtkOpenGLPropItem.h
index 50a90eb3612ba42797615986ba725ce6c48486cf..f7e96ef093a6e2d75aae4c100843788ecae80560 100644
--- a/Rendering/ContextOpenGL/vtkOpenGLPropItem.h
+++ b/Rendering/ContextOpenGL/vtkOpenGLPropItem.h
@@ -41,13 +41,13 @@ public:
protected:
vtkOpenGLPropItem();
- ~vtkOpenGLPropItem() VTK_OVERRIDE;
+ ~vtkOpenGLPropItem() override;
// Sync the active vtkCamera with the GL state set by the painter.
- void UpdateTransforms() VTK_OVERRIDE;
+ void UpdateTransforms() override;
// Restore the vtkCamera state.
- void ResetTransforms() VTK_OVERRIDE;
+ void ResetTransforms() override;
private:
vtkNew<vtkCamera> CameraCache;
diff --git a/Rendering/ContextOpenGL2/vtkOpenGLContextActor.h b/Rendering/ContextOpenGL2/vtkOpenGLContextActor.h
index a666df9e4eba14ba020dedeeb1918d74790d872f..d694dd986bff749d3d09cd2f9a0e78e43db91f05 100644
--- a/Rendering/ContextOpenGL2/vtkOpenGLContextActor.h
+++ b/Rendering/ContextOpenGL2/vtkOpenGLContextActor.h
@@ -30,7 +30,7 @@
class VTKRENDERINGCONTEXTOPENGL2_EXPORT vtkOpenGLContextActor : public vtkContextActor
{
public:
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
vtkTypeMacro(vtkOpenGLContextActor, vtkContextActor);
static vtkOpenGLContextActor* New();
@@ -40,21 +40,21 @@ public:
* The parameter window could be used to determine which graphic
* resources to release.
*/
- void ReleaseGraphicsResources(vtkWindow *window) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *window) override;
/**
* We only render in the overlay for the context scene.
*/
- int RenderOverlay(vtkViewport *viewport) VTK_OVERRIDE;
+ int RenderOverlay(vtkViewport *viewport) override;
protected:
vtkOpenGLContextActor();
- ~vtkOpenGLContextActor() VTK_OVERRIDE;
+ ~vtkOpenGLContextActor() override;
/**
* Initialize the actor - right now we just decide which device to initialize.
*/
- void Initialize(vtkViewport* viewport) VTK_OVERRIDE;
+ void Initialize(vtkViewport* viewport) override;
private:
vtkOpenGLContextActor(const vtkOpenGLContextActor&) VTK_DELETE_FUNCTION;
diff --git a/Rendering/ContextOpenGL2/vtkOpenGLContextBufferId.h b/Rendering/ContextOpenGL2/vtkOpenGLContextBufferId.h
index 1e5dc30bac253367637de9287d5b5ba1c620a8c5..aa906de11ec8ad715e3b860d90421f72b4911e30 100644
--- a/Rendering/ContextOpenGL2/vtkOpenGLContextBufferId.h
+++ b/Rendering/ContextOpenGL2/vtkOpenGLContextBufferId.h
@@ -35,7 +35,7 @@ class VTKRENDERINGCONTEXTOPENGL2_EXPORT vtkOpenGLContextBufferId : public vtkAbs
{
public:
vtkTypeMacro(vtkOpenGLContextBufferId, vtkAbstractContextBufferId);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
/**
* Creates a 2D Painter object.
@@ -45,21 +45,21 @@ public:
/**
* Release any graphics resources that are being consumed by this object.
*/
- void ReleaseGraphicsResources() VTK_OVERRIDE;
+ void ReleaseGraphicsResources() override;
//@{
/**
* Set/Get the OpenGL context owning the texture object resource.
*/
- void SetContext(vtkRenderWindow *context) VTK_OVERRIDE;
- vtkRenderWindow *GetContext() VTK_OVERRIDE;
+ void SetContext(vtkRenderWindow *context) override;
+ vtkRenderWindow *GetContext() override;
//@}
/**
* Returns if the context supports the required extensions.
* \pre context_is_set: this->GetContext()!=0
*/
- bool IsSupported() VTK_OVERRIDE;
+ bool IsSupported() override;
/**
* Allocate the memory for at least Width*Height elements.
@@ -67,12 +67,12 @@ public:
* \pre positive_height: GetHeight()>0
* \pre context_is_set: this->GetContext()!=0
*/
- void Allocate() VTK_OVERRIDE;
+ void Allocate() override;
/**
* Tell if the buffer has been allocated.
*/
- bool IsAllocated() const VTK_OVERRIDE;
+ bool IsAllocated() const override;
/**
* Copy the contents of the current read buffer to the internal texture
@@ -80,7 +80,7 @@ public:
* \pre is_allocated: this->IsAllocated()
*/
void SetValues(int srcXmin,
- int srcYmin) VTK_OVERRIDE;
+ int srcYmin) override;
/**
* Return item under abscissa x and ordinate y.
@@ -90,11 +90,11 @@ public:
* \pre is_allocated: IsAllocated()
* \post valid_result: result>=-1
*/
- vtkIdType GetPickedItem(int x, int y) VTK_OVERRIDE;
+ vtkIdType GetPickedItem(int x, int y) override;
protected:
vtkOpenGLContextBufferId();
- ~vtkOpenGLContextBufferId() VTK_OVERRIDE;
+ ~vtkOpenGLContextBufferId() override;
vtkOpenGLRenderWindow *Context;
vtkTextureObject *Texture;
diff --git a/Rendering/ContextOpenGL2/vtkOpenGLContextDevice2D.h b/Rendering/ContextOpenGL2/vtkOpenGLContextDevice2D.h
index d4a639f6f8ff292555c05cf0d6016096c7aa4f73..066ed780a3f20485db569b4d25feab942024c0b0 100644
--- a/Rendering/ContextOpenGL2/vtkOpenGLContextDevice2D.h
+++ b/Rendering/ContextOpenGL2/vtkOpenGLContextDevice2D.h
@@ -52,7 +52,7 @@ class VTKRENDERINGCONTEXTOPENGL2_EXPORT vtkOpenGLContextDevice2D : public vtkCon
{
public:
vtkTypeMacro(vtkOpenGLContextDevice2D, vtkContextDevice2D);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
/**
* Creates a 2D Painter object.
@@ -65,7 +65,7 @@ public:
* which has nc_comps components
*/
void DrawPoly(float *f, int n, unsigned char *colors = nullptr,
- int nc_comps = 0) VTK_OVERRIDE;
+ int nc_comps = 0) override;
/**
* Draw lines using the points - memory layout is as follows:
@@ -74,7 +74,7 @@ public:
* \sa DrawPoly()
*/
void DrawLines(float *f, int n, unsigned char *colors = nullptr,
- int nc_comps = 0) VTK_OVERRIDE;
+ int nc_comps = 0) override;
/**
* Draw a series of points - fastest code path due to memory
@@ -82,7 +82,7 @@ public:
* which has nc_comps components
*/
void DrawPoints(float *points, int n, unsigned char* colors = nullptr,
- int nc_comps = 0) VTK_OVERRIDE;
+ int nc_comps = 0) override;
/**
* Draw a series of point sprites, images centred at the points supplied.
@@ -91,7 +91,7 @@ public:
* array which has nc_comps components - this part is optional.
*/
void DrawPointSprites(vtkImageData *sprite, float *points, int n,
- unsigned char* colors = nullptr, int nc_comps = 0) VTK_OVERRIDE;
+ unsigned char* colors = nullptr, int nc_comps = 0) override;
/**
* Draw a series of markers centered at the points supplied. The \a shape
@@ -105,7 +105,7 @@ public:
* \param nc_comps is the number of components for the color.
*/
void DrawMarkers(int shape, bool highlight, float *points, int n,
- unsigned char *colors = nullptr, int nc_comps = 0) VTK_OVERRIDE;
+ unsigned char *colors = nullptr, int nc_comps = 0) override;
//@{
/**
@@ -120,20 +120,20 @@ public:
/**
* Draws a rectangle
*/
- void DrawQuad(float *points, int n) VTK_OVERRIDE;
+ void DrawQuad(float *points, int n) override;
/**
* Draws a rectangle
*/
- void DrawQuadStrip(float *points, int n) VTK_OVERRIDE;
+ void DrawQuadStrip(float *points, int n) override;
/**
* Draw a polygon using the specified number of points.
*/
- void DrawPolygon(float *, int) VTK_OVERRIDE;
+ void DrawPolygon(float *, int) override;
void DrawColoredPolygon(float *points, int numPoints,
unsigned char *colors = nullptr,
- int nc_comps = 0) VTK_OVERRIDE;
+ int nc_comps = 0) override;
/**
* Draw an elliptic wedge with center at x, y, outer radii outRx, outRy,
@@ -148,7 +148,7 @@ public:
*/
void DrawEllipseWedge(float x, float y, float outRx, float outRy,
float inRx, float inRy, float startAngle,
- float stopAngle) VTK_OVERRIDE;
+ float stopAngle) override;
/**
* Draw an elliptic arc with center at x,y with radii rX and rY between
@@ -157,13 +157,13 @@ public:
* \pre positive_rY: rY>=0
*/
void DrawEllipticArc(float x, float y, float rX, float rY,
- float startAngle, float stopAngle) VTK_OVERRIDE;
+ float startAngle, float stopAngle) override;
/**
* Draw some text to the screen!
*/
- void DrawString(float *point, const vtkStdString &string) VTK_OVERRIDE;
+ void DrawString(float *point, const vtkStdString &string) override;
/**
* Compute the bounds of the supplied string. The bounds will be copied to the
@@ -174,12 +174,12 @@ public:
* NOTE: This function does not take account of the text rotation.
*/
void ComputeStringBounds(const vtkStdString &string,
- float bounds[4]) VTK_OVERRIDE;
+ float bounds[4]) override;
/**
* Draw some text to the screen.
*/
- void DrawString(float *point, const vtkUnicodeString &string) VTK_OVERRIDE;
+ void DrawString(float *point, const vtkUnicodeString &string) override;
/**
* Compute the bounds of the supplied string. The bounds will be copied to the
@@ -190,45 +190,45 @@ public:
* NOTE: This function does not take account of the text rotation.
*/
void ComputeStringBounds(const vtkUnicodeString &string,
- float bounds[4]) VTK_OVERRIDE;
+ float bounds[4]) override;
/**
* Compute the bounds of the supplied string while taking into account the
* justification of the currently applied text property. Simple rotations
* (0, 90, 180, 270 degrees) are also propertly taken into account.
*/
- void ComputeJustifiedStringBounds(const char* string, float bounds[4]) VTK_OVERRIDE;
+ void ComputeJustifiedStringBounds(const char* string, float bounds[4]) override;
/**
* Draw text using MathText markup for mathematical equations. See
* http://matplotlib.sourceforge.net/users/mathtext.html for more information.
*/
- void DrawMathTextString(float point[2], const vtkStdString &string) VTK_OVERRIDE;
+ void DrawMathTextString(float point[2], const vtkStdString &string) override;
/**
* Draw the supplied image at the given x, y (p[0], p[1]) (bottom corner),
* scaled by scale (1.0 would match the image).
*/
- void DrawImage(float p[2], float scale, vtkImageData *image) VTK_OVERRIDE;
+ void DrawImage(float p[2], float scale, vtkImageData *image) override;
/**
* Draw the supplied image at the given position. The origin, width, and
* height are specified by the supplied vtkRectf variable pos. The image
* will be drawn scaled to that size.
*/
- void DrawImage(const vtkRectf& pos, vtkImageData *image) VTK_OVERRIDE;
+ void DrawImage(const vtkRectf& pos, vtkImageData *image) override;
/**
* Draw the supplied PolyData at the given x, y (p[0], p[1]) (bottom corner),
* scaled by scale (1.0 would match the actual dataset).
*/
void DrawPolyData(float p[2], float scale, vtkPolyData* polyData,
- vtkUnsignedCharArray* colors, int scalarMode) VTK_OVERRIDE;
+ vtkUnsignedCharArray* colors, int scalarMode) override;
/**
* Set the color for the device using unsigned char of length 4, RGBA.
*/
- void SetColor4(unsigned char color[4]) VTK_OVERRIDE;
+ void SetColor4(unsigned char color[4]) override;
/**
* Set the color for the device using unsigned char of length 3, RGB.
@@ -238,68 +238,68 @@ public:
/**
* Set the texture for the device, it is used to fill the polygons
*/
- void SetTexture(vtkImageData* image, int properties = 0) VTK_OVERRIDE;
+ void SetTexture(vtkImageData* image, int properties = 0) override;
/**
* Set the point size for glyphs/sprites.
*/
- void SetPointSize(float size) VTK_OVERRIDE;
+ void SetPointSize(float size) override;
/**
* Set the line width for glyphs/sprites.
*/
- void SetLineWidth(float width) VTK_OVERRIDE;
+ void SetLineWidth(float width) override;
/**
* Set the line type type (using anonymous enum in vtkPen).
*/
- void SetLineType(int type) VTK_OVERRIDE;
+ void SetLineType(int type) override;
/**
* Multiply the current model view matrix by the supplied one.
*/
- void MultiplyMatrix(vtkMatrix3x3 *m) VTK_OVERRIDE;
+ void MultiplyMatrix(vtkMatrix3x3 *m) override;
/**
* Set the model view matrix for the display
*/
- void SetMatrix(vtkMatrix3x3 *m) VTK_OVERRIDE;
+ void SetMatrix(vtkMatrix3x3 *m) override;
/**
* Set the model view matrix for the display
*/
- void GetMatrix(vtkMatrix3x3 *m) VTK_OVERRIDE;
+ void GetMatrix(vtkMatrix3x3 *m) override;
/**
* Push the current matrix onto the stack.
*/
- void PushMatrix() VTK_OVERRIDE;
+ void PushMatrix() override;
/**
* Pop the current matrix off of the stack.
*/
- void PopMatrix() VTK_OVERRIDE;
+ void PopMatrix() override;
/**
* Supply an int array of length 4 with x1, y1, x2, y2 specifying clipping
* for the display.
*/
- void SetClipping(int *x) VTK_OVERRIDE;
+ void SetClipping(int *x) override;
/**
* Disable clipping of the display.
*/
- void EnableClipping(bool enable) VTK_OVERRIDE;
+ void EnableClipping(bool enable) override;
/**
* Begin drawing, pass in the viewport to set up the view.
*/
- void Begin(vtkViewport* viewport) VTK_OVERRIDE;
+ void Begin(vtkViewport* viewport) override;
/**
* End drawing, clean up the view.
*/
- void End() VTK_OVERRIDE;
+ void End() override;
/**
* Start BufferId creation Mode.
@@ -308,7 +308,7 @@ public:
* \pre bufferId_exists: bufferId!=0
* \post started: GetBufferIdMode()
*/
- void BufferIdModeBegin(vtkAbstractContextBufferId *bufferId) VTK_OVERRIDE;
+ void BufferIdModeBegin(vtkAbstractContextBufferId *bufferId) override;
/**
* Finalize BufferId creation Mode. It makes sure that the content of the
@@ -317,7 +317,7 @@ public:
* \pre started: GetBufferIdMode()
* \post done: !GetBufferIdMode()
*/
- void BufferIdModeEnd() VTK_OVERRIDE;
+ void BufferIdModeEnd() override;
/**
* Force the use of the freetype based render strategy. If Qt is available
@@ -361,7 +361,7 @@ public:
protected:
vtkOpenGLContextDevice2D();
- ~vtkOpenGLContextDevice2D() VTK_OVERRIDE;
+ ~vtkOpenGLContextDevice2D() override;
/**
* Factorized code called by DrawEllipseWedge() and DrawEllipticArc()
diff --git a/Rendering/ContextOpenGL2/vtkOpenGLContextDevice3D.h b/Rendering/ContextOpenGL2/vtkOpenGLContextDevice3D.h
index 7374c344757daffaac1f18f36008510234eb8e45..69c9d774234e32e4ab485c8f417fec1cc1e5ce4b 100644
--- a/Rendering/ContextOpenGL2/vtkOpenGLContextDevice3D.h
+++ b/Rendering/ContextOpenGL2/vtkOpenGLContextDevice3D.h
@@ -43,82 +43,82 @@ class VTKRENDERINGCONTEXTOPENGL2_EXPORT vtkOpenGLContextDevice3D : public vtkCon
{
public:
vtkTypeMacro(vtkOpenGLContextDevice3D, vtkContextDevice3D);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
static vtkOpenGLContextDevice3D * New();
/**
* Draw a polyline between the specified points.
*/
- void DrawPoly(const float *verts, int n, const unsigned char *colors, int nc) VTK_OVERRIDE;
+ void DrawPoly(const float *verts, int n, const unsigned char *colors, int nc) override;
/**
* Draw lines defined by specified pair of points.
* \sa DrawPoly()
*/
- void DrawLines(const float *verts, int n, const unsigned char *colors, int nc) VTK_OVERRIDE;
+ void DrawLines(const float *verts, int n, const unsigned char *colors, int nc) override;
/**
* Draw points at the vertex positions specified.
*/
void DrawPoints(const float *verts, int n,
- const unsigned char *colors, int nc) VTK_OVERRIDE;
+ const unsigned char *colors, int nc) override;
/**
* Draw triangles to generate the specified mesh.
*/
void DrawTriangleMesh(const float *mesh, int n,
- const unsigned char *colors, int nc) VTK_OVERRIDE;
+ const unsigned char *colors, int nc) override;
/**
* Apply the supplied pen which controls the outlines of shapes, as well as
* lines, points and related primitives. This makes a deep copy of the vtkPen
* object in the vtkContext2D, it does not hold a pointer to the supplied object.
*/
- void ApplyPen(vtkPen *pen) VTK_OVERRIDE;
+ void ApplyPen(vtkPen *pen) override;
/**
* Apply the supplied brush which controls the outlines of shapes, as well as
* lines, points and related primitives. This makes a deep copy of the vtkBrush
* object in the vtkContext2D, it does not hold a pointer to the supplied object.
*/
- void ApplyBrush(vtkBrush *brush) VTK_OVERRIDE;
+ void ApplyBrush(vtkBrush *brush) override;
/**
* Set the model view matrix for the display
*/
- void SetMatrix(vtkMatrix4x4 *m) VTK_OVERRIDE;
+ void SetMatrix(vtkMatrix4x4 *m) override;
/**
* Set the model view matrix for the display
*/
- void GetMatrix(vtkMatrix4x4 *m) VTK_OVERRIDE;
+ void GetMatrix(vtkMatrix4x4 *m) override;
/**
* Multiply the current model view matrix by the supplied one
*/
- void MultiplyMatrix(vtkMatrix4x4 *m) VTK_OVERRIDE;
+ void MultiplyMatrix(vtkMatrix4x4 *m) override;
/**
* Push the current matrix onto the stack.
*/
- void PushMatrix() VTK_OVERRIDE;
+ void PushMatrix() override;
/**
* Pop the current matrix off of the stack.
*/
- void PopMatrix() VTK_OVERRIDE;
+ void PopMatrix() override;
/**
* Supply a float array of length 4 with x1, y1, width, height specifying
* clipping region for the device in pixels.
*/
- void SetClipping(const vtkRecti &rect) VTK_OVERRIDE;
+ void SetClipping(const vtkRecti &rect) override;
/**
* Enable or disable the clipping of the scene.
*/
- void EnableClipping(bool enable) VTK_OVERRIDE;
+ void EnableClipping(bool enable) override;
//@{
/**
@@ -128,8 +128,8 @@ public:
* clipping plane: Ax + By + Cz + D = 0. This is the equation format
* expected by glClipPlane.
*/
- void EnableClippingPlane(int i, double *planeEquation) VTK_OVERRIDE;
- void DisableClippingPlane(int i) VTK_OVERRIDE;
+ void EnableClippingPlane(int i, double *planeEquation) override;
+ void DisableClippingPlane(int i) override;
//@}
/**
@@ -144,7 +144,7 @@ public:
protected:
vtkOpenGLContextDevice3D();
- ~vtkOpenGLContextDevice3D() VTK_OVERRIDE;
+ ~vtkOpenGLContextDevice3D() override;
/**
* Begin drawing, turn on the depth buffer.
diff --git a/Rendering/ContextOpenGL2/vtkOpenGLPropItem.h b/Rendering/ContextOpenGL2/vtkOpenGLPropItem.h
index 6f742ed84c5aa9391d2923a9f5e1537f80b526b8..bec8ba3cb4689ad4e5ad269c7f5f1cb868606e8c 100644
--- a/Rendering/ContextOpenGL2/vtkOpenGLPropItem.h
+++ b/Rendering/ContextOpenGL2/vtkOpenGLPropItem.h
@@ -39,17 +39,17 @@ public:
static vtkOpenGLPropItem *New();
vtkTypeMacro(vtkOpenGLPropItem, vtkPropItem)
- bool Paint(vtkContext2D *painter) VTK_OVERRIDE;
+ bool Paint(vtkContext2D *painter) override;
protected:
vtkOpenGLPropItem();
- ~vtkOpenGLPropItem() VTK_OVERRIDE;
+ ~vtkOpenGLPropItem() override;
// Sync the active vtkCamera with the GL state set by the painter.
- void UpdateTransforms() VTK_OVERRIDE;
+ void UpdateTransforms() override;
// Restore the vtkCamera state.
- void ResetTransforms() VTK_OVERRIDE;
+ void ResetTransforms() override;
private:
vtkNew<vtkCamera> CameraCache;
diff --git a/Rendering/Core/Testing/Cxx/TestAnimationScene.cxx b/Rendering/Core/Testing/Cxx/TestAnimationScene.cxx
index 0600bc93fa61b143bf2ec4ed92acac50ee85e3b6..156ec22b339ef4f0f1dcc2894e41b1a83ce2d847 100644
--- a/Rendering/Core/Testing/Cxx/TestAnimationScene.cxx
+++ b/Rendering/Core/Testing/Cxx/TestAnimationScene.cxx
@@ -119,7 +119,7 @@ public:
void Execute(vtkObject *vtkNotUsed(caller),
unsigned long event,
- void *calldata) VTK_OVERRIDE
+ void *calldata) override
{
if(this->Animator!=nullptr && this->Renderer!=nullptr)
{
diff --git a/Rendering/Core/Testing/Cxx/TestCompositePolyDataMapper2Picking.cxx b/Rendering/Core/Testing/Cxx/TestCompositePolyDataMapper2Picking.cxx
index 449e5021f42c9e728333457f3f906601b27f2b90..9885702b16233bc715984b85f897170537a4eb02 100644
--- a/Rendering/Core/Testing/Cxx/TestCompositePolyDataMapper2Picking.cxx
+++ b/Rendering/Core/Testing/Cxx/TestCompositePolyDataMapper2Picking.cxx
@@ -68,7 +68,7 @@ public:
{
}
- ~PointPickCommand() VTK_OVERRIDE
+ ~PointPickCommand() override
{
}
@@ -126,7 +126,7 @@ public:
this->Picker = p;
}
- void Execute(vtkObject *, unsigned long, void *) VTK_OVERRIDE
+ void Execute(vtkObject *, unsigned long, void *) override
{
vtkProp3DCollection *props = this->Picker->GetProp3Ds();
if (props->GetNumberOfItems() != 0)
diff --git a/Rendering/Core/Testing/Cxx/TestFollowerPicking.cxx b/Rendering/Core/Testing/Cxx/TestFollowerPicking.cxx
index 632e945ebbdb8f824798c38309324dadb9c582f4..0f8c82ba44bf19b86232d9ba4c0f6de2f857cfba 100644
--- a/Rendering/Core/Testing/Cxx/TestFollowerPicking.cxx
+++ b/Rendering/Core/Testing/Cxx/TestFollowerPicking.cxx
@@ -50,7 +50,7 @@ class vtkPickFollowerCallback : public vtkCommand
public:
static vtkPickFollowerCallback *New()
{ return new vtkPickFollowerCallback; }
- void Execute(vtkObject *caller, unsigned long, void*) VTK_OVERRIDE
+ void Execute(vtkObject *caller, unsigned long, void*) override
{
// vtkPropPicker *picker = reinterpret_cast<vtkPropPicker*>(caller);
vtkCellPicker *picker = reinterpret_cast<vtkCellPicker*>(caller);
diff --git a/Rendering/Core/Testing/Cxx/TestGlyph3DMapperPicking.cxx b/Rendering/Core/Testing/Cxx/TestGlyph3DMapperPicking.cxx
index d348976cdf00402622c78b319f53124588daf6a2..5e03bacfd2ad4be3cb956c312acfbd2ff50c8454 100644
--- a/Rendering/Core/Testing/Cxx/TestGlyph3DMapperPicking.cxx
+++ b/Rendering/Core/Testing/Cxx/TestGlyph3DMapperPicking.cxx
@@ -57,14 +57,14 @@ public:
this->DataSet=nullptr;
}
- ~MyEndPickCommand() VTK_OVERRIDE
+ ~MyEndPickCommand() override
{
// empty
}
void Execute(vtkObject *vtkNotUsed(caller),
unsigned long vtkNotUsed(eventId),
- void *vtkNotUsed(callData)) VTK_OVERRIDE
+ void *vtkNotUsed(callData)) override
{
assert("pre: renderer_exists" && this->Renderer!=nullptr);
diff --git a/Rendering/Core/Testing/Cxx/TestInteractorTimers.cxx b/Rendering/Core/Testing/Cxx/TestInteractorTimers.cxx
index 9b4004625a3f061e410a68b4dbd76139f1bb1449..a63d267eb9f8b63968dcf0067da673721726747b 100644
--- a/Rendering/Core/Testing/Cxx/TestInteractorTimers.cxx
+++ b/Rendering/Core/Testing/Cxx/TestInteractorTimers.cxx
@@ -39,7 +39,7 @@ public:
}
void Execute(vtkObject *caller, unsigned long eventId,
- void *callData) VTK_OVERRIDE
+ void *callData) override
{
if (vtkCommand::TimerEvent == eventId)
{
diff --git a/Rendering/Core/Testing/Cxx/TestPickingManager.cxx b/Rendering/Core/Testing/Cxx/TestPickingManager.cxx
index 8841c83da32f7e72f9a102b12a6765d701f039b3..e65148651661fc3ac8d1c46052b023558e771a5f 100644
--- a/Rendering/Core/Testing/Cxx/TestPickingManager.cxx
+++ b/Rendering/Core/Testing/Cxx/TestPickingManager.cxx
@@ -103,7 +103,7 @@ class PickingManagerClient : public vtkObject
protected:
PickingManagerClient();
- ~PickingManagerClient() VTK_OVERRIDE;
+ ~PickingManagerClient() override;
private:
vtkPickingManager *PickingManager;
diff --git a/Rendering/Core/Testing/Cxx/TestPointSelection.cxx b/Rendering/Core/Testing/Cxx/TestPointSelection.cxx
index ac8b34c0877f4bc23916e7de361f3cff558a856f..f0130eeec5c7bd0137642cd2853bbe3747476115 100644
--- a/Rendering/Core/Testing/Cxx/TestPointSelection.cxx
+++ b/Rendering/Core/Testing/Cxx/TestPointSelection.cxx
@@ -51,7 +51,7 @@ public:
{
}
- ~PointPickCommand() VTK_OVERRIDE
+ ~PointPickCommand() override
{
}
@@ -104,7 +104,7 @@ public:
this->Picker = p;
}
- void Execute(vtkObject *, unsigned long, void *) VTK_OVERRIDE
+ void Execute(vtkObject *, unsigned long, void *) override
{
vtkProp3DCollection *props = this->Picker->GetProp3Ds();
if (props->GetNumberOfItems() != 0)
diff --git a/Rendering/Core/vtkAbstractInteractionDevice.h b/Rendering/Core/vtkAbstractInteractionDevice.h
index b0905dcc45ce8b7e2f7ab2629137b52e8668acc1..a570639353bd7ac4b4a2ea1a4a9744f5f0f4b54e 100644
--- a/Rendering/Core/vtkAbstractInteractionDevice.h
+++ b/Rendering/Core/vtkAbstractInteractionDevice.h
@@ -24,7 +24,7 @@ class VTKRENDERINGCORE_EXPORT vtkAbstractInteractionDevice : public vtkObject
{
public:
vtkTypeMacro(vtkAbstractInteractionDevice, vtkObject)
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* @brief Make a new device, this class is abstract and one of its derived
@@ -56,7 +56,7 @@ public:
protected:
vtkAbstractInteractionDevice();
- ~vtkAbstractInteractionDevice() VTK_OVERRIDE;
+ ~vtkAbstractInteractionDevice() override;
bool Initialized;
vtkRenderWidget *RenderWidget;
diff --git a/Rendering/Core/vtkAbstractMapper.h b/Rendering/Core/vtkAbstractMapper.h
index 1aacb8d0f10973f33390f43d4e5486663a62a8d8..a12f67b50f7735aa4ced11d2ea89f3fdd38268b7 100644
--- a/Rendering/Core/vtkAbstractMapper.h
+++ b/Rendering/Core/vtkAbstractMapper.h
@@ -53,12 +53,12 @@ class VTKRENDERINGCORE_EXPORT vtkAbstractMapper : public vtkAlgorithm
{
public:
vtkTypeMacro(vtkAbstractMapper, vtkAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Override Modifiedtime as we have added Clipping planes
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
/**
* Release any graphics resources that are being consumed by this mapper.
@@ -136,7 +136,7 @@ public:
protected:
vtkAbstractMapper();
- ~vtkAbstractMapper() VTK_OVERRIDE;
+ ~vtkAbstractMapper() override;
vtkTimerLog *Timer;
double TimeToDraw;
diff --git a/Rendering/Core/vtkAbstractMapper3D.h b/Rendering/Core/vtkAbstractMapper3D.h
index 5fa02e39c89fc0c486fe697fbabae7111fd312e7..8ffd866361a4cf17982944cfe8c2cd9075ccc672 100644
--- a/Rendering/Core/vtkAbstractMapper3D.h
+++ b/Rendering/Core/vtkAbstractMapper3D.h
@@ -43,7 +43,7 @@ class VTKRENDERINGCORE_EXPORT vtkAbstractMapper3D : public vtkAbstractMapper
{
public:
vtkTypeMacro(vtkAbstractMapper3D, vtkAbstractMapper);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Return bounding box (array of six doubles) of data expressed as
@@ -97,7 +97,7 @@ public:
protected:
vtkAbstractMapper3D();
- ~vtkAbstractMapper3D() VTK_OVERRIDE {}
+ ~vtkAbstractMapper3D() override {}
double Bounds[6];
double Center[3];
diff --git a/Rendering/Core/vtkAbstractPicker.h b/Rendering/Core/vtkAbstractPicker.h
index 10d58434c4a2b2fa4c762b898fa32b7fb3a1686e..97dae6d5bd180b6fc74931ef72ba28590807fc88 100644
--- a/Rendering/Core/vtkAbstractPicker.h
+++ b/Rendering/Core/vtkAbstractPicker.h
@@ -69,7 +69,7 @@ class VTKRENDERINGCORE_EXPORT vtkAbstractPicker : public vtkObject
{
public:
vtkTypeMacro(vtkAbstractPicker,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -159,7 +159,7 @@ public:
protected:
vtkAbstractPicker();
- ~vtkAbstractPicker() VTK_OVERRIDE;
+ ~vtkAbstractPicker() override;
virtual void Initialize();
diff --git a/Rendering/Core/vtkAbstractPropPicker.h b/Rendering/Core/vtkAbstractPropPicker.h
index 1f76e94421364181b540f955668abe6dd939973b..ecfc2dfad325b08203f5e5dcf833a8d083c0875e 100644
--- a/Rendering/Core/vtkAbstractPropPicker.h
+++ b/Rendering/Core/vtkAbstractPropPicker.h
@@ -80,7 +80,7 @@ class VTKRENDERINGCORE_EXPORT vtkAbstractPropPicker : public vtkAbstractPicker
{
public:
vtkTypeMacro(vtkAbstractPropPicker,vtkAbstractPicker);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -146,9 +146,9 @@ public:
protected:
vtkAbstractPropPicker();
- ~vtkAbstractPropPicker() VTK_OVERRIDE;
+ ~vtkAbstractPropPicker() override;
- void Initialize() VTK_OVERRIDE;
+ void Initialize() override;
vtkAssemblyPath *Path; //this is what is picked, and includes the prop
private:
diff --git a/Rendering/Core/vtkAbstractRenderDevice.h b/Rendering/Core/vtkAbstractRenderDevice.h
index f241c6a9f7894133929bd01dfc15185fbdd41fd9..5ad4fae460e3cd8a816ab12a30b2fdf8d02c2ac7 100644
--- a/Rendering/Core/vtkAbstractRenderDevice.h
+++ b/Rendering/Core/vtkAbstractRenderDevice.h
@@ -24,7 +24,7 @@ class VTKRENDERINGCORE_EXPORT vtkAbstractRenderDevice : public vtkObject
{
public:
vtkTypeMacro(vtkAbstractRenderDevice, vtkObject)
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* @brief Make a new device, this class is abstract and one of its derived
@@ -58,7 +58,7 @@ public:
protected:
vtkAbstractRenderDevice();
- ~vtkAbstractRenderDevice() VTK_OVERRIDE;
+ ~vtkAbstractRenderDevice() override;
int GLMajor;
int GLMinor;
diff --git a/Rendering/Core/vtkAbstractVolumeMapper.h b/Rendering/Core/vtkAbstractVolumeMapper.h
index 116acb8e1bf663f3460d2cfeb49bf49c66b7939a..3acaed98515fedf0a8d1573eefdaa50e1ac4f12f 100644
--- a/Rendering/Core/vtkAbstractVolumeMapper.h
+++ b/Rendering/Core/vtkAbstractVolumeMapper.h
@@ -39,7 +39,7 @@ class VTKRENDERINGCORE_EXPORT vtkAbstractVolumeMapper : public vtkAbstractMapper
{
public:
vtkTypeMacro(vtkAbstractVolumeMapper,vtkAbstractMapper3D);
- void PrintSelf( ostream& os, vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf( ostream& os, vtkIndent indent ) override;
//@{
/**
@@ -54,8 +54,8 @@ public:
* Return bounding box (array of six doubles) of data expressed as
* (xmin,xmax, ymin,ymax, zmin,zmax).
*/
- double *GetBounds() VTK_OVERRIDE;
- void GetBounds(double bounds[6]) VTK_OVERRIDE
+ double *GetBounds() override;
+ void GetBounds(double bounds[6]) override
{ this->vtkAbstractMapper3D::GetBounds(bounds); };
//@}
@@ -133,14 +133,14 @@ public:
* The parameter window could be used to determine which graphic
* resources to release.
*/
- void ReleaseGraphicsResources(vtkWindow *) VTK_OVERRIDE {}
+ void ReleaseGraphicsResources(vtkWindow *) override {}
protected:
vtkAbstractVolumeMapper();
- ~vtkAbstractVolumeMapper() VTK_OVERRIDE;
+ ~vtkAbstractVolumeMapper() override;
// see algorithm for more info
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
int ScalarMode;
char *ArrayName;
diff --git a/Rendering/Core/vtkActor.h b/Rendering/Core/vtkActor.h
index a5ebd8d94b2024d48918759a7de81a7bb2c3d493..8976078c07bced9c6b0bcd759c99674444417393 100644
--- a/Rendering/Core/vtkActor.h
+++ b/Rendering/Core/vtkActor.h
@@ -46,7 +46,7 @@ class VTKRENDERINGCORE_EXPORT vtkActor : public vtkProp3D
{
public:
vtkTypeMacro(vtkActor, vtkProp3D);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Creates an actor with the following defaults: origin(0,0,0)
@@ -60,20 +60,20 @@ public:
* able to collect all the actors or volumes. These methods
* are used in that process.
*/
- void GetActors(vtkPropCollection *) VTK_OVERRIDE;
+ void GetActors(vtkPropCollection *) override;
//@{
/**
* Support the standard render methods.
*/
- int RenderOpaqueGeometry(vtkViewport *viewport) VTK_OVERRIDE;
- int RenderTranslucentPolygonalGeometry(vtkViewport *viewport) VTK_OVERRIDE;
+ int RenderOpaqueGeometry(vtkViewport *viewport) override;
+ int RenderTranslucentPolygonalGeometry(vtkViewport *viewport) override;
//@}
/**
* Does this prop have some translucent polygonal geometry?
*/
- int HasTranslucentPolygonalGeometry() VTK_OVERRIDE;
+ int HasTranslucentPolygonalGeometry() override;
/**
* This causes the actor to be rendered. It in turn will render the actor's
@@ -86,14 +86,14 @@ public:
/**
* Shallow copy of an actor. Overloads the virtual vtkProp method.
*/
- void ShallowCopy(vtkProp *prop) VTK_OVERRIDE;
+ void ShallowCopy(vtkProp *prop) override;
/**
* Release any graphics resources that are being consumed by this actor.
* The parameter window could be used to determine which graphic
* resources to release.
*/
- void ReleaseGraphicsResources(vtkWindow *) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *) override;
//@{
/**
@@ -155,7 +155,7 @@ public:
* method GetBounds(double bounds[6]) is available from the superclass.)
*/
using Superclass::GetBounds;
- double *GetBounds() VTK_OVERRIDE;
+ double *GetBounds() override;
/**
* Apply the current properties to all parts that compose this actor.
@@ -170,7 +170,7 @@ public:
/**
* Get the actors mtime plus consider its properties and texture if set.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
/**
* Return the mtime of anything that would cause the rendered image to
@@ -178,7 +178,7 @@ public:
* prop plus anything else it depends on such as properties, textures,
* etc.
*/
- vtkMTimeType GetRedrawMTime() VTK_OVERRIDE;
+ vtkMTimeType GetRedrawMTime() override;
//@{
/**
@@ -198,11 +198,11 @@ public:
* Used by vtkHardwareSelector to determine if the prop supports hardware
* selection.
*/
- bool GetSupportsSelection() VTK_OVERRIDE;
+ bool GetSupportsSelection() override;
protected:
vtkActor();
- ~vtkActor() VTK_OVERRIDE;
+ ~vtkActor() override;
// is this actor opaque
int GetIsOpaque();
diff --git a/Rendering/Core/vtkActor2D.h b/Rendering/Core/vtkActor2D.h
index 48c2c3d441e132531315c91853a9834ee99cc6b2..14beeaa36f4f0eedef518c3e538e1be2168f5acb 100644
--- a/Rendering/Core/vtkActor2D.h
+++ b/Rendering/Core/vtkActor2D.h
@@ -39,7 +39,7 @@ class vtkProperty2D;
class VTKRENDERINGCORE_EXPORT vtkActor2D : public vtkProp
{
public:
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
vtkTypeMacro(vtkActor2D,vtkProp);
/**
@@ -53,15 +53,15 @@ public:
/**
* Support the standard render methods.
*/
- int RenderOverlay(vtkViewport *viewport) VTK_OVERRIDE;
- int RenderOpaqueGeometry(vtkViewport *viewport) VTK_OVERRIDE;
- int RenderTranslucentPolygonalGeometry(vtkViewport *viewport) VTK_OVERRIDE;
+ int RenderOverlay(vtkViewport *viewport) override;
+ int RenderOpaqueGeometry(vtkViewport *viewport) override;
+ int RenderTranslucentPolygonalGeometry(vtkViewport *viewport) override;
//@}
/**
* Does this prop have some translucent polygonal geometry?
*/
- int HasTranslucentPolygonalGeometry() VTK_OVERRIDE;
+ int HasTranslucentPolygonalGeometry() override;
//@{
/**
@@ -129,26 +129,26 @@ public:
/**
* Return this objects MTime.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
/**
* For some exporters and other other operations we must be
* able to collect all the actors or volumes. These methods
* are used in that process.
*/
- void GetActors2D(vtkPropCollection *pc) VTK_OVERRIDE;
+ void GetActors2D(vtkPropCollection *pc) override;
/**
* Shallow copy of this vtkActor2D. Overloads the virtual vtkProp method.
*/
- void ShallowCopy(vtkProp *prop) VTK_OVERRIDE;
+ void ShallowCopy(vtkProp *prop) override;
/**
* Release any graphics resources that are being consumed by this actor.
* The parameter window could be used to determine which graphic
* resources to release.
*/
- void ReleaseGraphicsResources(vtkWindow *) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *) override;
/**
* Return the actual vtkCoordinate reference that the mapper should use
@@ -168,7 +168,7 @@ public:
protected:
vtkActor2D();
- ~vtkActor2D() VTK_OVERRIDE;
+ ~vtkActor2D() override;
vtkMapper2D *Mapper;
int LayerNumber;
diff --git a/Rendering/Core/vtkActor2DCollection.h b/Rendering/Core/vtkActor2DCollection.h
index 2d4818775c4168d573e93810b963b511094440e1..4bf8261a9de332987f39d243a014a37322bf00b4 100644
--- a/Rendering/Core/vtkActor2DCollection.h
+++ b/Rendering/Core/vtkActor2DCollection.h
@@ -92,9 +92,9 @@ class VTKRENDERINGCORE_EXPORT vtkActor2DCollection : public vtkPropCollection
protected:
vtkActor2DCollection() {}
- ~vtkActor2DCollection() VTK_OVERRIDE;
+ ~vtkActor2DCollection() override;
- void DeleteElement(vtkCollectionElement *) VTK_OVERRIDE;
+ void DeleteElement(vtkCollectionElement *) override;
private:
// hide the standard AddItem from the user and the compiler.
diff --git a/Rendering/Core/vtkActorCollection.h b/Rendering/Core/vtkActorCollection.h
index cbb6865df4830e7f6d0ab441637d78988ec475f1..2d9601fc21e191ce66182e7903e66fdabefe50bb 100644
--- a/Rendering/Core/vtkActorCollection.h
+++ b/Rendering/Core/vtkActorCollection.h
@@ -38,7 +38,7 @@ class VTKRENDERINGCORE_EXPORT vtkActorCollection : public vtkPropCollection
public:
static vtkActorCollection *New();
vtkTypeMacro(vtkActorCollection,vtkPropCollection);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Add an actor to the bottom of the list.
@@ -79,7 +79,7 @@ public:
protected:
vtkActorCollection() {}
- ~vtkActorCollection() VTK_OVERRIDE {}
+ ~vtkActorCollection() override {}
private:
diff --git a/Rendering/Core/vtkAreaPicker.h b/Rendering/Core/vtkAreaPicker.h
index a53640cfc1f8ba31f7ca7210dbca55754dc82b90..c39bfc3439aa53b2b30ebd8e1599047bacdacdfe 100644
--- a/Rendering/Core/vtkAreaPicker.h
+++ b/Rendering/Core/vtkAreaPicker.h
@@ -61,7 +61,7 @@ class VTKRENDERINGCORE_EXPORT vtkAreaPicker : public vtkAbstractPropPicker
public:
static vtkAreaPicker *New();
vtkTypeMacro(vtkAreaPicker, vtkAbstractPropPicker);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Set the default screen rectangle to pick in.
@@ -90,7 +90,7 @@ public:
* This makes a thin frustum around the selected pixel.
* Note: this ignores Z in order to pick everying in a volume from z=0 to z=1.
*/
- int Pick(double x0, double y0, double vtkNotUsed(z0), vtkRenderer *renderer = nullptr) VTK_OVERRIDE
+ int Pick(double x0, double y0, double vtkNotUsed(z0), vtkRenderer *renderer = nullptr) override
{ return this->AreaPick(x0, y0, x0+1.0, y0+1.0, renderer); }
//@{
@@ -133,9 +133,9 @@ public:
protected:
vtkAreaPicker();
- ~vtkAreaPicker() VTK_OVERRIDE;
+ ~vtkAreaPicker() override;
- void Initialize() VTK_OVERRIDE;
+ void Initialize() override;
void DefineFrustum(double x0, double y0, double x1, double y1, vtkRenderer *);
virtual int PickProps(vtkRenderer *renderer);
int TypeDecipher(vtkProp *, vtkAbstractMapper3D **);
diff --git a/Rendering/Core/vtkAssembly.h b/Rendering/Core/vtkAssembly.h
index f0c49fa226d9b32171058700f5efec7477a6fb84..caf82ff22b66521f8a1d48574267311182a2e54d 100644
--- a/Rendering/Core/vtkAssembly.h
+++ b/Rendering/Core/vtkAssembly.h
@@ -72,7 +72,7 @@ public:
static vtkAssembly *New();
vtkTypeMacro(vtkAssembly, vtkProp3D);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Add a part to the list of parts.
@@ -96,8 +96,8 @@ public:
* able to collect all the actors or volumes. These methods
* are used in that process.
*/
- void GetActors(vtkPropCollection *) VTK_OVERRIDE;
- void GetVolumes(vtkPropCollection *) VTK_OVERRIDE;
+ void GetActors(vtkPropCollection *) override;
+ void GetVolumes(vtkPropCollection *) override;
//@}
//@{
@@ -109,22 +109,22 @@ public:
* assemblies; that is, assemblies that only serve to group and transform
* its parts.
*/
- int RenderOpaqueGeometry(vtkViewport *ren) VTK_OVERRIDE;
- int RenderTranslucentPolygonalGeometry(vtkViewport *ren) VTK_OVERRIDE;
- int RenderVolumetricGeometry(vtkViewport *ren) VTK_OVERRIDE;
+ int RenderOpaqueGeometry(vtkViewport *ren) override;
+ int RenderTranslucentPolygonalGeometry(vtkViewport *ren) override;
+ int RenderVolumetricGeometry(vtkViewport *ren) override;
//@}
/**
* Does this prop have some translucent polygonal geometry?
*/
- int HasTranslucentPolygonalGeometry() VTK_OVERRIDE;
+ int HasTranslucentPolygonalGeometry() override;
/**
* Release any graphics resources that are being consumed by this actor.
* The parameter window could be used to determine which graphic
* resources to release.
*/
- void ReleaseGraphicsResources(vtkWindow *) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *) override;
//@{
/**
@@ -139,9 +139,9 @@ public:
* calls to GetNextPath(). GetNextPath() returns a NULL pointer when the
* list is exhausted.
*/
- void InitPathTraversal() VTK_OVERRIDE;
- vtkAssemblyPath *GetNextPath() VTK_OVERRIDE;
- int GetNumberOfPaths() VTK_OVERRIDE;
+ void InitPathTraversal() override;
+ vtkAssemblyPath *GetNextPath() override;
+ int GetNumberOfPaths() override;
//@}
/**
@@ -149,18 +149,18 @@ public:
*/
void GetBounds(double bounds[6])
{ this->vtkProp3D::GetBounds( bounds ); }
- double *GetBounds() VTK_OVERRIDE;
+ double *GetBounds() override;
/**
* Override default GetMTime method to also consider all of the
* assembly's parts.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
/**
* Shallow copy of an assembly. Overloads the virtual vtkProp method.
*/
- void ShallowCopy(vtkProp *prop) VTK_OVERRIDE;
+ void ShallowCopy(vtkProp *prop) override;
/**
* WARNING: INTERNAL METHOD - NOT INTENDED FOR GENERAL USE DO NOT USE THIS
@@ -168,11 +168,11 @@ public:
* BuildPaths() method. Paths consist of an ordered sequence of actors,
* with transformations properly concatenated.
*/
- void BuildPaths(vtkAssemblyPaths *paths, vtkAssemblyPath *path) VTK_OVERRIDE;
+ void BuildPaths(vtkAssemblyPaths *paths, vtkAssemblyPath *path) override;
protected:
vtkAssembly();
- ~vtkAssembly() VTK_OVERRIDE;
+ ~vtkAssembly() override;
// Keep a list of direct descendants of the assembly hierarchy
vtkProp3DCollection *Parts;
diff --git a/Rendering/Core/vtkAssemblyNode.h b/Rendering/Core/vtkAssemblyNode.h
index 1875ba7e55340f6839e59318ede64d07037a7bce..a819ad2fbcf55a48c22c1910552370132a89e5e3 100644
--- a/Rendering/Core/vtkAssemblyNode.h
+++ b/Rendering/Core/vtkAssemblyNode.h
@@ -61,7 +61,7 @@ public:
static vtkAssemblyNode *New();
vtkTypeMacro(vtkAssemblyNode, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -87,11 +87,11 @@ public:
* Override the standard GetMTime() to check for the modified times
* of the prop and matrix.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
protected:
vtkAssemblyNode();
- ~vtkAssemblyNode() VTK_OVERRIDE;
+ ~vtkAssemblyNode() override;
private:
vtkProp *ViewProp; //reference to vtkProp
diff --git a/Rendering/Core/vtkAssemblyPath.h b/Rendering/Core/vtkAssemblyPath.h
index 1220054e28a105df07582521d1034282ce7a5289..ba1ade0d558a44f5edc9b870f8b66fe9a263968c 100644
--- a/Rendering/Core/vtkAssemblyPath.h
+++ b/Rendering/Core/vtkAssemblyPath.h
@@ -42,7 +42,7 @@ class VTKRENDERINGCORE_EXPORT vtkAssemblyPath : public vtkCollection
{
public:
vtkTypeMacro(vtkAssemblyPath, vtkCollection);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Instantiate empty path with identify matrix.
@@ -96,7 +96,7 @@ public:
* Override the standard GetMTime() to check for the modified times
* of the nodes in this path.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
/**
* Reentrant safe way to get an object in a collection. Just pass the
@@ -107,7 +107,7 @@ public:
protected:
vtkAssemblyPath();
- ~vtkAssemblyPath() VTK_OVERRIDE;
+ ~vtkAssemblyPath() override;
void AddNode(vtkAssemblyNode *n); //Internal method adds assembly node
vtkTransform *Transform; //Used to perform matrix concatentation
diff --git a/Rendering/Core/vtkAssemblyPaths.h b/Rendering/Core/vtkAssemblyPaths.h
index bdd763a7e97255c994b002d67b0df95d1726f161..4154083cb6d67c04046ca08ceeda90b9cbff1b22 100644
--- a/Rendering/Core/vtkAssemblyPaths.h
+++ b/Rendering/Core/vtkAssemblyPaths.h
@@ -65,7 +65,7 @@ public:
* Override the standard GetMTime() to check for the modified times
* of the paths.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
/**
* Reentrant safe way to get an object in a collection. Just pass the
@@ -76,7 +76,7 @@ public:
protected:
vtkAssemblyPaths() {}
- ~vtkAssemblyPaths() VTK_OVERRIDE {}
+ ~vtkAssemblyPaths() override {}
private:
// hide the standard AddItem from the user and the compiler.
diff --git a/Rendering/Core/vtkBackgroundColorMonitor.h b/Rendering/Core/vtkBackgroundColorMonitor.h
index de75be7d90f13c84c81512b7223a52a072f061a3..90cbf8b00838e86626dc263aa6c6ff0bb2853d20 100644
--- a/Rendering/Core/vtkBackgroundColorMonitor.h
+++ b/Rendering/Core/vtkBackgroundColorMonitor.h
@@ -42,7 +42,7 @@ class VTKRENDERINGCORE_EXPORT vtkBackgroundColorMonitor : public vtkObject
public:
static vtkBackgroundColorMonitor* New();
vtkTypeMacro(vtkBackgroundColorMonitor, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Fetches the current background color state and
@@ -61,7 +61,7 @@ public:
protected:
vtkBackgroundColorMonitor();
- ~vtkBackgroundColorMonitor() VTK_OVERRIDE{}
+ ~vtkBackgroundColorMonitor() override{}
private:
unsigned int UpTime;
diff --git a/Rendering/Core/vtkBillboardTextActor3D.h b/Rendering/Core/vtkBillboardTextActor3D.h
index 6f3a73a1cf32d5980ca2aaf55f3ad5286b1af521..cebe514f44b04bd24eb1b55c6287b86b97efe6ed 100644
--- a/Rendering/Core/vtkBillboardTextActor3D.h
+++ b/Rendering/Core/vtkBillboardTextActor3D.h
@@ -38,7 +38,7 @@ class VTKRENDERINGCORE_EXPORT vtkBillboardTextActor3D: public vtkProp3D
public:
static vtkBillboardTextActor3D* New();
vtkTypeMacro(vtkBillboardTextActor3D, vtkProp3D)
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
/**
* The UTF-8 encoded string to display.
@@ -82,21 +82,21 @@ public:
/**
* Defers to internal actor.
*/
- int HasTranslucentPolygonalGeometry() VTK_OVERRIDE;
+ int HasTranslucentPolygonalGeometry() override;
/**
* Check/update geometry/texture in opaque pass, since it only happens once.
*/
- int RenderOpaqueGeometry(vtkViewport *vp) VTK_OVERRIDE;
+ int RenderOpaqueGeometry(vtkViewport *vp) override;
/**
* Just render in translucent pass, since it can execute multiple times
* (depth peeling, for instance).
*/
- int RenderTranslucentPolygonalGeometry(vtkViewport *vp) VTK_OVERRIDE;
+ int RenderTranslucentPolygonalGeometry(vtkViewport *vp) override;
- void ReleaseGraphicsResources(vtkWindow *win) VTK_OVERRIDE;
- double *GetBounds() VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *win) override;
+ double *GetBounds() override;
using Superclass::GetBounds;
/**
@@ -107,7 +107,7 @@ public:
protected:
vtkBillboardTextActor3D();
- ~vtkBillboardTextActor3D() VTK_OVERRIDE;
+ ~vtkBillboardTextActor3D() override;
bool InputIsValid();
diff --git a/Rendering/Core/vtkCamera.cxx b/Rendering/Core/vtkCamera.cxx
index 615f15b562d132b997cc73a51fa9ab2daa723919..7aa6f2215df243328ed8f7af7c2ee22a6347b3fd 100644
--- a/Rendering/Core/vtkCamera.cxx
+++ b/Rendering/Core/vtkCamera.cxx
@@ -40,7 +40,7 @@ public:
static vtkCameraCallbackCommand *New()
{ return new vtkCameraCallbackCommand; }
vtkCamera *Self;
- void Execute(vtkObject *, unsigned long, void *) VTK_OVERRIDE
+ void Execute(vtkObject *, unsigned long, void *) override
{
if (this->Self)
{
@@ -52,7 +52,7 @@ public:
}
protected:
vtkCameraCallbackCommand() { this->Self = nullptr; }
- ~vtkCameraCallbackCommand() VTK_OVERRIDE {}
+ ~vtkCameraCallbackCommand() override {}
};
//----------------------------------------------------------------------------
diff --git a/Rendering/Core/vtkCamera.h b/Rendering/Core/vtkCamera.h
index 645d589a412aeedaa11736a9db0bf543b6b1a7ff..dff119088af64eedef88a1e2bb8916fae2ea715e 100644
--- a/Rendering/Core/vtkCamera.h
+++ b/Rendering/Core/vtkCamera.h
@@ -45,7 +45,7 @@ class VTKRENDERINGCORE_EXPORT vtkCamera : public vtkObject
{
public:
vtkTypeMacro(vtkCamera, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct camera instance with its focal point at the origin,
@@ -683,7 +683,7 @@ public:
protected:
vtkCamera();
- ~vtkCamera() VTK_OVERRIDE;
+ ~vtkCamera() override;
//@{
/**
diff --git a/Rendering/Core/vtkCameraActor.h b/Rendering/Core/vtkCameraActor.h
index 11f231d89a546f434fa0e8d7e6ec8f0c57f33fbf..ab0db7167493578ac847acc5d3c8a6e2aa013e17 100644
--- a/Rendering/Core/vtkCameraActor.h
+++ b/Rendering/Core/vtkCameraActor.h
@@ -40,7 +40,7 @@ class VTKRENDERINGCORE_EXPORT vtkCameraActor : public vtkProp3D
public:
static vtkCameraActor *New();
vtkTypeMacro(vtkCameraActor, vtkProp3D);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -62,29 +62,29 @@ public:
/**
* Support the standard render methods.
*/
- int RenderOpaqueGeometry(vtkViewport *viewport) VTK_OVERRIDE;
+ int RenderOpaqueGeometry(vtkViewport *viewport) override;
/**
* Does this prop have some translucent polygonal geometry? No.
*/
- int HasTranslucentPolygonalGeometry() VTK_OVERRIDE;
+ int HasTranslucentPolygonalGeometry() override;
/**
* Release any graphics resources that are being consumed by this actor.
* The parameter window could be used to determine which graphic
* resources to release.
*/
- void ReleaseGraphicsResources(vtkWindow *) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *) override;
/**
* Get the bounds for this Actor as (Xmin,Xmax,Ymin,Ymax,Zmin,Zmax).
*/
- double *GetBounds() VTK_OVERRIDE;
+ double *GetBounds() override;
/**
* Get the actors mtime plus consider its properties and texture if set.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
/**
* Get property of the internal actor.
@@ -98,7 +98,7 @@ public:
protected:
vtkCameraActor();
- ~vtkCameraActor() VTK_OVERRIDE;
+ ~vtkCameraActor() override;
void UpdateViewProps();
diff --git a/Rendering/Core/vtkCameraInterpolator.h b/Rendering/Core/vtkCameraInterpolator.h
index 8eafa7b7654a42c31c1cd2840dbd37ae28573438..7f62e50eff422465b71f81e0afadf972cbaafa3b 100644
--- a/Rendering/Core/vtkCameraInterpolator.h
+++ b/Rendering/Core/vtkCameraInterpolator.h
@@ -62,7 +62,7 @@ class VTKRENDERINGCORE_EXPORT vtkCameraInterpolator : public vtkObject
{
public:
vtkTypeMacro(vtkCameraInterpolator, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Instantiate the class.
@@ -209,11 +209,11 @@ public:
* Override GetMTime() because we depend on the interpolators which may be
* modified outside of this class.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
protected:
vtkCameraInterpolator();
- ~vtkCameraInterpolator() VTK_OVERRIDE;
+ ~vtkCameraInterpolator() override;
// Control the interpolation type
int InterpolationType;
diff --git a/Rendering/Core/vtkCellCenterDepthSort.h b/Rendering/Core/vtkCellCenterDepthSort.h
index e099d7fea17b753056e5923713624e7e81acac95..460b3f99a6109bd07ff9eef132b6af8d743ffe48 100644
--- a/Rendering/Core/vtkCellCenterDepthSort.h
+++ b/Rendering/Core/vtkCellCenterDepthSort.h
@@ -50,15 +50,15 @@ class VTKRENDERINGCORE_EXPORT vtkCellCenterDepthSort : public vtkVisibilitySort
{
public:
vtkTypeMacro(vtkCellCenterDepthSort, vtkVisibilitySort);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
static vtkCellCenterDepthSort *New();
- void InitTraversal() VTK_OVERRIDE;
- vtkIdTypeArray *GetNextCells() VTK_OVERRIDE;
+ void InitTraversal() override;
+ vtkIdTypeArray *GetNextCells() override;
protected:
vtkCellCenterDepthSort();
- ~vtkCellCenterDepthSort() VTK_OVERRIDE;
+ ~vtkCellCenterDepthSort() override;
vtkIdTypeArray *SortedCells;
vtkIdTypeArray *SortedCellPartition;
diff --git a/Rendering/Core/vtkCellPicker.h b/Rendering/Core/vtkCellPicker.h
index b21672b07153126babb1501744880e4fe0221497..fbdb2ede2ced6f81cb2beed3009e11a1ab8eb459 100644
--- a/Rendering/Core/vtkCellPicker.h
+++ b/Rendering/Core/vtkCellPicker.h
@@ -65,7 +65,7 @@ class VTKRENDERINGCORE_EXPORT vtkCellPicker : public vtkPicker
public:
static vtkCellPicker *New();
vtkTypeMacro(vtkCellPicker, vtkPicker);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Perform pick operation with selection point provided. Normally the
@@ -74,14 +74,14 @@ public:
* something was successfully picked.
*/
int Pick(double selectionX, double selectionY, double selectionZ,
- vtkRenderer *renderer) VTK_OVERRIDE;
+ vtkRenderer *renderer) override;
/**
* Perform pick operation with selection point provided. The
* selectionPt is in world coordinates.
* Return non-zero if something was successfully picked.
*/
- int Pick3DRay(double selectionPt[3], double orient[4], vtkRenderer *ren) VTK_OVERRIDE;
+ int Pick3DRay(double selectionPt[3], double orient[4], vtkRenderer *ren) override;
/**
* Add a locator for one of the data sets that will be included in the
@@ -251,15 +251,15 @@ public:
protected:
vtkCellPicker();
- ~vtkCellPicker() VTK_OVERRIDE;
+ ~vtkCellPicker() override;
- void Initialize() VTK_OVERRIDE;
+ void Initialize() override;
virtual void ResetPickInfo();
double IntersectWithLine(double p1[3], double p2[3], double tol,
vtkAssemblyPath *path, vtkProp3D *p,
- vtkAbstractMapper3D *m) VTK_OVERRIDE;
+ vtkAbstractMapper3D *m) override;
virtual double IntersectActorWithLine(const double p1[3], const double p2[3],
double t1, double t2, double tol,
diff --git a/Rendering/Core/vtkColorTransferFunction.h b/Rendering/Core/vtkColorTransferFunction.h
index f02994473e079f7216db36517b3e7ce0bffb19dd..37a03904dbedeb2af8e072dd6eab4f76089d00f2 100644
--- a/Rendering/Core/vtkColorTransferFunction.h
+++ b/Rendering/Core/vtkColorTransferFunction.h
@@ -55,13 +55,13 @@ class VTKRENDERINGCORE_EXPORT vtkColorTransferFunction : public vtkScalarsToColo
public:
static vtkColorTransferFunction *New();
vtkTypeMacro(vtkColorTransferFunction,vtkScalarsToColors);
- void DeepCopy( vtkScalarsToColors *f ) VTK_OVERRIDE;
+ void DeepCopy( vtkScalarsToColors *f ) override;
void ShallowCopy( vtkColorTransferFunction *f );
/**
* Print method for vtkColorTransferFunction
*/
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* How many nodes define this function?
@@ -105,7 +105,7 @@ public:
*/
double *GetColor(double x) {
return vtkScalarsToColors::GetColor(x); }
- void GetColor(double x, double rgb[3]) VTK_OVERRIDE;
+ void GetColor(double x, double rgb[3]) override;
//@{
/**
@@ -129,13 +129,13 @@ public:
/**
* Map one value through the lookup table.
*/
- unsigned char *MapValue(double v) VTK_OVERRIDE;
+ unsigned char *MapValue(double v) override;
//@{
/**
* Returns min and max position of all function points.
*/
- double* GetRange() VTK_OVERRIDE { return this->Range; }
+ double* GetRange() override { return this->Range; }
virtual void GetRange(double& arg1, double& arg2)
{
arg1 = this->Range[0];
@@ -294,7 +294,7 @@ public:
*/
void MapScalarsThroughTable2(void *input, unsigned char *output,
int inputDataType, int numberOfValues,
- int inputIncrement, int outputIncrement) VTK_OVERRIDE;
+ int inputIncrement, int outputIncrement) override;
//@{
/**
@@ -309,7 +309,7 @@ public:
/**
* Get the number of available colors for mapping to.
*/
- vtkIdType GetNumberOfAvailableColors() VTK_OVERRIDE;
+ vtkIdType GetNumberOfAvailableColors() override;
/**
* Return a color given an integer index.
@@ -317,7 +317,7 @@ public:
* This is used to assign colors to annotations (given an offset into the list of annotations).
* If there are no control points or \a idx < 0, then NanColor is returned.
*/
- void GetIndexedColor(vtkIdType idx, double rgba[4]) VTK_OVERRIDE;
+ void GetIndexedColor(vtkIdType idx, double rgba[4]) override;
/**
* Estimates the minimum size of a table such that it would correctly sample this function.
@@ -327,7 +327,7 @@ public:
protected:
vtkColorTransferFunction();
- ~vtkColorTransferFunction() VTK_OVERRIDE;
+ ~vtkColorTransferFunction() override;
vtkColorTransferFunctionInternals *Internal;
@@ -412,7 +412,7 @@ protected:
* Set the range of scalars being mapped. This method has no functionality
* in this subclass of vtkScalarsToColors.
*/
- void SetRange(double, double) VTK_OVERRIDE {}
+ void SetRange(double, double) override {}
void SetRange(double rng[2]) {this->SetRange(rng[0],rng[1]);};
/**
diff --git a/Rendering/Core/vtkCompositeDataDisplayAttributes.h b/Rendering/Core/vtkCompositeDataDisplayAttributes.h
index 81352d7cacc8a19bc67ba9beee6c25da0bc7b1cd..11e407849c301d7d57908dff1ed3d649765d12e2 100644
--- a/Rendering/Core/vtkCompositeDataDisplayAttributes.h
+++ b/Rendering/Core/vtkCompositeDataDisplayAttributes.h
@@ -41,7 +41,7 @@ class VTKRENDERINGCORE_EXPORT vtkCompositeDataDisplayAttributes : public vtkObje
public:
static vtkCompositeDataDisplayAttributes* New();
vtkTypeMacro(vtkCompositeDataDisplayAttributes, vtkObject)
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Returns true if any block has any block visibility is set.
@@ -211,7 +211,7 @@ public:
protected:
vtkCompositeDataDisplayAttributes();
- ~vtkCompositeDataDisplayAttributes() VTK_OVERRIDE;
+ ~vtkCompositeDataDisplayAttributes() override;
private:
vtkCompositeDataDisplayAttributes(const vtkCompositeDataDisplayAttributes&) VTK_DELETE_FUNCTION;
diff --git a/Rendering/Core/vtkCompositeDataDisplayAttributesLegacy.h b/Rendering/Core/vtkCompositeDataDisplayAttributesLegacy.h
index 59fe64bb4f232264894fffd1b3482412f0a65267..5035349b067ed70c7e39b85a91f51e7d2cafb84f 100644
--- a/Rendering/Core/vtkCompositeDataDisplayAttributesLegacy.h
+++ b/Rendering/Core/vtkCompositeDataDisplayAttributesLegacy.h
@@ -40,7 +40,7 @@ class VTKRENDERINGCORE_EXPORT vtkCompositeDataDisplayAttributesLegacy : public v
public:
static vtkCompositeDataDisplayAttributesLegacy* New();
vtkTypeMacro(vtkCompositeDataDisplayAttributesLegacy, vtkObject)
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Returns true if any block has any block visibility is set.
@@ -172,7 +172,7 @@ public:
protected:
vtkCompositeDataDisplayAttributesLegacy();
- ~vtkCompositeDataDisplayAttributesLegacy() VTK_OVERRIDE;
+ ~vtkCompositeDataDisplayAttributesLegacy() override;
private:
vtkCompositeDataDisplayAttributesLegacy(const vtkCompositeDataDisplayAttributesLegacy&) VTK_DELETE_FUNCTION;
diff --git a/Rendering/Core/vtkCompositePolyDataMapper.h b/Rendering/Core/vtkCompositePolyDataMapper.h
index 99a8a39987f7861a932a72b38522e3efa06d060b..d7441cb031da723357b6259dc76aaf2f69528195 100644
--- a/Rendering/Core/vtkCompositePolyDataMapper.h
+++ b/Rendering/Core/vtkCompositePolyDataMapper.h
@@ -43,42 +43,42 @@ class VTKRENDERINGCORE_EXPORT vtkCompositePolyDataMapper : public vtkMapper
public:
static vtkCompositePolyDataMapper *New();
vtkTypeMacro(vtkCompositePolyDataMapper, vtkMapper);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Standard method for rendering a mapper. This method will be
* called by the actor.
*/
- void Render(vtkRenderer *ren, vtkActor *a) VTK_OVERRIDE;
+ void Render(vtkRenderer *ren, vtkActor *a) override;
//@{
/**
* Standard vtkProp method to get 3D bounds of a 3D prop
*/
- double *GetBounds() VTK_OVERRIDE;
- void GetBounds(double bounds[6]) VTK_OVERRIDE { this->Superclass::GetBounds( bounds ); };
+ double *GetBounds() override;
+ void GetBounds(double bounds[6]) override { this->Superclass::GetBounds( bounds ); };
//@}
/**
* Release the underlying resources associated with this mapper
*/
- void ReleaseGraphicsResources(vtkWindow *) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *) override;
protected:
vtkCompositePolyDataMapper();
- ~vtkCompositePolyDataMapper() VTK_OVERRIDE;
+ ~vtkCompositePolyDataMapper() override;
/**
* We need to override this method because the standard streaming
* demand driven pipeline is not what we want - we are expecting
* hierarchical data as input
*/
- vtkExecutive* CreateDefaultExecutive() VTK_OVERRIDE;
+ vtkExecutive* CreateDefaultExecutive() override;
/**
* Need to define the type of data handled by this mapper.
*/
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
/**
* This is the build method for creating the internal polydata
diff --git a/Rendering/Core/vtkCoordinate.h b/Rendering/Core/vtkCoordinate.h
index 17ec2a1b245c4cc070f76edb5ff2f81b4a649537..0644e922c02171b4df611c6d59e621efc8406dd9 100644
--- a/Rendering/Core/vtkCoordinate.h
+++ b/Rendering/Core/vtkCoordinate.h
@@ -73,7 +73,7 @@ class VTKRENDERINGCORE_EXPORT vtkCoordinate : public vtkObject
{
public:
vtkTypeMacro(vtkCoordinate, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Creates an instance of this class with the following defaults:
@@ -171,7 +171,7 @@ public:
protected:
vtkCoordinate();
- ~vtkCoordinate() VTK_OVERRIDE;
+ ~vtkCoordinate() override;
double Value[3];
int CoordinateSystem;
diff --git a/Rendering/Core/vtkCuller.h b/Rendering/Core/vtkCuller.h
index f6e22670873ee508c08f4723eb534457da82dbc6..ff04741944ec191ed959182c34dea03cca8ad474 100644
--- a/Rendering/Core/vtkCuller.h
+++ b/Rendering/Core/vtkCuller.h
@@ -38,7 +38,7 @@ class VTKRENDERINGCORE_EXPORT vtkCuller : public vtkObject
{
public:
vtkTypeMacro(vtkCuller, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* This is called outside the render loop by vtkRenderer
@@ -48,7 +48,7 @@ public:
protected:
vtkCuller();
- ~vtkCuller() VTK_OVERRIDE;
+ ~vtkCuller() override;
private:
vtkCuller(const vtkCuller&) VTK_DELETE_FUNCTION;
diff --git a/Rendering/Core/vtkCullerCollection.h b/Rendering/Core/vtkCullerCollection.h
index 522517d49b5530127721609ef572ea447dd6f7a5..8ec86c14989513b383aded34d8a50210507c950a 100644
--- a/Rendering/Core/vtkCullerCollection.h
+++ b/Rendering/Core/vtkCullerCollection.h
@@ -36,7 +36,7 @@ class VTKRENDERINGCORE_EXPORT vtkCullerCollection : public vtkCollection
public:
static vtkCullerCollection *New();
vtkTypeMacro(vtkCullerCollection,vtkCollection);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Add an Culler to the bottom of the list.
@@ -70,7 +70,7 @@ class VTKRENDERINGCORE_EXPORT vtkCullerCollection : public vtkCollection
protected:
vtkCullerCollection() {}
- ~vtkCullerCollection() VTK_OVERRIDE {}
+ ~vtkCullerCollection() override {}
private:
// hide the standard AddItem from the user and the compiler.
diff --git a/Rendering/Core/vtkDataSetMapper.h b/Rendering/Core/vtkDataSetMapper.h
index c7de001bb1bb1137ff694e7b9b954594ca5dd942..bcf79ddf1c8679c8234596515e331eab0b506672 100644
--- a/Rendering/Core/vtkDataSetMapper.h
+++ b/Rendering/Core/vtkDataSetMapper.h
@@ -38,8 +38,8 @@ class VTKRENDERINGCORE_EXPORT vtkDataSetMapper : public vtkMapper
public:
static vtkDataSetMapper *New();
vtkTypeMacro(vtkDataSetMapper, vtkMapper);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
- void Render(vtkRenderer *ren, vtkActor *act) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
+ void Render(vtkRenderer *ren, vtkActor *act) override;
//@{
/**
@@ -53,12 +53,12 @@ public:
* The parameter window could be used to determine which graphic
* resources to release.
*/
- void ReleaseGraphicsResources(vtkWindow *) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *) override;
/**
* Get the mtime also considering the lookup table.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
//@{
/**
@@ -70,15 +70,15 @@ public:
protected:
vtkDataSetMapper();
- ~vtkDataSetMapper() VTK_OVERRIDE;
+ ~vtkDataSetMapper() override;
vtkDataSetSurfaceFilter *GeometryExtractor;
vtkPolyDataMapper *PolyDataMapper;
- void ReportReferences(vtkGarbageCollector*) VTK_OVERRIDE;
+ void ReportReferences(vtkGarbageCollector*) override;
// see algorithm for more info
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
private:
vtkDataSetMapper(const vtkDataSetMapper&) VTK_DELETE_FUNCTION;
diff --git a/Rendering/Core/vtkDiscretizableColorTransferFunction.h b/Rendering/Core/vtkDiscretizableColorTransferFunction.h
index 8fc8e7767989210c480d771c9198d2ef10a881cb..e52c3049ccf88c03f63e03c45c60f2595aeb46b5 100644
--- a/Rendering/Core/vtkDiscretizableColorTransferFunction.h
+++ b/Rendering/Core/vtkDiscretizableColorTransferFunction.h
@@ -55,12 +55,12 @@ class VTKRENDERINGCORE_EXPORT vtkDiscretizableColorTransferFunction : public vtk
public:
static vtkDiscretizableColorTransferFunction* New();
vtkTypeMacro(vtkDiscretizableColorTransferFunction, vtkColorTransferFunction);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Returns the negation of \a EnableOpacityMapping.
*/
- int IsOpaque() VTK_OVERRIDE;
+ int IsOpaque() override;
/**
* Add colors to use when \a IndexedLookup is true.
@@ -85,7 +85,7 @@ public:
* Note that implementations *must* set the opacity (alpha) component of the color, even if they
* do not provide opacity values in their colormaps. In that case, alpha = 1 should be used.
*/
- void GetIndexedColor(vtkIdType i, double rgba[4]) VTK_OVERRIDE;
+ void GetIndexedColor(vtkIdType i, double rgba[4]) override;
//@{
/**
@@ -103,7 +103,7 @@ public:
* otherwise the discretized version will be inconsistent with the
* non-discretized one.
*/
- void Build() VTK_OVERRIDE;
+ void Build() override;
//@{
/**
@@ -140,18 +140,18 @@ public:
* Map one value through the lookup table and return a color defined
* as a RGBA unsigned char tuple (4 bytes).
*/
- unsigned char *MapValue(double v) VTK_OVERRIDE;
+ unsigned char *MapValue(double v) override;
/**
* Map one value through the lookup table and return the color as
* an RGB array of doubles between 0 and 1.
*/
- void GetColor(double v, double rgb[3]) VTK_OVERRIDE;
+ void GetColor(double v, double rgb[3]) override;
/**
* Return the opacity of a given scalar.
*/
- double GetOpacity(double v) VTK_OVERRIDE;
+ double GetOpacity(double v) override;
//@{
/**
@@ -170,9 +170,9 @@ public:
* \a EnableOpacityMapping.
*/
vtkUnsignedCharArray *MapScalars(vtkDataArray *scalars, int colorMode,
- int component) VTK_OVERRIDE;
+ int component) override;
vtkUnsignedCharArray *MapScalars(vtkAbstractArray *scalars, int colorMode,
- int component) VTK_OVERRIDE;
+ int component) override;
//@}
/**
@@ -190,7 +190,7 @@ public:
* blend its opacity.
* Overridden to pass the alpha to the internal vtkLookupTable.
*/
- void SetAlpha(double alpha) VTK_OVERRIDE;
+ void SetAlpha(double alpha) override;
//@{
/**
@@ -198,8 +198,8 @@ public:
* RGB 3-tuple color of doubles in the range [0, 1].
* Overridden to pass the NanColor to the internal vtkLookupTable.
*/
- void SetNanColor(double r, double g, double b) VTK_OVERRIDE;
- void SetNanColor(double rgb[3]) VTK_OVERRIDE {
+ void SetNanColor(double r, double g, double b) override;
+ void SetNanColor(double rgb[3]) override {
this->SetNanColor(rgb[0], rgb[1], rgb[2]);
}
//@}
@@ -208,13 +208,13 @@ public:
* This should return 1 if the subclass is using log scale for
* mapping scalars to colors.
*/
- int UsingLogScale() VTK_OVERRIDE
+ int UsingLogScale() override
{ return this->UseLogScale; }
/**
* Get the number of available colors for mapping to.
*/
- vtkIdType GetNumberOfAvailableColors() VTK_OVERRIDE;
+ vtkIdType GetNumberOfAvailableColors() override;
//@{
/**
@@ -236,11 +236,11 @@ public:
/**
* Overridden to include the ScalarOpacityFunction's MTime.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
protected:
vtkDiscretizableColorTransferFunction();
- ~vtkDiscretizableColorTransferFunction() VTK_OVERRIDE;
+ ~vtkDiscretizableColorTransferFunction() override;
/**
* Flag indicating whether transfer function is discretized.
diff --git a/Rendering/Core/vtkDistanceToCamera.h b/Rendering/Core/vtkDistanceToCamera.h
index ebfc89d8d33fef8801540e32ec8dd178625adb96..44c0aa9c5631cd6aba161d01980029e1873bd335 100644
--- a/Rendering/Core/vtkDistanceToCamera.h
+++ b/Rendering/Core/vtkDistanceToCamera.h
@@ -42,7 +42,7 @@ class VTKRENDERINGCORE_EXPORT vtkDistanceToCamera : public vtkPointSetAlgorithm
public:
static vtkDistanceToCamera *New();
vtkTypeMacro(vtkDistanceToCamera,vtkPointSetAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -82,16 +82,16 @@ public:
/**
* The modified time of this filter.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
protected:
vtkDistanceToCamera();
- ~vtkDistanceToCamera() VTK_OVERRIDE;
+ ~vtkDistanceToCamera() override;
int RequestData(
vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
vtkRenderer* Renderer;
double ScreenSize;
diff --git a/Rendering/Core/vtkFXAAOptions.h b/Rendering/Core/vtkFXAAOptions.h
index ca1c59189d30c46ef3244cb415240aabb0f90378..08430ff050753197b36e42e51ab754891a423e30 100644
--- a/Rendering/Core/vtkFXAAOptions.h
+++ b/Rendering/Core/vtkFXAAOptions.h
@@ -48,7 +48,7 @@ public:
static vtkFXAAOptions* New();
vtkTypeMacro(vtkFXAAOptions, vtkObject)
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
//@{
/**
@@ -179,7 +179,7 @@ public:
protected:
vtkFXAAOptions();
- ~vtkFXAAOptions() VTK_OVERRIDE;
+ ~vtkFXAAOptions() override;
float RelativeContrastThreshold;
float HardContrastThreshold;
diff --git a/Rendering/Core/vtkFollower.h b/Rendering/Core/vtkFollower.h
index 96ae0a23f72143b4cd421daf30b64e2e2d285173..6c3cb11bf7be87df49ca7e91771db80dcecf74ff 100644
--- a/Rendering/Core/vtkFollower.h
+++ b/Rendering/Core/vtkFollower.h
@@ -41,7 +41,7 @@ class VTKRENDERINGCORE_EXPORT vtkFollower : public vtkActor
{
public:
vtkTypeMacro(vtkFollower,vtkActor);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Creates a follower with no camera set
@@ -63,35 +63,35 @@ class VTKRENDERINGCORE_EXPORT vtkFollower : public vtkActor
* property, texture map and then mapper. If a property hasn't been
* assigned, then the actor will create one automatically.
*/
- int RenderOpaqueGeometry(vtkViewport *viewport) VTK_OVERRIDE;
- int RenderTranslucentPolygonalGeometry(vtkViewport *viewport) VTK_OVERRIDE;
+ int RenderOpaqueGeometry(vtkViewport *viewport) override;
+ int RenderTranslucentPolygonalGeometry(vtkViewport *viewport) override;
virtual void Render(vtkRenderer *ren);
//@}
/**
* Does this prop have some translucent polygonal geometry?
*/
- int HasTranslucentPolygonalGeometry() VTK_OVERRIDE;
+ int HasTranslucentPolygonalGeometry() override;
/**
* Release any graphics resources associated with this vtkProp3DFollower.
*/
- void ReleaseGraphicsResources(vtkWindow*) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow*) override;
/**
* Generate the matrix based on ivars. This method overloads its superclasses
* ComputeMatrix() method due to the special vtkFollower matrix operations.
*/
- void ComputeMatrix() VTK_OVERRIDE;
+ void ComputeMatrix() override;
/**
* Shallow copy of a follower. Overloads the virtual vtkProp method.
*/
- void ShallowCopy(vtkProp *prop) VTK_OVERRIDE;
+ void ShallowCopy(vtkProp *prop) override;
protected:
vtkFollower();
- ~vtkFollower() VTK_OVERRIDE;
+ ~vtkFollower() override;
vtkCamera *Camera;
vtkActor *Device;
@@ -104,7 +104,7 @@ private:
void operator=(const vtkFollower&) VTK_DELETE_FUNCTION;
// hide the two parameter Render() method from the user and the compiler.
- void Render(vtkRenderer *, vtkMapper *) VTK_OVERRIDE {}
+ void Render(vtkRenderer *, vtkMapper *) override {}
};
#endif
diff --git a/Rendering/Core/vtkFrameBufferObjectBase.h b/Rendering/Core/vtkFrameBufferObjectBase.h
index 5a0bd1dd0cb9092ebe3460611ba3bed4fe49449c..21fb4900d74af1e574ac30b5db9fc2221976ca16 100644
--- a/Rendering/Core/vtkFrameBufferObjectBase.h
+++ b/Rendering/Core/vtkFrameBufferObjectBase.h
@@ -33,7 +33,7 @@ class VTKRENDERINGCORE_EXPORT vtkFrameBufferObjectBase : public vtkObject
{
public:
vtkTypeMacro(vtkFrameBufferObjectBase, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -46,7 +46,7 @@ class VTKRENDERINGCORE_EXPORT vtkFrameBufferObjectBase : public vtkObject
protected:
vtkFrameBufferObjectBase(); // no default constructor.
- ~vtkFrameBufferObjectBase() VTK_OVERRIDE;
+ ~vtkFrameBufferObjectBase() override;
private:
vtkFrameBufferObjectBase(const vtkFrameBufferObjectBase &) VTK_DELETE_FUNCTION;
diff --git a/Rendering/Core/vtkFrustumCoverageCuller.h b/Rendering/Core/vtkFrustumCoverageCuller.h
index 420dde83c0fa1a9861ab59ee5fbee1cda17f0698..20e52d5e91885b3ba936954bc3b1d104f9dc63d5 100644
--- a/Rendering/Core/vtkFrustumCoverageCuller.h
+++ b/Rendering/Core/vtkFrustumCoverageCuller.h
@@ -50,7 +50,7 @@ class VTKRENDERINGCORE_EXPORT vtkFrustumCoverageCuller : public vtkCuller
public:
static vtkFrustumCoverageCuller *New();
vtkTypeMacro(vtkFrustumCoverageCuller,vtkCuller);
- void PrintSelf(ostream& os,vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os,vtkIndent indent) override;
//@{
/**
@@ -95,11 +95,11 @@ public:
* the render process
*/
double Cull( vtkRenderer *ren, vtkProp **propList,
- int& listLength, int& initialized ) VTK_OVERRIDE;
+ int& listLength, int& initialized ) override;
protected:
vtkFrustumCoverageCuller();
- ~vtkFrustumCoverageCuller() VTK_OVERRIDE {}
+ ~vtkFrustumCoverageCuller() override {}
double MinimumCoverage;
double MaximumCoverage;
diff --git a/Rendering/Core/vtkGPUInfo.h b/Rendering/Core/vtkGPUInfo.h
index 801e1e0394e79a93e336762b1682392e2f8d45d6..e402d368e8826cdba0bbf3bde717377729d33949 100644
--- a/Rendering/Core/vtkGPUInfo.h
+++ b/Rendering/Core/vtkGPUInfo.h
@@ -34,7 +34,7 @@ class VTKRENDERINGCORE_EXPORT vtkGPUInfo : public vtkObject
public:
static vtkGPUInfo* New();
vtkTypeMacro(vtkGPUInfo, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -70,7 +70,7 @@ public:
protected:
vtkGPUInfo();
- ~vtkGPUInfo() VTK_OVERRIDE;
+ ~vtkGPUInfo() override;
vtkTypeUInt64 DedicatedVideoMemory;
vtkTypeUInt64 DedicatedSystemMemory;
diff --git a/Rendering/Core/vtkGPUInfoList.h b/Rendering/Core/vtkGPUInfoList.h
index 9069a0590b088a90aa8debea67bdcdd95e7ff27d..40e9e404d1b64ea9dc37ccc7fe3ae195af70c39a 100644
--- a/Rendering/Core/vtkGPUInfoList.h
+++ b/Rendering/Core/vtkGPUInfoList.h
@@ -38,7 +38,7 @@ class VTKRENDERINGCORE_EXPORT vtkGPUInfoList : public vtkObject
public:
static vtkGPUInfoList *New();
vtkTypeMacro(vtkGPUInfoList, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Build the list of vtkInfoGPU if not done yet.
@@ -73,7 +73,7 @@ protected:
* Default constructor. Set Probed to false. Set Array to NULL.
*/
vtkGPUInfoList();
- ~vtkGPUInfoList() VTK_OVERRIDE;
+ ~vtkGPUInfoList() override;
//@}
bool Probed;
diff --git a/Rendering/Core/vtkGenericRenderWindowInteractor.h b/Rendering/Core/vtkGenericRenderWindowInteractor.h
index 3c232d06f07d08ec54742c42aa2dedd0d9eb5744..3c2421a3ea8bc6d46d9897a1d70737d4160e4cf3 100644
--- a/Rendering/Core/vtkGenericRenderWindowInteractor.h
+++ b/Rendering/Core/vtkGenericRenderWindowInteractor.h
@@ -34,7 +34,7 @@ class VTKRENDERINGCORE_EXPORT vtkGenericRenderWindowInteractor : public vtkRende
public:
static vtkGenericRenderWindowInteractor *New();
vtkTypeMacro(vtkGenericRenderWindowInteractor,vtkRenderWindowInteractor);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Fire TimerEvent. SetEventInformation should be called just prior
@@ -63,15 +63,15 @@ public:
protected:
vtkGenericRenderWindowInteractor();
- ~vtkGenericRenderWindowInteractor() VTK_OVERRIDE;
+ ~vtkGenericRenderWindowInteractor() override;
//@{
/**
* Generic internal timer methods. See the superclass for detailed
* documentation.
*/
- int InternalCreateTimer(int timerId, int timerType, unsigned long duration) VTK_OVERRIDE;
- int InternalDestroyTimer(int platformTimerId) VTK_OVERRIDE;
+ int InternalCreateTimer(int timerId, int timerType, unsigned long duration) override;
+ int InternalDestroyTimer(int platformTimerId) override;
//@}
int TimerEventResetsTimer;
diff --git a/Rendering/Core/vtkGenericVertexAttributeMapping.h b/Rendering/Core/vtkGenericVertexAttributeMapping.h
index 081190fe6f4973b04c1ae3dca98e1b0c94722861..42636f9d7ae32942c6dece5a61bc9bf1342a8b0b 100644
--- a/Rendering/Core/vtkGenericVertexAttributeMapping.h
+++ b/Rendering/Core/vtkGenericVertexAttributeMapping.h
@@ -36,7 +36,7 @@ class VTKRENDERINGCORE_EXPORT vtkGenericVertexAttributeMapping : public vtkObjec
public:
static vtkGenericVertexAttributeMapping* New();
vtkTypeMacro(vtkGenericVertexAttributeMapping, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Select a data array from the point/cell data
@@ -98,7 +98,7 @@ public:
protected:
vtkGenericVertexAttributeMapping();
- ~vtkGenericVertexAttributeMapping() VTK_OVERRIDE;
+ ~vtkGenericVertexAttributeMapping() override;
private:
vtkGenericVertexAttributeMapping(const vtkGenericVertexAttributeMapping&) VTK_DELETE_FUNCTION;
diff --git a/Rendering/Core/vtkGlyph3DMapper.h b/Rendering/Core/vtkGlyph3DMapper.h
index 5e9245c27b7039f3a91ce8726f2017aed7a4f6fe..ab6cbc3dfab633bd39d7e03597db7de12af48ffc 100644
--- a/Rendering/Core/vtkGlyph3DMapper.h
+++ b/Rendering/Core/vtkGlyph3DMapper.h
@@ -41,7 +41,7 @@ class VTKRENDERINGCORE_EXPORT vtkGlyph3DMapper : public vtkMapper
public:
static vtkGlyph3DMapper* New();
vtkTypeMacro(vtkGlyph3DMapper, vtkMapper);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
enum ArrayIndexes
{
@@ -231,17 +231,17 @@ public:
/**
* Redefined to take into account the bounds of the scaled glyphs.
*/
- double *GetBounds() VTK_OVERRIDE;
+ double *GetBounds() override;
/**
* Same as superclass. Appear again to stop warnings about hidden method.
*/
- void GetBounds(double bounds[6]) VTK_OVERRIDE;
+ void GetBounds(double bounds[6]) override;
/**
* All the work is done is derived classes.
*/
- void Render(vtkRenderer *ren, vtkActor *act) VTK_OVERRIDE;
+ void Render(vtkRenderer *ren, vtkActor *act) override;
//@{
/**
@@ -415,18 +415,18 @@ public:
* Used by vtkHardwareSelector to determine if the prop supports hardware
* selection.
*/
- bool GetSupportsSelection() VTK_OVERRIDE
+ bool GetSupportsSelection() override
{ return true; }
protected:
vtkGlyph3DMapper();
- ~vtkGlyph3DMapper() VTK_OVERRIDE;
+ ~vtkGlyph3DMapper() override;
virtual int RequestUpdateExtent(vtkInformation *request,
vtkInformationVector **inInfo,
vtkInformationVector *outInfo);
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
vtkPolyData *GetSource(int idx, vtkInformationVector *sourceInfo);
vtkPolyData *GetSourceTable(int idx, vtkInformationVector *sourceInfo);
diff --git a/Rendering/Core/vtkGraphMapper.h b/Rendering/Core/vtkGraphMapper.h
index 3655bded4aeb33e18673a069dbf365a47f773a09..81687e45ef4305cbb3ae4c7dbc0f4001662782c5 100644
--- a/Rendering/Core/vtkGraphMapper.h
+++ b/Rendering/Core/vtkGraphMapper.h
@@ -58,8 +58,8 @@ class VTKRENDERINGCORE_EXPORT vtkGraphMapper : public vtkMapper
public:
static vtkGraphMapper *New();
vtkTypeMacro(vtkGraphMapper, vtkMapper);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
- void Render(vtkRenderer *ren, vtkActor *act) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
+ void Render(vtkRenderer *ren, vtkActor *act) override;
//@{
/**
@@ -232,12 +232,12 @@ public:
* The parameter window could be used to determine which graphic
* resources to release.
*/
- void ReleaseGraphicsResources(vtkWindow *) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *) override;
/**
* Get the mtime also considering the lookup table.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
//@{
/**
@@ -251,8 +251,8 @@ public:
* Return bounding box (array of six doubles) of data expressed as
* (xmin,xmax, ymin,ymax, zmin,zmax).
*/
- double *GetBounds() VTK_OVERRIDE;
- void GetBounds(double* bounds) VTK_OVERRIDE
+ double *GetBounds() override;
+ void GetBounds(double* bounds) override
{ Superclass::GetBounds(bounds); }
//@{
@@ -265,7 +265,7 @@ public:
protected:
vtkGraphMapper();
- ~vtkGraphMapper() VTK_OVERRIDE;
+ ~vtkGraphMapper() override;
//@{
/**
@@ -311,10 +311,10 @@ protected:
vtkLookupTable* EdgeLookupTable;
vtkLookupTable* VertexLookupTable;
- void ReportReferences(vtkGarbageCollector*) VTK_OVERRIDE;
+ void ReportReferences(vtkGarbageCollector*) override;
// see algorithm for more info
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
private:
vtkGraphMapper(const vtkGraphMapper&) VTK_DELETE_FUNCTION;
diff --git a/Rendering/Core/vtkGraphToGlyphs.h b/Rendering/Core/vtkGraphToGlyphs.h
index 82344e72187ecb0478772abad0a1557ef703faca..4106345186c2317ac2a324a13b0412c8be27506e 100644
--- a/Rendering/Core/vtkGraphToGlyphs.h
+++ b/Rendering/Core/vtkGraphToGlyphs.h
@@ -49,7 +49,7 @@ class VTKRENDERINGCORE_EXPORT vtkGraphToGlyphs : public vtkPolyDataAlgorithm
public:
static vtkGraphToGlyphs *New();
vtkTypeMacro(vtkGraphToGlyphs, vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
enum
{
@@ -114,21 +114,21 @@ public:
/**
* The modified time of this filter.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
protected:
vtkGraphToGlyphs();
- ~vtkGraphToGlyphs() VTK_OVERRIDE;
+ ~vtkGraphToGlyphs() override;
/**
* Convert the vtkGraph into vtkPolyData.
*/
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
/**
* Set the input type of the algorithm to vtkGraph.
*/
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
vtkSmartPointer<vtkGraphToPoints> GraphToPoints;
vtkSmartPointer<vtkGlyphSource2D> GlyphSource;
diff --git a/Rendering/Core/vtkGraphicsFactory.h b/Rendering/Core/vtkGraphicsFactory.h
index 27aa619f6cbafec7f49e59be3b4394210c91be2a..e1fd3739200bb7dc046cbecdd8c8dac0cc66b45f 100644
--- a/Rendering/Core/vtkGraphicsFactory.h
+++ b/Rendering/Core/vtkGraphicsFactory.h
@@ -28,7 +28,7 @@ class VTKRENDERINGCORE_EXPORT vtkGraphicsFactory : public vtkObject
public:
static vtkGraphicsFactory *New();
vtkTypeMacro(vtkGraphicsFactory, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Create and return an instance of the named vtk object.
diff --git a/Rendering/Core/vtkHardwareSelector.h b/Rendering/Core/vtkHardwareSelector.h
index a2fa74f6fad510509617e1cf4c22e195e12753bf..4f035bca8b9913f64f6a7063bcca3c818e12e8b4 100644
--- a/Rendering/Core/vtkHardwareSelector.h
+++ b/Rendering/Core/vtkHardwareSelector.h
@@ -100,7 +100,7 @@ public:
public:
static vtkHardwareSelector* New();
vtkTypeMacro(vtkHardwareSelector, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -287,7 +287,7 @@ public:
protected:
vtkHardwareSelector();
- ~vtkHardwareSelector() VTK_OVERRIDE;
+ ~vtkHardwareSelector() override;
// Used to notify subclasses when a capture pass is occurring.
virtual void PreCapturePass(int pass) { (void)pass; }
diff --git a/Rendering/Core/vtkHierarchicalPolyDataMapper.h b/Rendering/Core/vtkHierarchicalPolyDataMapper.h
index 2f6c505297554f1457a02cf70f2295fe851db552..52b2549e9a79333aade008cd40fac339af3ca3d4 100644
--- a/Rendering/Core/vtkHierarchicalPolyDataMapper.h
+++ b/Rendering/Core/vtkHierarchicalPolyDataMapper.h
@@ -34,11 +34,11 @@ class VTKRENDERINGCORE_EXPORT vtkHierarchicalPolyDataMapper : public vtkComposit
public:
static vtkHierarchicalPolyDataMapper *New();
vtkTypeMacro(vtkHierarchicalPolyDataMapper, vtkCompositePolyDataMapper);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkHierarchicalPolyDataMapper();
- ~vtkHierarchicalPolyDataMapper() VTK_OVERRIDE;
+ ~vtkHierarchicalPolyDataMapper() override;
private:
vtkHierarchicalPolyDataMapper(const vtkHierarchicalPolyDataMapper&) VTK_DELETE_FUNCTION;
diff --git a/Rendering/Core/vtkImageActor.h b/Rendering/Core/vtkImageActor.h
index 160918693c7c62470a9aac50b7c21448ca1d126b..fbf5221cfe43cc04452554bfb716a499513fcb3b 100644
--- a/Rendering/Core/vtkImageActor.h
+++ b/Rendering/Core/vtkImageActor.h
@@ -44,7 +44,7 @@ class VTKRENDERINGCORE_EXPORT vtkImageActor : public vtkImageSlice
{
public:
vtkTypeMacro(vtkImageActor,vtkImageSlice);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Instantiate the image actor.
@@ -101,7 +101,7 @@ public:
* In either case the bounds is expressed as a 6-vector
* (xmin,xmax, ymin,ymax, zmin,zmax).
*/
- double *GetBounds() VTK_OVERRIDE;
+ double *GetBounds() override;
void GetBounds(double bounds[6]) { this->Superclass::GetBounds(bounds); };
//@}
@@ -152,7 +152,7 @@ public:
* ForceOpaqueOn(), which forces this method to return false, or
* ForceTranslucentOn(), which forces this method to return true.
*/
- int HasTranslucentPolygonalGeometry() VTK_OVERRIDE;
+ int HasTranslucentPolygonalGeometry() override;
//@{
/**
@@ -167,7 +167,7 @@ public:
protected:
vtkImageActor();
- ~vtkImageActor() VTK_OVERRIDE;
+ ~vtkImageActor() override;
/**
* Guess the orientation from the extent. The orientation will be Z
diff --git a/Rendering/Core/vtkImageMapper.h b/Rendering/Core/vtkImageMapper.h
index 834a8aeef13cc1df7ee3bcc3739f669059375e46..b3708546f0a220e0535ca6887e112433ad9923d1 100644
--- a/Rendering/Core/vtkImageMapper.h
+++ b/Rendering/Core/vtkImageMapper.h
@@ -43,12 +43,12 @@ class VTKRENDERINGCORE_EXPORT vtkImageMapper : public vtkMapper2D
public:
vtkTypeMacro(vtkImageMapper, vtkMapper2D);
static vtkImageMapper *New();
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Override Modifiedtime as we have added a lookuptable
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
//@{
/**
@@ -147,7 +147,7 @@ public:
protected:
vtkImageMapper();
- ~vtkImageMapper() VTK_OVERRIDE;
+ ~vtkImageMapper() override;
double ColorWindow;
double ColorLevel;
@@ -158,7 +158,7 @@ protected:
int CustomDisplayExtents[4];
int RenderToRectangle;
- int FillInputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
+ int FillInputPortInformation(int, vtkInformation*) override;
private:
vtkImageMapper(const vtkImageMapper&) VTK_DELETE_FUNCTION;
void operator=(const vtkImageMapper&) VTK_DELETE_FUNCTION;
diff --git a/Rendering/Core/vtkImageMapper3D.h b/Rendering/Core/vtkImageMapper3D.h
index ec6e3d4495917474da7d33d3ad22ed399cc9974f..07aeb95c6d11cdcd271db08a35099873af20dd59 100644
--- a/Rendering/Core/vtkImageMapper3D.h
+++ b/Rendering/Core/vtkImageMapper3D.h
@@ -48,7 +48,7 @@ class VTKRENDERINGCORE_EXPORT vtkImageMapper3D : public vtkAbstractMapper3D
{
public:
vtkTypeMacro(vtkImageMapper3D, vtkAbstractMapper3D);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* This should only be called by the renderer.
@@ -60,7 +60,7 @@ public:
* this mapper. The parameter window is used to determine
* which graphic resources to release.
*/
- void ReleaseGraphicsResources(vtkWindow *) VTK_OVERRIDE = 0;
+ void ReleaseGraphicsResources(vtkWindow *) override = 0;
//@{
/**
@@ -162,14 +162,14 @@ public:
protected:
vtkImageMapper3D();
- ~vtkImageMapper3D() VTK_OVERRIDE;
+ ~vtkImageMapper3D() override;
//@{
/**
* See algorithm for more info
*/
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
- int FillOutputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
+ int FillOutputPortInformation(int port, vtkInformation* info) override;
//@}
/**
@@ -177,7 +177,7 @@ protected:
*/
int ProcessRequest(vtkInformation* request,
vtkInformationVector** inInfo,
- vtkInformationVector* outInfo) VTK_OVERRIDE;
+ vtkInformationVector* outInfo) override;
/**
* Checkerboard the alpha component of an RGBA image. The origin and
diff --git a/Rendering/Core/vtkImageProperty.h b/Rendering/Core/vtkImageProperty.h
index 55ce40c7e1abd6ab4110868f301c3c36145e6038..e4ab04d403d402bee8321ec54bbda261a63dd967 100644
--- a/Rendering/Core/vtkImageProperty.h
+++ b/Rendering/Core/vtkImageProperty.h
@@ -37,7 +37,7 @@ class VTKRENDERINGCORE_EXPORT vtkImageProperty : public vtkObject
{
public:
vtkTypeMacro(vtkImageProperty,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct a property with no lookup table.
@@ -190,11 +190,11 @@ public:
* Get the MTime for this property. If the lookup table is set,
* the mtime will include the mtime of the lookup table.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
protected:
vtkImageProperty();
- ~vtkImageProperty() VTK_OVERRIDE;
+ ~vtkImageProperty() override;
vtkScalarsToColors *LookupTable;
double ColorWindow;
diff --git a/Rendering/Core/vtkImageSlice.h b/Rendering/Core/vtkImageSlice.h
index d78968fe4825bf31b5519ea9c6e3c5a7045a3514..cbb4effd03fdf76ceae83ba56aea5ace4a3e8584 100644
--- a/Rendering/Core/vtkImageSlice.h
+++ b/Rendering/Core/vtkImageSlice.h
@@ -47,7 +47,7 @@ class VTKRENDERINGCORE_EXPORT vtkImageSlice : public vtkProp3D
{
public:
vtkTypeMacro(vtkImageSlice,vtkProp3D);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Creates an Image with the following defaults: origin(0,0,0)
@@ -82,7 +82,7 @@ public:
* Get the bounds - either all six at once
* (xmin, xmax, ymin, ymax, zmin, zmax) or one at a time.
*/
- double *GetBounds() VTK_OVERRIDE;
+ double *GetBounds() override;
void GetBounds(double bounds[6]) { this->vtkProp3D::GetBounds( bounds ); };
double GetMinXBound();
double GetMaxXBound();
@@ -95,7 +95,7 @@ public:
/**
* Return the MTime also considering the property etc.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
/**
* Return the mtime of anything that would cause the rendered image to
@@ -103,7 +103,7 @@ public:
* prop plus anything else it depends on such as properties, mappers,
* etc.
*/
- vtkMTimeType GetRedrawMTime() VTK_OVERRIDE;
+ vtkMTimeType GetRedrawMTime() override;
//@{
/**
@@ -117,7 +117,7 @@ public:
/**
* Shallow copy of this vtkImageSlice. Overloads the virtual vtkProp method.
*/
- void ShallowCopy(vtkProp *prop) VTK_OVERRIDE;
+ void ShallowCopy(vtkProp *prop) override;
/**
* For some exporters and other other operations we must be
@@ -130,16 +130,16 @@ public:
/**
* Support the standard render methods.
*/
- int RenderOverlay(vtkViewport *viewport) VTK_OVERRIDE;
- int RenderOpaqueGeometry(vtkViewport *viewport) VTK_OVERRIDE;
- int RenderTranslucentPolygonalGeometry(vtkViewport *viewport) VTK_OVERRIDE;
+ int RenderOverlay(vtkViewport *viewport) override;
+ int RenderOpaqueGeometry(vtkViewport *viewport) override;
+ int RenderTranslucentPolygonalGeometry(vtkViewport *viewport) override;
//@}
/**
* Internal method, should only be used by rendering.
* This method will always return 0 unless ForceTranslucent is On.
*/
- int HasTranslucentPolygonalGeometry() VTK_OVERRIDE;
+ int HasTranslucentPolygonalGeometry() override;
/**
* This causes the image and its mapper to be rendered. Note that a side
@@ -150,7 +150,7 @@ public:
/**
* Release any resources held by this prop.
*/
- void ReleaseGraphicsResources(vtkWindow *win) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *win) override;
/**
* For stacked image rendering, set the pass. The first pass
@@ -162,7 +162,7 @@ public:
protected:
vtkImageSlice();
- ~vtkImageSlice() VTK_OVERRIDE;
+ ~vtkImageSlice() override;
vtkImageMapper3D *Mapper;
vtkImageProperty *Property;
diff --git a/Rendering/Core/vtkImageSliceMapper.h b/Rendering/Core/vtkImageSliceMapper.h
index 206d10efb81ebf0652614e1718f508c6d9f57a59..c5cb7c5073f2810ea848f1b65df6b25cd2e35434 100644
--- a/Rendering/Core/vtkImageSliceMapper.h
+++ b/Rendering/Core/vtkImageSliceMapper.h
@@ -41,7 +41,7 @@ class VTKRENDERINGCORE_EXPORT vtkImageSliceMapper : public vtkImageMapper3D
public:
static vtkImageSliceMapper *New();
vtkTypeMacro(vtkImageSliceMapper,vtkImageMapper3D);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -95,27 +95,27 @@ public:
/**
* This should only be called by the renderer.
*/
- void Render(vtkRenderer *renderer, vtkImageSlice *prop) VTK_OVERRIDE;
+ void Render(vtkRenderer *renderer, vtkImageSlice *prop) override;
/**
* Release any graphics resources that are being consumed by
* this mapper. The parameter window is used to determine
* which graphic resources to release.
*/
- void ReleaseGraphicsResources(vtkWindow *) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *) override;
/**
* Get the mtime for the mapper.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
//@{
/**
* The bounding box (array of six doubles) of data expressed as
* (xmin,xmax, ymin,ymax, zmin,zmax).
*/
- double *GetBounds() VTK_OVERRIDE;
- void GetBounds(double bounds[6]) VTK_OVERRIDE {
+ double *GetBounds() override;
+ void GetBounds(double bounds[6]) override {
this->vtkAbstractMapper3D::GetBounds(bounds); };
//@}
@@ -125,18 +125,18 @@ public:
* and SliceNumber, the propMatrix is unused and can be zero.
*/
void GetSlicePlaneInDataCoords(vtkMatrix4x4 *propMatrix,
- double plane[4]) VTK_OVERRIDE;
+ double plane[4]) override;
/**
* Handle requests from the pipeline executive.
*/
int ProcessRequest(vtkInformation* request,
vtkInformationVector** inInfo,
- vtkInformationVector* outInfo) VTK_OVERRIDE;
+ vtkInformationVector* outInfo) override;
protected:
vtkImageSliceMapper();
- ~vtkImageSliceMapper() VTK_OVERRIDE;
+ ~vtkImageSliceMapper() override;
/**
* Set points that describe a polygon on which the slice will
diff --git a/Rendering/Core/vtkInteractorEventRecorder.h b/Rendering/Core/vtkInteractorEventRecorder.h
index 980bbc293cc22159ec59db8e8f07e7f20e0c3fc3..af50dd6bba280edaf7465189d62fae87bf898a78 100644
--- a/Rendering/Core/vtkInteractorEventRecorder.h
+++ b/Rendering/Core/vtkInteractorEventRecorder.h
@@ -43,11 +43,11 @@ class VTKRENDERINGCORE_EXPORT vtkInteractorEventRecorder : public vtkInteractorO
public:
static vtkInteractorEventRecorder *New();
vtkTypeMacro(vtkInteractorEventRecorder,vtkInteractorObserver);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
// Satisfy the superclass API. Enable/disable listening for events.
- void SetEnabled(int) VTK_OVERRIDE;
- void SetInteractor(vtkRenderWindowInteractor* iren) VTK_OVERRIDE;
+ void SetEnabled(int) override;
+ void SetInteractor(vtkRenderWindowInteractor* iren) override;
//@{
/**
@@ -99,7 +99,7 @@ public:
protected:
vtkInteractorEventRecorder();
- ~vtkInteractorEventRecorder() VTK_OVERRIDE;
+ ~vtkInteractorEventRecorder() override;
// file to read/write from
char *FileName;
diff --git a/Rendering/Core/vtkInteractorObserver.h b/Rendering/Core/vtkInteractorObserver.h
index cd67a7118eb0f3ae78ee091e975a29a2be04ecf8..9d744d065ba6c86b92d13a384eab3b0714872790 100644
--- a/Rendering/Core/vtkInteractorObserver.h
+++ b/Rendering/Core/vtkInteractorObserver.h
@@ -60,7 +60,7 @@ class VTKRENDERINGCORE_EXPORT vtkInteractorObserver : public vtkObject
{
public:
vtkTypeMacro(vtkInteractorObserver,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Methods for turning the interactor observer on and off, and determining
@@ -201,7 +201,7 @@ public:
protected:
vtkInteractorObserver();
- ~vtkInteractorObserver() VTK_OVERRIDE;
+ ~vtkInteractorObserver() override;
//@{
/**
diff --git a/Rendering/Core/vtkInteractorStyle.h b/Rendering/Core/vtkInteractorStyle.h
index 91f7c57863ec92612d6dd60857c1f3f679307efd..106676d57afd4eb68d35f59d6f5b49d59e7a85b7 100644
--- a/Rendering/Core/vtkInteractorStyle.h
+++ b/Rendering/Core/vtkInteractorStyle.h
@@ -143,13 +143,13 @@ public:
static vtkInteractorStyle *New();
vtkTypeMacro(vtkInteractorStyle,vtkInteractorObserver);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Set/Get the Interactor wrapper being controlled by this object.
* (Satisfy superclass API.)
*/
- void SetInteractor(vtkRenderWindowInteractor *interactor) VTK_OVERRIDE;
+ void SetInteractor(vtkRenderWindowInteractor *interactor) override;
/**
* Turn on/off this interactor. Interactor styles operate a little
@@ -158,7 +158,7 @@ public:
* themselves. This is a legacy requirement, and convenient for the
* user.
*/
- void SetEnabled(int) VTK_OVERRIDE;
+ void SetEnabled(int) override;
//@{
/**
@@ -245,7 +245,7 @@ public:
* OnChar is triggered when an ASCII key is pressed. Some basic key presses
* are handled here ('q' for Quit, 'p' for Pick, etc)
*/
- void OnChar() VTK_OVERRIDE;
+ void OnChar() override;
// OnKeyDown is triggered by pressing any key (identical to OnKeyPress()).
// An empty implementation is provided. The behavior of this function should
@@ -384,7 +384,7 @@ public:
protected:
vtkInteractorStyle();
- ~vtkInteractorStyle() VTK_OVERRIDE;
+ ~vtkInteractorStyle() override;
/**
* Main process event method
diff --git a/Rendering/Core/vtkInteractorStyle3D.h b/Rendering/Core/vtkInteractorStyle3D.h
index a20a6750c612493657675e30479da13dec6db5a4..0722bf2e080af085f6bdb1eb31433945a5e547c1 100644
--- a/Rendering/Core/vtkInteractorStyle3D.h
+++ b/Rendering/Core/vtkInteractorStyle3D.h
@@ -66,7 +66,7 @@ class VTKRENDERINGCORE_EXPORT vtkInteractorStyle3D : public vtkInteractorStyle
public:
static vtkInteractorStyle3D *New();
vtkTypeMacro(vtkInteractorStyle3D,vtkInteractorStyle);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
// This method handles updating the prop based on changes in the devices
// pose. We use rotate as the state to mean adjusting-the-actor-pose
@@ -107,7 +107,7 @@ public:
protected:
vtkInteractorStyle3D();
- ~vtkInteractorStyle3D() VTK_OVERRIDE;
+ ~vtkInteractorStyle3D() override;
void FindPickedActor(double pos[3], double orient[4]);
diff --git a/Rendering/Core/vtkInteractorStyleSwitchBase.h b/Rendering/Core/vtkInteractorStyleSwitchBase.h
index c943a6dac9d0d3acc33dbf2ac44c455b7d502a48..f3aa8e28c71ed171656f0cfce64c16e984632a0e 100644
--- a/Rendering/Core/vtkInteractorStyleSwitchBase.h
+++ b/Rendering/Core/vtkInteractorStyleSwitchBase.h
@@ -37,13 +37,13 @@ class VTKRENDERINGCORE_EXPORT vtkInteractorStyleSwitchBase
public:
static vtkInteractorStyleSwitchBase *New();
vtkTypeMacro(vtkInteractorStyleSwitchBase, vtkInteractorStyle);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
- vtkRenderWindowInteractor* GetInteractor() VTK_OVERRIDE;
+ vtkRenderWindowInteractor* GetInteractor() override;
protected:
vtkInteractorStyleSwitchBase();
- ~vtkInteractorStyleSwitchBase() VTK_OVERRIDE;
+ ~vtkInteractorStyleSwitchBase() override;
private:
vtkInteractorStyleSwitchBase(const vtkInteractorStyleSwitchBase&) VTK_DELETE_FUNCTION;
diff --git a/Rendering/Core/vtkLODProp3D.cxx b/Rendering/Core/vtkLODProp3D.cxx
index 3c3f30f2db099b624834c8c09325f7803570e582..cf0680810c396678cd7f776cdd5076005261f1b4 100644
--- a/Rendering/Core/vtkLODProp3D.cxx
+++ b/Rendering/Core/vtkLODProp3D.cxx
@@ -47,7 +47,7 @@ public:
// the execute
void Execute(vtkObject *caller,
- unsigned long event, void* vtkNotUsed(v)) VTK_OVERRIDE
+ unsigned long event, void* vtkNotUsed(v)) override
{
vtkProp *po = vtkProp::SafeDownCast(caller);
if (event == vtkCommand::PickEvent && po)
diff --git a/Rendering/Core/vtkLODProp3D.h b/Rendering/Core/vtkLODProp3D.h
index 49de052ab2b6e24f8fc7d047aac800c683001410..4208b3ba0f0971332ac9e6c34e3fc0fcaa01bbb6 100644
--- a/Rendering/Core/vtkLODProp3D.h
+++ b/Rendering/Core/vtkLODProp3D.h
@@ -63,12 +63,12 @@ public:
static vtkLODProp3D *New();
vtkTypeMacro(vtkLODProp3D, vtkProp3D);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Standard vtkProp method to get 3D bounds of a 3D prop
*/
- double *GetBounds() VTK_OVERRIDE;
+ double *GetBounds() override;
void GetBounds(double bounds[6])
{ this->vtkProp3D::GetBounds( bounds ); }
@@ -243,8 +243,8 @@ public:
* able to collect all the actors or volumes. These methods
* are used in that process.
*/
- void GetActors(vtkPropCollection *) VTK_OVERRIDE;
- void GetVolumes(vtkPropCollection *) VTK_OVERRIDE;
+ void GetActors(vtkPropCollection *) override;
+ void GetVolumes(vtkPropCollection *) override;
//@}
//@{
@@ -270,35 +270,35 @@ public:
/**
* Shallow copy of this vtkLODProp3D.
*/
- void ShallowCopy(vtkProp *prop) VTK_OVERRIDE;
+ void ShallowCopy(vtkProp *prop) override;
//@{
/**
* Support the standard render methods.
*/
- int RenderOpaqueGeometry(vtkViewport *viewport) VTK_OVERRIDE;
- int RenderTranslucentPolygonalGeometry( vtkViewport *ren) VTK_OVERRIDE;
- int RenderVolumetricGeometry( vtkViewport *ren) VTK_OVERRIDE;
+ int RenderOpaqueGeometry(vtkViewport *viewport) override;
+ int RenderTranslucentPolygonalGeometry( vtkViewport *ren) override;
+ int RenderVolumetricGeometry( vtkViewport *ren) override;
//@}
/**
* Does this prop have some translucent polygonal geometry?
*/
- int HasTranslucentPolygonalGeometry() VTK_OVERRIDE;
+ int HasTranslucentPolygonalGeometry() override;
/**
* Release any graphics resources that are being consumed by this actor.
* The parameter window could be used to determine which graphic
* resources to release.
*/
- void ReleaseGraphicsResources(vtkWindow *) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *) override;
/**
* Used by the culler / renderer to set the allocated render time for this
* prop. This is based on the desired update rate, and possibly some other
* properties such as potential screen coverage of this prop.
*/
- void SetAllocatedRenderTime( double t, vtkViewport *vp ) VTK_OVERRIDE;
+ void SetAllocatedRenderTime( double t, vtkViewport *vp ) override;
/**
* Used when the render process is aborted to restore the previous
@@ -306,17 +306,17 @@ public:
* particular LOD to be restored - otherwise the time for the last rendered
* LOD will be copied into the currently selected LOD.
*/
- void RestoreEstimatedRenderTime( ) VTK_OVERRIDE;
+ void RestoreEstimatedRenderTime( ) override;
/**
* Override method from vtkProp in order to push this call down to the
* selected LOD as well.
*/
- void AddEstimatedRenderTime( double t, vtkViewport *vp ) VTK_OVERRIDE;
+ void AddEstimatedRenderTime( double t, vtkViewport *vp ) override;
protected:
vtkLODProp3D();
- ~vtkLODProp3D() VTK_OVERRIDE;
+ ~vtkLODProp3D() override;
int GetAutomaticPickPropIndex(void);
diff --git a/Rendering/Core/vtkLabeledContourMapper.h b/Rendering/Core/vtkLabeledContourMapper.h
index 09264b2e29190980f063bcf407d594554fc6bee7..3db0764c31ffa0057530443abebb893c4f82d3a4 100644
--- a/Rendering/Core/vtkLabeledContourMapper.h
+++ b/Rendering/Core/vtkLabeledContourMapper.h
@@ -47,9 +47,9 @@ class VTKRENDERINGCORE_EXPORT vtkLabeledContourMapper : public vtkMapper
public:
static vtkLabeledContourMapper *New();
vtkTypeMacro(vtkLabeledContourMapper, vtkMapper)
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
- void Render(vtkRenderer *ren, vtkActor *act) VTK_OVERRIDE;
+ void Render(vtkRenderer *ren, vtkActor *act) override;
//@{
/**
@@ -64,8 +64,8 @@ public:
* Return bounding box (array of six doubles) of data expressed as
* (xmin,xmax, ymin,ymax, zmin,zmax).
*/
- double *GetBounds() VTK_OVERRIDE;
- void GetBounds(double bounds[6]) VTK_OVERRIDE;
+ double *GetBounds() override;
+ void GetBounds(double bounds[6]) override;
//@}
/**
@@ -137,15 +137,15 @@ public:
vtkGetNewMacro(PolyDataMapper, vtkPolyDataMapper)
//@}
- void ReleaseGraphicsResources(vtkWindow *) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *) override;
protected:
vtkLabeledContourMapper();
- ~vtkLabeledContourMapper() VTK_OVERRIDE;
+ ~vtkLabeledContourMapper() override;
virtual void ComputeBounds();
- int FillInputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
+ int FillInputPortInformation(int, vtkInformation*) override;
void Reset();
diff --git a/Rendering/Core/vtkLight.h b/Rendering/Core/vtkLight.h
index 23d2ffb6083777efe1affb8ae1c32a8f8b35e723..e7fefcd836cc5bda249b22a143920341cf67a6af 100644
--- a/Rendering/Core/vtkLight.h
+++ b/Rendering/Core/vtkLight.h
@@ -57,7 +57,7 @@ class VTKRENDERINGCORE_EXPORT vtkLight : public vtkObject
{
public:
vtkTypeMacro(vtkLight,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Create a light with the focal point at the origin and its position
@@ -290,7 +290,7 @@ public:
protected:
vtkLight();
- ~vtkLight() VTK_OVERRIDE;
+ ~vtkLight() override;
double FocalPoint[3];
double Position[3];
diff --git a/Rendering/Core/vtkLightActor.h b/Rendering/Core/vtkLightActor.h
index c0a877c2646d34413065872f0e46150b53b4ece8..ca76afcda053a9234b57f9180218f2f4cb0818fa 100644
--- a/Rendering/Core/vtkLightActor.h
+++ b/Rendering/Core/vtkLightActor.h
@@ -53,7 +53,7 @@ class VTKRENDERINGCORE_EXPORT vtkLightActor : public vtkProp3D
public:
static vtkLightActor *New();
vtkTypeMacro(vtkLightActor, vtkProp3D);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -77,33 +77,33 @@ public:
/**
* Support the standard render methods.
*/
- int RenderOpaqueGeometry(vtkViewport *viewport) VTK_OVERRIDE;
+ int RenderOpaqueGeometry(vtkViewport *viewport) override;
/**
* Does this prop have some translucent polygonal geometry? No.
*/
- int HasTranslucentPolygonalGeometry() VTK_OVERRIDE;
+ int HasTranslucentPolygonalGeometry() override;
/**
* Release any graphics resources that are being consumed by this actor.
* The parameter window could be used to determine which graphic
* resources to release.
*/
- void ReleaseGraphicsResources(vtkWindow *) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *) override;
/**
* Get the bounds for this Actor as (Xmin,Xmax,Ymin,Ymax,Zmin,Zmax).
*/
- double *GetBounds() VTK_OVERRIDE;
+ double *GetBounds() override;
/**
* Get the actors mtime plus consider its properties and texture if set.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
protected:
vtkLightActor();
- ~vtkLightActor() VTK_OVERRIDE;
+ ~vtkLightActor() override;
void UpdateViewProps();
diff --git a/Rendering/Core/vtkLightCollection.h b/Rendering/Core/vtkLightCollection.h
index a6c84b894db19ddaaccf2b064fcf09a3738a97f6..b96c70caff533be0791df636a9856c6110969a4f 100644
--- a/Rendering/Core/vtkLightCollection.h
+++ b/Rendering/Core/vtkLightCollection.h
@@ -37,7 +37,7 @@ class VTKRENDERINGCORE_EXPORT vtkLightCollection : public vtkCollection
public:
static vtkLightCollection *New();
vtkTypeMacro(vtkLightCollection, vtkCollection);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Add a light to the bottom of the list.
@@ -58,7 +58,7 @@ class VTKRENDERINGCORE_EXPORT vtkLightCollection : public vtkCollection
protected:
vtkLightCollection() {}
- ~vtkLightCollection() VTK_OVERRIDE {}
+ ~vtkLightCollection() override {}
private:
// hide the standard AddItem from the user and the compiler.
diff --git a/Rendering/Core/vtkLightKit.h b/Rendering/Core/vtkLightKit.h
index 012323e0938db7b9072821ed249e855ea308b078..357b33f4dd5173295e1e56b2adb4153a639c542d 100644
--- a/Rendering/Core/vtkLightKit.h
+++ b/Rendering/Core/vtkLightKit.h
@@ -104,7 +104,7 @@ class VTKRENDERINGCORE_EXPORT vtkLightKit : public vtkObject
public:
static vtkLightKit *New();
vtkTypeMacro(vtkLightKit, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
enum LightKitType {
TKeyLight,
@@ -299,7 +299,7 @@ public:
void DeepCopy(vtkLightKit *kit);
- void Modified() VTK_OVERRIDE;
+ void Modified() override;
void Update();
/**
@@ -327,7 +327,7 @@ public:
protected:
vtkLightKit();
- ~vtkLightKit() VTK_OVERRIDE;
+ ~vtkLightKit() override;
void WarmthToRGBI(double w, double rgb[3], double& i);
void WarmthToRGB(double w, double rgb[3]);
diff --git a/Rendering/Core/vtkLogLookupTable.h b/Rendering/Core/vtkLogLookupTable.h
index c1dd266a7b47acf218693f259d2091a89f96efa0..4225f93f099c431f7bea4016c66fca7eb41074b7 100644
--- a/Rendering/Core/vtkLogLookupTable.h
+++ b/Rendering/Core/vtkLogLookupTable.h
@@ -35,11 +35,11 @@ public:
static vtkLogLookupTable *New();
vtkTypeMacro(vtkLogLookupTable, vtkLookupTable);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkLogLookupTable(int sze = 256, int ext = 256);
- ~vtkLogLookupTable() VTK_OVERRIDE {}
+ ~vtkLogLookupTable() override {}
private:
vtkLogLookupTable(const vtkLogLookupTable&) VTK_DELETE_FUNCTION;
void operator=(const vtkLogLookupTable&) VTK_DELETE_FUNCTION;
diff --git a/Rendering/Core/vtkLookupTableWithEnabling.h b/Rendering/Core/vtkLookupTableWithEnabling.h
index 55cb9ca78b7045f522286550be944046edcafc33..53f08dfe4483e70c34e5c8b2c1966243520e5754 100644
--- a/Rendering/Core/vtkLookupTableWithEnabling.h
+++ b/Rendering/Core/vtkLookupTableWithEnabling.h
@@ -44,7 +44,7 @@ public:
static vtkLookupTableWithEnabling *New();
vtkTypeMacro(vtkLookupTableWithEnabling,vtkLookupTable);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -62,7 +62,7 @@ public:
*/
void MapScalarsThroughTable2(void *input, unsigned char *output,
int inputDataType, int numberOfValues,
- int inputIncrement, int outputIncrement) VTK_OVERRIDE;
+ int inputIncrement, int outputIncrement) override;
/**
* A convenience method for taking a color and desaturating it.
@@ -72,7 +72,7 @@ public:
protected:
vtkLookupTableWithEnabling(int sze=256, int ext=256);
- ~vtkLookupTableWithEnabling() VTK_OVERRIDE;
+ ~vtkLookupTableWithEnabling() override;
vtkDataArray *EnabledArray;
diff --git a/Rendering/Core/vtkMapArrayValues.h b/Rendering/Core/vtkMapArrayValues.h
index f3de03b916e6e60b9ce5ec85957d7087b38ceeef..ac1c223f86df5fad1e6a4bfff3b6b986c7ff91aa 100644
--- a/Rendering/Core/vtkMapArrayValues.h
+++ b/Rendering/Core/vtkMapArrayValues.h
@@ -49,7 +49,7 @@ class VTKRENDERINGCORE_EXPORT vtkMapArrayValues : public vtkPassInputTypeAlgorit
{
public:
vtkTypeMacro(vtkMapArrayValues,vtkPassInputTypeAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkMapArrayValues *New();
@@ -145,10 +145,10 @@ public:
protected:
vtkMapArrayValues();
- ~vtkMapArrayValues() VTK_OVERRIDE;
+ ~vtkMapArrayValues() override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int, vtkInformation *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int FillInputPortInformation(int, vtkInformation *) override;
char* InputArrayName;
char* OutputArrayName;
diff --git a/Rendering/Core/vtkMapper.h b/Rendering/Core/vtkMapper.h
index 802007cc46602757126be414c0681033d4389e19..9e8ba91aaaddbe2b0a9bfa7339f7b1e91c897bbf 100644
--- a/Rendering/Core/vtkMapper.h
+++ b/Rendering/Core/vtkMapper.h
@@ -86,7 +86,7 @@ class VTKRENDERINGCORE_EXPORT vtkMapper : public vtkAbstractMapper3D
{
public:
vtkTypeMacro(vtkMapper, vtkAbstractMapper3D);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Make a shallow copy of this mapper.
@@ -97,7 +97,7 @@ public:
* Overload standard modified time function. If lookup table is modified,
* then this object is modified as well.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
/**
* Method initiates the mapping process. Generally sent by the actor
@@ -110,7 +110,7 @@ public:
* The parameter window could be used to determine which graphic
* resources to release.
*/
- void ReleaseGraphicsResources(vtkWindow *) VTK_OVERRIDE {}
+ void ReleaseGraphicsResources(vtkWindow *) override {}
//@{
/**
@@ -471,8 +471,8 @@ public:
* Return bounding box (array of six doubles) of data expressed as
* (xmin,xmax, ymin,ymax, zmin,zmax).
*/
- double *GetBounds() VTK_OVERRIDE;
- void GetBounds(double bounds[6]) VTK_OVERRIDE
+ double *GetBounds() override;
+ void GetBounds(double bounds[6]) override
{ this->vtkAbstractMapper3D::GetBounds(bounds); }
/**
@@ -585,7 +585,7 @@ public:
protected:
vtkMapper();
- ~vtkMapper() VTK_OVERRIDE;
+ ~vtkMapper() override;
// color mapped colors
vtkUnsignedCharArray *Colors;
diff --git a/Rendering/Core/vtkMapper2D.h b/Rendering/Core/vtkMapper2D.h
index 5ad504bb38ef4d69deff9df59075cb1cab9ebaab..c4aabfb60ea45934ff15c4dd3035620f8349df3a 100644
--- a/Rendering/Core/vtkMapper2D.h
+++ b/Rendering/Core/vtkMapper2D.h
@@ -36,7 +36,7 @@ class VTKRENDERINGCORE_EXPORT vtkMapper2D : public vtkAbstractMapper
{
public:
vtkTypeMacro(vtkMapper2D, vtkAbstractMapper);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
virtual void RenderOverlay(vtkViewport*, vtkActor2D*) {}
virtual void RenderOpaqueGeometry(vtkViewport*, vtkActor2D*) {}
@@ -45,7 +45,7 @@ public:
protected:
vtkMapper2D() {}
- ~vtkMapper2D() VTK_OVERRIDE {}
+ ~vtkMapper2D() override {}
private:
vtkMapper2D(const vtkMapper2D&) VTK_DELETE_FUNCTION;
diff --git a/Rendering/Core/vtkMapperCollection.h b/Rendering/Core/vtkMapperCollection.h
index 819c861f8c6f934462767434bd119e9a695fe939..7bd13aa427623ce0234d372b6f7bac1820ada189 100644
--- a/Rendering/Core/vtkMapperCollection.h
+++ b/Rendering/Core/vtkMapperCollection.h
@@ -37,7 +37,7 @@ class VTKRENDERINGCORE_EXPORT vtkMapperCollection : public vtkCollection
public:
static vtkMapperCollection *New();
vtkTypeMacro(vtkMapperCollection, vtkCollection);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Add an mapper to the bottom of the list.
@@ -66,7 +66,7 @@ class VTKRENDERINGCORE_EXPORT vtkMapperCollection : public vtkCollection
protected:
vtkMapperCollection() {}
- ~vtkMapperCollection() VTK_OVERRIDE {}
+ ~vtkMapperCollection() override {}
private:
// hide the standard AddItem from the user and the compiler.
diff --git a/Rendering/Core/vtkObserverMediator.h b/Rendering/Core/vtkObserverMediator.h
index 171ea7f1b560c36b9fb5e4bc7665bbcdc1463a6c..9245cbb31ada0c1d80456ca4e77068442cfe7659 100644
--- a/Rendering/Core/vtkObserverMediator.h
+++ b/Rendering/Core/vtkObserverMediator.h
@@ -52,7 +52,7 @@ public:
* Standard macros.
*/
vtkTypeMacro(vtkObserverMediator,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -78,7 +78,7 @@ public:
protected:
vtkObserverMediator();
- ~vtkObserverMediator() VTK_OVERRIDE;
+ ~vtkObserverMediator() override;
// The render window whose cursor we are controlling
vtkRenderWindowInteractor *Interactor;
diff --git a/Rendering/Core/vtkPainterDeviceAdapter.h b/Rendering/Core/vtkPainterDeviceAdapter.h
index 7494f3cafb4183f2ed78293bc2b9a6f57f9145d0..e0799a2415b0355ea8c5da42245ff3a2083a649f 100644
--- a/Rendering/Core/vtkPainterDeviceAdapter.h
+++ b/Rendering/Core/vtkPainterDeviceAdapter.h
@@ -57,7 +57,7 @@ class VTKRENDERINGCORE_EXPORT vtkPainterDeviceAdapter : public vtkObject
public:
static vtkPainterDeviceAdapter* New();
vtkTypeMacro(vtkPainterDeviceAdapter, vtkObject);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
/**
* Signals the start of sending a primitive to the graphics card. The
@@ -190,7 +190,7 @@ public:
protected:
vtkPainterDeviceAdapter();
- ~vtkPainterDeviceAdapter() VTK_OVERRIDE;
+ ~vtkPainterDeviceAdapter() override;
private:
vtkPainterDeviceAdapter(const vtkPainterDeviceAdapter &) VTK_DELETE_FUNCTION;
diff --git a/Rendering/Core/vtkPicker.h b/Rendering/Core/vtkPicker.h
index ac29b6e05fd3799fee08292c538ae8e5ed0e8632..ce385abf9d98e74dd27e76d304aec32255817232 100644
--- a/Rendering/Core/vtkPicker.h
+++ b/Rendering/Core/vtkPicker.h
@@ -57,7 +57,7 @@ class VTKRENDERINGCORE_EXPORT vtkPicker : public vtkAbstractPropPicker
public:
static vtkPicker *New();
vtkTypeMacro(vtkPicker, vtkAbstractPropPicker);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -138,7 +138,7 @@ public:
* picked.
*/
int Pick(double selectionX, double selectionY, double selectionZ,
- vtkRenderer *renderer) VTK_OVERRIDE;
+ vtkRenderer *renderer) override;
/**
* Perform pick operation with selection point provided. Normally the first
@@ -153,18 +153,18 @@ public:
* selectionPt is in world coordinates.
* Return non-zero if something was successfully picked.
*/
- int Pick3DPoint(double selectionPt[3], vtkRenderer *ren) VTK_OVERRIDE;
+ int Pick3DPoint(double selectionPt[3], vtkRenderer *ren) override;
/**
* Perform pick operation with selection point and orientaion provided.
* The selectionPt is in world coordinates.
* Return non-zero if something was successfully picked.
*/
- int Pick3DRay(double selectionPt[3], double orient[4], vtkRenderer *ren) VTK_OVERRIDE;
+ int Pick3DRay(double selectionPt[3], double orient[4], vtkRenderer *ren) override;
protected:
vtkPicker();
- ~vtkPicker() VTK_OVERRIDE;
+ ~vtkPicker() override;
// shared code for picking
virtual int Pick3DInternal(vtkRenderer *ren, double p1World[4], double p2World[4]);
@@ -177,7 +177,7 @@ protected:
virtual double IntersectWithLine(double p1[3], double p2[3], double tol,
vtkAssemblyPath *path, vtkProp3D *p,
vtkAbstractMapper3D *m);
- void Initialize() VTK_OVERRIDE;
+ void Initialize() override;
static bool CalculateRay(double p1[3], double p2[3],
double ray[3], double &rayFactor);
diff --git a/Rendering/Core/vtkPickingManager.h b/Rendering/Core/vtkPickingManager.h
index 3bd8f883dd319dfcad18716421cc2554bdbf12a3..3d64b803ab2e4451f4588c8334a75d9de27ce440 100644
--- a/Rendering/Core/vtkPickingManager.h
+++ b/Rendering/Core/vtkPickingManager.h
@@ -84,7 +84,7 @@ class VTKRENDERINGCORE_EXPORT vtkPickingManager : public vtkObject
public:
static vtkPickingManager *New();
vtkTypeMacro(vtkPickingManager,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -190,7 +190,7 @@ public:
protected:
vtkPickingManager();
- ~vtkPickingManager() VTK_OVERRIDE;
+ ~vtkPickingManager() override;
// Used to associate the manager with the interactor
vtkRenderWindowInteractor* Interactor;
diff --git a/Rendering/Core/vtkPointGaussianMapper.h b/Rendering/Core/vtkPointGaussianMapper.h
index aceff38c3e49e8a3e34b1ff10601e0d9bb88410f..11c1d1870bba36ddd2481207bf9ca434406b3a1e 100644
--- a/Rendering/Core/vtkPointGaussianMapper.h
+++ b/Rendering/Core/vtkPointGaussianMapper.h
@@ -36,7 +36,7 @@ class VTKRENDERINGCORE_EXPORT vtkPointGaussianMapper : public vtkPolyDataMapper
public:
static vtkPointGaussianMapper* New();
vtkTypeMacro(vtkPointGaussianMapper, vtkPolyDataMapper)
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -163,7 +163,7 @@ public:
protected:
vtkPointGaussianMapper();
- ~vtkPointGaussianMapper() VTK_OVERRIDE;
+ ~vtkPointGaussianMapper() override;
char *ScaleArray;
int ScaleArrayComponent;
diff --git a/Rendering/Core/vtkPointPicker.h b/Rendering/Core/vtkPointPicker.h
index db21ea735681f747ff3edaf5477e23266faddf72..1194faf99e053ae782d27319acffb7b01198de36 100644
--- a/Rendering/Core/vtkPointPicker.h
+++ b/Rendering/Core/vtkPointPicker.h
@@ -43,7 +43,7 @@ class VTKRENDERINGCORE_EXPORT vtkPointPicker : public vtkPicker
public:
static vtkPointPicker *New();
vtkTypeMacro(vtkPointPicker,vtkPicker);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -64,15 +64,15 @@ public:
protected:
vtkPointPicker();
- ~vtkPointPicker() VTK_OVERRIDE {}
+ ~vtkPointPicker() override {}
vtkIdType PointId; //picked point
int UseCells; // Use cell points vs. points directly
double IntersectWithLine(double p1[3], double p2[3], double tol,
vtkAssemblyPath *path, vtkProp3D *p,
- vtkAbstractMapper3D *m) VTK_OVERRIDE;
- void Initialize() VTK_OVERRIDE;
+ vtkAbstractMapper3D *m) override;
+ void Initialize() override;
vtkIdType IntersectDataSetWithLine(double p1[3], double ray[3],
double rayFactor, double tol,
diff --git a/Rendering/Core/vtkPolyDataMapper.h b/Rendering/Core/vtkPolyDataMapper.h
index 75ad34df20cb8f92be5ab997f62e76ceee697f98..93c26d3a4b42d4e637fc4f7930667a54625ad793 100644
--- a/Rendering/Core/vtkPolyDataMapper.h
+++ b/Rendering/Core/vtkPolyDataMapper.h
@@ -38,7 +38,7 @@ class VTKRENDERINGCORE_EXPORT vtkPolyDataMapper : public vtkMapper
public:
static vtkPolyDataMapper *New();
vtkTypeMacro(vtkPolyDataMapper, vtkMapper);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Implemented by sub classes. Actual rendering is done here.
@@ -48,7 +48,7 @@ public:
/**
* This calls RenderPiece (in a for loop if streaming is necessary).
*/
- void Render(vtkRenderer *ren, vtkActor *act) VTK_OVERRIDE;
+ void Render(vtkRenderer *ren, vtkActor *act) override;
//@{
/**
@@ -62,10 +62,10 @@ public:
/**
* Bring this algorithm's outputs up-to-date.
*/
- void Update(int port) VTK_OVERRIDE;
- void Update() VTK_OVERRIDE;
- int Update(int port, vtkInformationVector* requests) VTK_OVERRIDE;
- int Update(vtkInformation* requests) VTK_OVERRIDE;
+ void Update(int port) override;
+ void Update() override;
+ int Update(int port, vtkInformationVector* requests) override;
+ int Update(vtkInformation* requests) override;
//@}
//@{
@@ -92,8 +92,8 @@ public:
* Return bounding box (array of six doubles) of data expressed as
* (xmin,xmax, ymin,ymax, zmin,zmax).
*/
- double *GetBounds() VTK_OVERRIDE;
- void GetBounds(double bounds[6]) VTK_OVERRIDE
+ double *GetBounds() override;
+ void GetBounds(double bounds[6]) override
{ this->Superclass::GetBounds(bounds); }
/**
@@ -135,11 +135,11 @@ public:
*/
int ProcessRequest(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
protected:
vtkPolyDataMapper();
- ~vtkPolyDataMapper() VTK_OVERRIDE {}
+ ~vtkPolyDataMapper() override {}
/**
* Called in GetBounds(). When this method is called, the consider the input
@@ -153,7 +153,7 @@ protected:
int NumberOfSubPieces;
int GhostLevel;
- int FillInputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
+ int FillInputPortInformation(int, vtkInformation*) override;
private:
vtkPolyDataMapper(const vtkPolyDataMapper&) VTK_DELETE_FUNCTION;
diff --git a/Rendering/Core/vtkPolyDataMapper2D.h b/Rendering/Core/vtkPolyDataMapper2D.h
index 164c6a8bbf9b9ea5fb2914a08ee1480c1af06257..ddb95f44046f31196818e1f2b8d03826a3ddb4ed 100644
--- a/Rendering/Core/vtkPolyDataMapper2D.h
+++ b/Rendering/Core/vtkPolyDataMapper2D.h
@@ -47,7 +47,7 @@ class VTKRENDERINGCORE_EXPORT vtkPolyDataMapper2D : public vtkMapper2D
public:
vtkTypeMacro(vtkPolyDataMapper2D,vtkMapper2D);
static vtkPolyDataMapper2D *New();
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -177,7 +177,7 @@ public:
* Overload standard modified time function. If lookup table is modified,
* then this object is modified as well.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
//@{
/**
@@ -216,9 +216,9 @@ public:
protected:
vtkPolyDataMapper2D();
- ~vtkPolyDataMapper2D() VTK_OVERRIDE;
+ ~vtkPolyDataMapper2D() override;
- int FillInputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
+ int FillInputPortInformation(int, vtkInformation*) override;
vtkUnsignedCharArray *Colors;
diff --git a/Rendering/Core/vtkProp.h b/Rendering/Core/vtkProp.h
index 9ae912c3ec388cb63de658c90c6131c1452d1a3c..0357b1d3ed1826b29e82576ee3358fe4674b2485 100644
--- a/Rendering/Core/vtkProp.h
+++ b/Rendering/Core/vtkProp.h
@@ -45,7 +45,7 @@ class VTKRENDERINGCORE_EXPORT vtkProp : public vtkObject
{
public:
vtkTypeMacro(vtkProp, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* For some exporters and other other operations we must be
@@ -424,7 +424,7 @@ public:
protected:
vtkProp();
- ~vtkProp() VTK_OVERRIDE;
+ ~vtkProp() override;
int Visibility;
int Pickable;
diff --git a/Rendering/Core/vtkProp3D.h b/Rendering/Core/vtkProp3D.h
index d6864be303715cba736d4364e106c4e1549f0285..9ec7b731b178d0e8ca71b0d96f9d700928e0919c 100644
--- a/Rendering/Core/vtkProp3D.h
+++ b/Rendering/Core/vtkProp3D.h
@@ -44,12 +44,12 @@ class VTKRENDERINGCORE_EXPORT vtkProp3D : public vtkProp
{
public:
vtkTypeMacro(vtkProp3D,vtkProp);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Shallow copy of this vtkProp3D.
*/
- void ShallowCopy(vtkProp *prop) VTK_OVERRIDE;
+ void ShallowCopy(vtkProp *prop) override;
//@{
/**
@@ -181,7 +181,7 @@ public:
* Get the bounds for this Prop3D as (Xmin,Xmax,Ymin,Ymax,Zmin,Zmax).
*/
void GetBounds(double bounds[6]);
- double *GetBounds() VTK_OVERRIDE = 0;
+ double *GetBounds() override = 0;
//@}
/**
@@ -300,18 +300,18 @@ public:
* vtkProp3D will be restored. This method is used to support
* picking and assembly structures.
*/
- void PokeMatrix(vtkMatrix4x4 *matrix) VTK_OVERRIDE;
+ void PokeMatrix(vtkMatrix4x4 *matrix) override;
/**
* Overload vtkProp's method for setting up assembly paths. See
* the documentation for vtkProp.
*/
- void InitPathTraversal() VTK_OVERRIDE;
+ void InitPathTraversal() override;
/**
* Get the vtkProp3D's mtime
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
/**
* Get the modified time of the user matrix or user transform.
@@ -327,7 +327,7 @@ public:
/**
* Get a pointer to an internal vtkMatrix4x4. that represents
*/
- vtkMatrix4x4 *GetMatrix() VTK_OVERRIDE
+ vtkMatrix4x4 *GetMatrix() override
{
this->ComputeMatrix();
return this->Matrix;
@@ -343,7 +343,7 @@ public:
protected:
vtkProp3D();
- ~vtkProp3D() VTK_OVERRIDE;
+ ~vtkProp3D() override;
vtkLinearTransform *UserTransform;
vtkMatrix4x4 *UserMatrix;
diff --git a/Rendering/Core/vtkProp3DCollection.h b/Rendering/Core/vtkProp3DCollection.h
index c3f0bc3b9ad64f7b7e4a7eb5207f510604faa1d0..c4f3298666c28f678abde09c8929465178cfec64 100644
--- a/Rendering/Core/vtkProp3DCollection.h
+++ b/Rendering/Core/vtkProp3DCollection.h
@@ -36,7 +36,7 @@ class VTKRENDERINGCORE_EXPORT vtkProp3DCollection : public vtkPropCollection
public:
static vtkProp3DCollection *New();
vtkTypeMacro(vtkProp3DCollection,vtkPropCollection);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Add an actor to the bottom of the list.
@@ -64,7 +64,7 @@ public:
protected:
vtkProp3DCollection() {}
- ~vtkProp3DCollection() VTK_OVERRIDE {}
+ ~vtkProp3DCollection() override {}
private:
diff --git a/Rendering/Core/vtkProp3DFollower.h b/Rendering/Core/vtkProp3DFollower.h
index d7fb64a640af7d2621abb3481cba06231dd1ce0a..b746e02d76b1268f15028e67583b7aaa47837432 100644
--- a/Rendering/Core/vtkProp3DFollower.h
+++ b/Rendering/Core/vtkProp3DFollower.h
@@ -54,7 +54,7 @@ class VTKRENDERINGCORE_EXPORT vtkProp3DFollower : public vtkProp3D
* Standard VTK methods for type and printing.
*/
vtkTypeMacro(vtkProp3DFollower,vtkProp3D);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -80,49 +80,49 @@ class VTKRENDERINGCORE_EXPORT vtkProp3DFollower : public vtkProp3D
* property, texture map and then mapper. If a property hasn't been
* assigned, then the actor will create one automatically.
*/
- int RenderOpaqueGeometry(vtkViewport *viewport) VTK_OVERRIDE;
- int RenderTranslucentPolygonalGeometry(vtkViewport *viewport) VTK_OVERRIDE;
- int RenderVolumetricGeometry(vtkViewport *viewport) VTK_OVERRIDE;
+ int RenderOpaqueGeometry(vtkViewport *viewport) override;
+ int RenderTranslucentPolygonalGeometry(vtkViewport *viewport) override;
+ int RenderVolumetricGeometry(vtkViewport *viewport) override;
//@}
/**
* Does this prop have some translucent polygonal geometry?
*/
- int HasTranslucentPolygonalGeometry() VTK_OVERRIDE;
+ int HasTranslucentPolygonalGeometry() override;
/**
* Release any graphics resources associated with this vtkProp3DFollower.
*/
- void ReleaseGraphicsResources(vtkWindow*) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow*) override;
/**
* Generate the matrix based on ivars. This method overloads its superclasses
* ComputeMatrix() method due to the special vtkProp3DFollower matrix operations.
*/
- void ComputeMatrix() VTK_OVERRIDE;
+ void ComputeMatrix() override;
/**
* Shallow copy of a follower. Overloads the virtual vtkProp method.
*/
- void ShallowCopy(vtkProp *prop) VTK_OVERRIDE;
+ void ShallowCopy(vtkProp *prop) override;
/**
* Return the bounds of this vtkProp3D.
*/
- double *GetBounds() VTK_OVERRIDE;
+ double *GetBounds() override;
//@{
/**
* Overload vtkProp's method for setting up assembly paths. See
* the documentation for vtkProp.
*/
- void InitPathTraversal() VTK_OVERRIDE;
- vtkAssemblyPath *GetNextPath() VTK_OVERRIDE;
+ void InitPathTraversal() override;
+ vtkAssemblyPath *GetNextPath() override;
//@}
protected:
vtkProp3DFollower();
- ~vtkProp3DFollower() VTK_OVERRIDE;
+ ~vtkProp3DFollower() override;
vtkCamera *Camera;
vtkProp3D *Device;
diff --git a/Rendering/Core/vtkPropAssembly.h b/Rendering/Core/vtkPropAssembly.h
index c19f9921a5caced5819ba43d096475dd4254938d..7cf647c048fa27e9438b0f5e9e7edea15e4a3502 100644
--- a/Rendering/Core/vtkPropAssembly.h
+++ b/Rendering/Core/vtkPropAssembly.h
@@ -51,7 +51,7 @@ class VTKRENDERINGCORE_EXPORT vtkPropAssembly : public vtkProp
{
public:
vtkTypeMacro(vtkPropAssembly,vtkProp);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Create with an empty parts list.
@@ -79,40 +79,40 @@ public:
* recursive. The parts of each assembly are rendered only if the
* visibility for the prop is turned on.
*/
- int RenderOpaqueGeometry(vtkViewport *ren) VTK_OVERRIDE;
- int RenderTranslucentPolygonalGeometry( vtkViewport *ren) VTK_OVERRIDE;
- int RenderVolumetricGeometry( vtkViewport *ren) VTK_OVERRIDE;
- int RenderOverlay(vtkViewport *ren) VTK_OVERRIDE;
+ int RenderOpaqueGeometry(vtkViewport *ren) override;
+ int RenderTranslucentPolygonalGeometry( vtkViewport *ren) override;
+ int RenderVolumetricGeometry( vtkViewport *ren) override;
+ int RenderOverlay(vtkViewport *ren) override;
//@}
/**
* Does this prop have some translucent polygonal geometry?
*/
- int HasTranslucentPolygonalGeometry() VTK_OVERRIDE;
+ int HasTranslucentPolygonalGeometry() override;
/**
* Release any graphics resources that are being consumed by this actor.
* The parameter window could be used to determine which graphic
* resources to release.
*/
- void ReleaseGraphicsResources(vtkWindow *) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *) override;
/**
* Get the bounds for this prop assembly as (Xmin,Xmax,Ymin,Ymax,Zmin,Zmax).
* May return NULL in some cases (meaning the bounds is undefined).
*/
- double *GetBounds() VTK_OVERRIDE;
+ double *GetBounds() override;
/**
* Shallow copy of this vtkPropAssembly.
*/
- void ShallowCopy(vtkProp *Prop) VTK_OVERRIDE;
+ void ShallowCopy(vtkProp *Prop) override;
/**
* Override default GetMTime method to also consider all of the
* prop assembly's parts.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
//@{
/**
@@ -125,9 +125,9 @@ public:
* when the list is exhausted. (See the superclass vtkProp for more
* information about paths.)
*/
- void InitPathTraversal() VTK_OVERRIDE;
- vtkAssemblyPath *GetNextPath() VTK_OVERRIDE;
- int GetNumberOfPaths() VTK_OVERRIDE;
+ void InitPathTraversal() override;
+ vtkAssemblyPath *GetNextPath() override;
+ int GetNumberOfPaths() override;
//@}
/**
@@ -135,11 +135,11 @@ public:
* DO NOT USE THIS METHOD OUTSIDE OF THE RENDERING PROCESS
* Overload the superclass' vtkProp BuildPaths() method.
*/
- void BuildPaths(vtkAssemblyPaths *paths, vtkAssemblyPath *path) VTK_OVERRIDE;
+ void BuildPaths(vtkAssemblyPaths *paths, vtkAssemblyPath *path) override;
protected:
vtkPropAssembly();
- ~vtkPropAssembly() VTK_OVERRIDE;
+ ~vtkPropAssembly() override;
vtkPropCollection *Parts;
double Bounds[6];
diff --git a/Rendering/Core/vtkPropCollection.h b/Rendering/Core/vtkPropCollection.h
index 57d334ab7e333398d05a7e93517961bd9451a202..c8e228ea0ca40106e3bab6e15d3680c428b71a5d 100644
--- a/Rendering/Core/vtkPropCollection.h
+++ b/Rendering/Core/vtkPropCollection.h
@@ -70,7 +70,7 @@ class VTKRENDERINGCORE_EXPORT vtkPropCollection : public vtkCollection
protected:
vtkPropCollection() {}
- ~vtkPropCollection() VTK_OVERRIDE {}
+ ~vtkPropCollection() override {}
private:
diff --git a/Rendering/Core/vtkPropPicker.h b/Rendering/Core/vtkPropPicker.h
index a7c8676097900dbea4ffa3852f832e85ca109bdd..4318325fe6b227713a7bb6cf666c6088cfa450f9 100644
--- a/Rendering/Core/vtkPropPicker.h
+++ b/Rendering/Core/vtkPropPicker.h
@@ -42,7 +42,7 @@ public:
static vtkPropPicker *New();
vtkTypeMacro(vtkPropPicker, vtkAbstractPropPicker);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Perform the pick and set the PickedProp ivar. If something is picked, a
@@ -63,7 +63,7 @@ public:
* override superclasses' Pick() method.
*/
int Pick(double selectionX, double selectionY, double selectionZ,
- vtkRenderer *renderer) VTK_OVERRIDE;
+ vtkRenderer *renderer) override;
int Pick(double selectionPt[3], vtkRenderer *renderer)
{ return this->Pick( selectionPt[0],
selectionPt[1], selectionPt[2], renderer); }
@@ -73,7 +73,7 @@ public:
* selectionPt is in world coordinates.
* Return non-zero if something was successfully picked.
*/
- int Pick3DPoint(double selectionPt[3], vtkRenderer *ren) VTK_OVERRIDE;
+ int Pick3DPoint(double selectionPt[3], vtkRenderer *ren) override;
/**
* Perform the pick and set the PickedProp ivar. If something is picked, a
@@ -92,9 +92,9 @@ public:
protected:
vtkPropPicker();
- ~vtkPropPicker() VTK_OVERRIDE;
+ ~vtkPropPicker() override;
- void Initialize() VTK_OVERRIDE;
+ void Initialize() override;
vtkPropCollection* PickFromProps;
diff --git a/Rendering/Core/vtkProperty.h b/Rendering/Core/vtkProperty.h
index 089a8e36f344f46545cd65e3a260c11056032523..f1e498873770140846986458f7a2a69f3953f6e0 100644
--- a/Rendering/Core/vtkProperty.h
+++ b/Rendering/Core/vtkProperty.h
@@ -60,7 +60,7 @@ class VTKRENDERINGCORE_EXPORT vtkProperty : public vtkObject
{
public:
vtkTypeMacro(vtkProperty,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct object with object color, ambient color, diffuse color,
@@ -494,7 +494,7 @@ public:
protected:
vtkProperty();
- ~vtkProperty() VTK_OVERRIDE;
+ ~vtkProperty() override;
/**
* Computes composite color. Used by GetColor().
diff --git a/Rendering/Core/vtkProperty2D.h b/Rendering/Core/vtkProperty2D.h
index febb685979e63ff9463a077437cfee47a090e363..9e027cf5160e13b79f25d812d907255827372c11 100644
--- a/Rendering/Core/vtkProperty2D.h
+++ b/Rendering/Core/vtkProperty2D.h
@@ -38,7 +38,7 @@ class VTKRENDERINGCORE_EXPORT vtkProperty2D : public vtkObject
{
public:
vtkTypeMacro(vtkProperty2D,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Creates a vtkProperty2D with the following default values:
@@ -131,7 +131,7 @@ public:
protected:
vtkProperty2D();
- ~vtkProperty2D() VTK_OVERRIDE;
+ ~vtkProperty2D() override;
double Color[3];
double Opacity;
diff --git a/Rendering/Core/vtkRenderPass.h b/Rendering/Core/vtkRenderPass.h
index dffcd12dc076b56fbfd172dd0770deb652805edf..06e89f6a10f9a4c240c4fe9242c8c4b1f06a0f56 100644
--- a/Rendering/Core/vtkRenderPass.h
+++ b/Rendering/Core/vtkRenderPass.h
@@ -56,7 +56,7 @@ class VTKRENDERINGCORE_EXPORT vtkRenderPass : public vtkObject
{
public:
vtkTypeMacro(vtkRenderPass,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Perform rendering according to a render state \p s.
@@ -88,7 +88,7 @@ class VTKRENDERINGCORE_EXPORT vtkRenderPass : public vtkObject
/**
* Destructor. Do nothing.
*/
- ~vtkRenderPass() VTK_OVERRIDE;
+ ~vtkRenderPass() override;
/**
* Call UpdateCamera() on Renderer. This ugly mechanism gives access to
diff --git a/Rendering/Core/vtkRenderTimerLog.h b/Rendering/Core/vtkRenderTimerLog.h
index 9de877ec0170c9498cfbe194d87d1710d95ba3ba..19c1274c9b040f35c76a7508736ad4c3d17e2d4f 100644
--- a/Rendering/Core/vtkRenderTimerLog.h
+++ b/Rendering/Core/vtkRenderTimerLog.h
@@ -158,7 +158,7 @@ public:
static vtkRenderTimerLog* New();
vtkTypeMacro(vtkRenderTimerLog, vtkObject)
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
/**
* Returns true if stream timings are implemented for the current graphics
diff --git a/Rendering/Core/vtkRenderWidget.h b/Rendering/Core/vtkRenderWidget.h
index 44c953686d5253cee9eb67bcd7039a5fb493d8dc..0ac92cd1f9bb002c4921b418fbfae9f9ab83e27d 100644
--- a/Rendering/Core/vtkRenderWidget.h
+++ b/Rendering/Core/vtkRenderWidget.h
@@ -27,7 +27,7 @@ class VTKRENDERINGCORE_EXPORT vtkRenderWidget : public vtkObject
{
public:
vtkTypeMacro(vtkRenderWidget ,vtkObject)
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkRenderWidget* New();
/**
@@ -84,7 +84,7 @@ public:
protected:
vtkRenderWidget();
- ~vtkRenderWidget() VTK_OVERRIDE;
+ ~vtkRenderWidget() override;
vtkVector2i Position; // Position of the widget in screen coordinates.
vtkVector2i Size; // Position of the widget in screen coordinates.
diff --git a/Rendering/Core/vtkRenderWindow.h b/Rendering/Core/vtkRenderWindow.h
index 94f9f76fc4741a71ee3991d88fdd64a9c4fcfa46..5877f83130ed8a351aa62b61e6379fab1bc2f036 100644
--- a/Rendering/Core/vtkRenderWindow.h
+++ b/Rendering/Core/vtkRenderWindow.h
@@ -83,7 +83,7 @@ class VTKRENDERINGCORE_EXPORT vtkRenderWindow : public vtkWindow
{
public:
vtkTypeMacro(vtkRenderWindow,vtkWindow);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Construct an instance of vtkRenderWindow with its screen size
@@ -147,7 +147,7 @@ public:
* Ask each renderer owned by this RenderWindow to render its image and
* synchronize this process.
*/
- void Render() VTK_OVERRIDE;
+ void Render() override;
/**
* Initialize the rendering process.
@@ -588,24 +588,24 @@ public:
* This Method detects loops of RenderWindow<->Interactor,
* so objects are freed properly.
*/
- void UnRegister(vtkObjectBase *o) VTK_OVERRIDE;
+ void UnRegister(vtkObjectBase *o) override;
//@{
/**
* Dummy stubs for vtkWindow API.
*/
- void SetDisplayId(void *) VTK_OVERRIDE = 0;
- void SetWindowId(void *) VTK_OVERRIDE = 0;
+ void SetDisplayId(void *) override = 0;
+ void SetWindowId(void *) override = 0;
virtual void SetNextWindowId(void *) = 0;
- void SetParentId(void *) VTK_OVERRIDE = 0;
- void *GetGenericDisplayId() VTK_OVERRIDE = 0;
- void *GetGenericWindowId() VTK_OVERRIDE = 0;
- void *GetGenericParentId() VTK_OVERRIDE = 0;
- void *GetGenericContext() VTK_OVERRIDE = 0;
- void *GetGenericDrawable() VTK_OVERRIDE = 0;
- void SetWindowInfo(char *) VTK_OVERRIDE = 0;
+ void SetParentId(void *) override = 0;
+ void *GetGenericDisplayId() override = 0;
+ void *GetGenericWindowId() override = 0;
+ void *GetGenericParentId() override = 0;
+ void *GetGenericContext() override = 0;
+ void *GetGenericDrawable() override = 0;
+ void SetWindowInfo(char *) override = 0;
virtual void SetNextWindowInfo(char *) = 0;
- void SetParentInfo(char *) VTK_OVERRIDE = 0;
+ void SetParentInfo(char *) override = 0;
//@}
/**
@@ -618,7 +618,7 @@ public:
* Attempt to make this window the current graphics context for the calling
* thread.
*/
- void MakeCurrent() VTK_OVERRIDE = 0;
+ void MakeCurrent() override = 0;
/**
* Tells if this window is the current graphics context for the calling
@@ -736,7 +736,7 @@ public:
protected:
vtkRenderWindow();
- ~vtkRenderWindow() VTK_OVERRIDE;
+ ~vtkRenderWindow() override;
virtual void DoStereoRender();
virtual void DoFDRender();
diff --git a/Rendering/Core/vtkRenderWindowCollection.h b/Rendering/Core/vtkRenderWindowCollection.h
index 452192e74a5372b98c84eb498ba7d024c4bce6df..52de46006bfad2dbb3a8cc811e94369018df0835 100644
--- a/Rendering/Core/vtkRenderWindowCollection.h
+++ b/Rendering/Core/vtkRenderWindowCollection.h
@@ -36,7 +36,7 @@ class VTKRENDERINGCORE_EXPORT vtkRenderWindowCollection : public vtkCollection
public:
static vtkRenderWindowCollection *New();
vtkTypeMacro(vtkRenderWindowCollection,vtkCollection);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Add a RenderWindow to the bottom of the list.
@@ -66,7 +66,7 @@ class VTKRENDERINGCORE_EXPORT vtkRenderWindowCollection : public vtkCollection
protected:
vtkRenderWindowCollection() {}
- ~vtkRenderWindowCollection() VTK_OVERRIDE {}
+ ~vtkRenderWindowCollection() override {}
private:
// hide the standard AddItem from the user and the compiler.
diff --git a/Rendering/Core/vtkRenderWindowInteractor.h b/Rendering/Core/vtkRenderWindowInteractor.h
index 70796e96e0086a39a6258a199519c3eca61b9f5f..dbd1387a71e6d37dda0d060f249c0da9516a969a 100644
--- a/Rendering/Core/vtkRenderWindowInteractor.h
+++ b/Rendering/Core/vtkRenderWindowInteractor.h
@@ -77,7 +77,7 @@ class VTKRENDERINGCORE_EXPORT vtkRenderWindowInteractor : public vtkObject
public:
static vtkRenderWindowInteractor *New();
vtkTypeMacro(vtkRenderWindowInteractor,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -96,7 +96,7 @@ public:
* This Method detects loops of RenderWindow-Interactor,
* so objects are freed properly.
*/
- void UnRegister(vtkObjectBase *o) VTK_OVERRIDE;
+ void UnRegister(vtkObjectBase *o) override;
/**
* Start the event loop. This is provided so that you do not have to
@@ -787,7 +787,7 @@ public:
protected:
vtkRenderWindowInteractor();
- ~vtkRenderWindowInteractor() VTK_OVERRIDE;
+ ~vtkRenderWindowInteractor() override;
vtkRenderWindow *RenderWindow;
vtkInteractorObserver *InteractorStyle;
diff --git a/Rendering/Core/vtkRenderWindowInteractor3D.h b/Rendering/Core/vtkRenderWindowInteractor3D.h
index 45e7b6bb2a8fa76a4596fdddd0ede29508bf2fe9..8890805a7e381f296d9da0d0bd526abc11a6c77e 100644
--- a/Rendering/Core/vtkRenderWindowInteractor3D.h
+++ b/Rendering/Core/vtkRenderWindowInteractor3D.h
@@ -43,7 +43,7 @@ public:
static vtkRenderWindowInteractor3D *New();
vtkTypeMacro(vtkRenderWindowInteractor3D,vtkRenderWindowInteractor);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -55,8 +55,8 @@ public:
* and all other interactors associated with the widget are disabled
* when their data is not displayed.
*/
- void Enable() VTK_OVERRIDE;
- void Disable() VTK_OVERRIDE;
+ void Enable() override;
+ void Disable() override;
//@}
/**
@@ -64,7 +64,7 @@ public:
* calls PostQuitMessage(0) to terminate the application. An application can Specify
* ExitMethod for alternative behavior (i.e. suppression of keyboard exit)
*/
- void TerminateApp(void) VTK_OVERRIDE;
+ void TerminateApp(void) override;
//@{
/**
@@ -213,16 +213,16 @@ public:
/**
* Override to set pointers down
*/
- void RightButtonPressEvent() VTK_OVERRIDE;
- void RightButtonReleaseEvent() VTK_OVERRIDE;
+ void RightButtonPressEvent() override;
+ void RightButtonReleaseEvent() override;
//@}
//@{
/**
* Override to set pointers down
*/
- void MiddleButtonPressEvent() VTK_OVERRIDE;
- void MiddleButtonReleaseEvent() VTK_OVERRIDE;
+ void MiddleButtonPressEvent() override;
+ void MiddleButtonReleaseEvent() override;
//@}
//@{
@@ -260,7 +260,7 @@ public:
protected:
vtkRenderWindowInteractor3D();
- ~vtkRenderWindowInteractor3D() VTK_OVERRIDE;
+ ~vtkRenderWindowInteractor3D() override;
int MouseInWindow;
int StartedMessageLoop;
@@ -277,7 +277,7 @@ protected:
double StartingPhysicalEventPositions[VTKI_MAX_POINTERS][3];
double WorldEventOrientations[VTKI_MAX_POINTERS][4];
double LastWorldEventOrientations[VTKI_MAX_POINTERS][4];
- void RecognizeGesture(vtkCommand::EventIds) VTK_OVERRIDE;
+ void RecognizeGesture(vtkCommand::EventIds) override;
private:
vtkRenderWindowInteractor3D(const vtkRenderWindowInteractor3D&) VTK_DELETE_FUNCTION; // Not implemented.
diff --git a/Rendering/Core/vtkRenderedAreaPicker.h b/Rendering/Core/vtkRenderedAreaPicker.h
index e0fb16757ba70acbb192625bc3dcd8b11757687d..026b5ef0c3132834a3a94b5ee9e709337ec2f173 100644
--- a/Rendering/Core/vtkRenderedAreaPicker.h
+++ b/Rendering/Core/vtkRenderedAreaPicker.h
@@ -42,18 +42,18 @@ class VTKRENDERINGCORE_EXPORT vtkRenderedAreaPicker : public vtkAreaPicker
public:
static vtkRenderedAreaPicker *New();
vtkTypeMacro(vtkRenderedAreaPicker, vtkAreaPicker);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Perform pick operation in volume behind the given screen coordinates.
* Props intersecting the selection frustum will be accessible via GetProp3D.
* GetPlanes returns a vtkImplicitFunction suitable for vtkExtractGeometry.
*/
- int AreaPick(double x0, double y0, double x1, double y1, vtkRenderer *) VTK_OVERRIDE;
+ int AreaPick(double x0, double y0, double x1, double y1, vtkRenderer *) override;
protected:
vtkRenderedAreaPicker();
- ~vtkRenderedAreaPicker() VTK_OVERRIDE;
+ ~vtkRenderedAreaPicker() override;
private:
vtkRenderedAreaPicker(const vtkRenderedAreaPicker&) VTK_DELETE_FUNCTION;
diff --git a/Rendering/Core/vtkRenderer.h b/Rendering/Core/vtkRenderer.h
index 1d9656ba82b39b81e6f3628ac077c46c1b423941..518c523c36dd0bc906e1cfda46a87b4304a4df09 100644
--- a/Rendering/Core/vtkRenderer.h
+++ b/Rendering/Core/vtkRenderer.h
@@ -58,7 +58,7 @@ class VTKRENDERINGCORE_EXPORT vtkRenderer : public vtkViewport
{
public:
vtkTypeMacro(vtkRenderer,vtkViewport);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Create a vtkRenderer with a black background, a white ambient light,
@@ -412,7 +412,7 @@ public:
*/
void SetRenderWindow(vtkRenderWindow *);
vtkRenderWindow *GetRenderWindow() {return this->RenderWindow;};
- vtkWindow *GetVTKWindow() VTK_OVERRIDE;
+ vtkWindow *GetVTKWindow() override;
//@}
//@{
@@ -489,20 +489,20 @@ public:
/**
* Convert world point coordinates to view coordinates.
*/
- void WorldToView() VTK_OVERRIDE;
+ void WorldToView() override;
//@{
/**
* Convert view point coordinates to world coordinates.
*/
- void ViewToWorld() VTK_OVERRIDE;
- void ViewToWorld(double &wx, double &wy, double &wz) VTK_OVERRIDE;
+ void ViewToWorld() override;
+ void ViewToWorld(double &wx, double &wy, double &wz) override;
//@}
/**
* Convert world point coordinates to view coordinates.
*/
- void WorldToView(double &wx, double &wy, double &wz) VTK_OVERRIDE;
+ void WorldToView(double &wx, double &wy, double &wz) override;
/**
* Given a pixel location, return the Z value. The z value is
@@ -513,7 +513,7 @@ public:
/**
* Return the MTime of the renderer also considering its ivars.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
//@{
/**
@@ -540,12 +540,12 @@ public:
* If nothing was picked then NULL is returned. This method selects from
* the renderers Prop list.
*/
- vtkAssemblyPath* PickProp(double selectionX, double selectionY) VTK_OVERRIDE
+ vtkAssemblyPath* PickProp(double selectionX, double selectionY) override
{
return this->PickProp(selectionX, selectionY, selectionX, selectionY);
}
vtkAssemblyPath* PickProp(double selectionX1, double selectionY1,
- double selectionX2, double selectionY2) VTK_OVERRIDE;
+ double selectionX2, double selectionY2) override;
//@}
/**
@@ -724,7 +724,7 @@ public:
protected:
vtkRenderer();
- ~vtkRenderer() VTK_OVERRIDE;
+ ~vtkRenderer() override;
// internal method for doing a render for picking purposes
virtual void PickRender(vtkPropCollection *props);
diff --git a/Rendering/Core/vtkRendererCollection.h b/Rendering/Core/vtkRendererCollection.h
index 7526b1dcefd1c6528849c9bb758b6b963cacf682..4551f37cd11f6ce45cd5ad8d7dcbfb18ab75ef06 100644
--- a/Rendering/Core/vtkRendererCollection.h
+++ b/Rendering/Core/vtkRendererCollection.h
@@ -36,7 +36,7 @@ class VTKRENDERINGCORE_EXPORT vtkRendererCollection : public vtkCollection
public:
static vtkRendererCollection *New();
vtkTypeMacro(vtkRendererCollection, vtkCollection);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Add a Renderer to the bottom of the list.
@@ -72,7 +72,7 @@ public:
protected:
vtkRendererCollection() {}
- ~vtkRendererCollection() VTK_OVERRIDE {}
+ ~vtkRendererCollection() override {}
private:
// hide the standard AddItem from the user and the compiler.
diff --git a/Rendering/Core/vtkRendererDelegate.h b/Rendering/Core/vtkRendererDelegate.h
index e5265e2656a3d1f3adec6698c620dd83adec1376..edd0c9740547d6be97581698776f19065faa5d05 100644
--- a/Rendering/Core/vtkRendererDelegate.h
+++ b/Rendering/Core/vtkRendererDelegate.h
@@ -38,7 +38,7 @@ class VTKRENDERINGCORE_EXPORT vtkRendererDelegate : public vtkObject
{
public:
vtkTypeMacro(vtkRendererDelegate,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Render the props of vtkRenderer if Used is on.
@@ -57,7 +57,7 @@ public:
protected:
vtkRendererDelegate();
- ~vtkRendererDelegate() VTK_OVERRIDE;
+ ~vtkRendererDelegate() override;
bool Used;
diff --git a/Rendering/Core/vtkRendererSource.h b/Rendering/Core/vtkRendererSource.h
index 1a3d16a443d88587fabe30ddb4c0d9e4b2172c29..7e8ed3bf3a4ca106dae2b0394255c7790816926d 100644
--- a/Rendering/Core/vtkRendererSource.h
+++ b/Rendering/Core/vtkRendererSource.h
@@ -58,12 +58,12 @@ class VTKRENDERINGCORE_EXPORT vtkRendererSource : public vtkAlgorithm
public:
static vtkRendererSource *New();
vtkTypeMacro(vtkRendererSource, vtkAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Return the MTime also considering the Renderer.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
/**
* Indicates what renderer to get the pixel data from.
@@ -143,11 +143,11 @@ public:
*/
int ProcessRequest(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
protected:
vtkRendererSource();
- ~vtkRendererSource() VTK_OVERRIDE;
+ ~vtkRendererSource() override;
void RequestData(vtkInformation* request,
vtkInformationVector** inputVector,
@@ -164,7 +164,7 @@ protected:
int DepthValuesOnly;
// see algorithm for more info
- int FillOutputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillOutputPortInformation(int port, vtkInformation* info) override;
private:
vtkRendererSource(const vtkRendererSource&) VTK_DELETE_FUNCTION;
diff --git a/Rendering/Core/vtkScenePicker.cxx b/Rendering/Core/vtkScenePicker.cxx
index 250c606984ce02fc2591f1e64ba910e15cb8ed67..3139ed55224c5291087883c33524851bc491858b 100644
--- a/Rendering/Core/vtkScenePicker.cxx
+++ b/Rendering/Core/vtkScenePicker.cxx
@@ -32,7 +32,7 @@ public:
return new vtkScenePickerSelectionRenderCommand;
}
- void Execute(vtkObject *vtkNotUsed(o), unsigned long event, void*) VTK_OVERRIDE
+ void Execute(vtkObject *vtkNotUsed(o), unsigned long event, void*) override
{
if (event == vtkCommand::StartInteractionEvent)
{
@@ -55,7 +55,7 @@ public:
protected:
vtkScenePickerSelectionRenderCommand()
: InteractiveRender(false) {}
- ~vtkScenePickerSelectionRenderCommand() VTK_OVERRIDE {}
+ ~vtkScenePickerSelectionRenderCommand() override {}
bool InteractiveRender;
};
diff --git a/Rendering/Core/vtkScenePicker.h b/Rendering/Core/vtkScenePicker.h
index abb7519ab5bf6c275aebfe017c46f94854e954cb..30c11cacd37788972268052f11fb24a1d4dd362c 100644
--- a/Rendering/Core/vtkScenePicker.h
+++ b/Rendering/Core/vtkScenePicker.h
@@ -61,7 +61,7 @@ class VTKRENDERINGCORE_EXPORT vtkScenePicker : public vtkObject
public:
static vtkScenePicker* New();
vtkTypeMacro(vtkScenePicker, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -105,7 +105,7 @@ public:
protected:
vtkScenePicker();
- ~vtkScenePicker() VTK_OVERRIDE;
+ ~vtkScenePicker() override;
// Pick render entire viewport
// Automatically invoked from vtkRenderer at the end of a still render.
diff --git a/Rendering/Core/vtkSelectVisiblePoints.h b/Rendering/Core/vtkSelectVisiblePoints.h
index 163c317b1be1660b6d28bb21ca02fde80c8588b1..f30d527c74fa7c53432aed3d1abf187b8be59e66 100644
--- a/Rendering/Core/vtkSelectVisiblePoints.h
+++ b/Rendering/Core/vtkSelectVisiblePoints.h
@@ -55,7 +55,7 @@ class VTKRENDERINGCORE_EXPORT vtkSelectVisiblePoints : public vtkPolyDataAlgorit
{
public:
vtkTypeMacro(vtkSelectVisiblePoints, vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Instantiate object with no renderer; window selection turned off;
@@ -134,14 +134,14 @@ public:
/**
* Return MTime also considering the renderer.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
protected:
vtkSelectVisiblePoints();
- ~vtkSelectVisiblePoints() VTK_OVERRIDE;
+ ~vtkSelectVisiblePoints() override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
vtkRenderer *Renderer;
vtkMatrix4x4 *CompositePerspectiveTransform;
diff --git a/Rendering/Core/vtkShaderDeviceAdapter2.h b/Rendering/Core/vtkShaderDeviceAdapter2.h
index 449859f170359032d3bf326bd19e0fd21f2749ad..12e77037120112278b5a37fc52c9879b05e93318 100644
--- a/Rendering/Core/vtkShaderDeviceAdapter2.h
+++ b/Rendering/Core/vtkShaderDeviceAdapter2.h
@@ -35,7 +35,7 @@ class VTKRENDERINGCORE_EXPORT vtkShaderDeviceAdapter2 : public vtkObject
{
public:
vtkTypeMacro(vtkShaderDeviceAdapter2, vtkObject);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
/**
* Sends a single attribute to the graphics card.
@@ -70,7 +70,7 @@ public:
protected:
vtkShaderDeviceAdapter2();
- ~vtkShaderDeviceAdapter2() VTK_OVERRIDE;
+ ~vtkShaderDeviceAdapter2() override;
vtkShaderProgram2* ShaderProgram;
diff --git a/Rendering/Core/vtkSkybox.h b/Rendering/Core/vtkSkybox.h
index d2044a4508a2cf214f1af6f20ce2c9b008fd5366..beacbe1c9c0945793c8b1b1cd60edd2ead3d2cf9 100644
--- a/Rendering/Core/vtkSkybox.h
+++ b/Rendering/Core/vtkSkybox.h
@@ -30,18 +30,18 @@ class VTKRENDERINGCORE_EXPORT vtkSkybox: public vtkActor
public:
static vtkSkybox* New();
vtkTypeMacro(vtkSkybox, vtkActor)
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
/**
* Get the bounds for this Actor as (Xmin,Xmax,Ymin,Ymax,Zmin,Zmax). (The
* method GetBounds(double bounds[6]) is available from the superclass.)
*/
using Superclass::GetBounds;
- double *GetBounds() VTK_OVERRIDE;
+ double *GetBounds() override;
protected:
vtkSkybox();
- ~vtkSkybox() VTK_OVERRIDE;
+ ~vtkSkybox() override;
private:
vtkSkybox(const vtkSkybox&) VTK_DELETE_FUNCTION;
diff --git a/Rendering/Core/vtkStringToImage.h b/Rendering/Core/vtkStringToImage.h
index cb76b6c41310ccc32f02eb4c7818904bf8a518a3..a073d7be6eb875a64736d39c3f52132356d5daf2 100644
--- a/Rendering/Core/vtkStringToImage.h
+++ b/Rendering/Core/vtkStringToImage.h
@@ -38,7 +38,7 @@ class VTKRENDERINGCORE_EXPORT vtkStringToImage : public vtkObject
{
public:
vtkTypeMacro(vtkStringToImage, vtkObject);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
//@{
/**
@@ -87,7 +87,7 @@ public:
protected:
vtkStringToImage();
- ~vtkStringToImage() VTK_OVERRIDE;
+ ~vtkStringToImage() override;
bool Antialias;
bool ScaleToPowerOfTwo;
diff --git a/Rendering/Core/vtkTDxInteractorStyle.h b/Rendering/Core/vtkTDxInteractorStyle.h
index 1b9d449b48b12dfd169f4c4c7b72b7b3a68e635a..e9ef5201196ddd1f211257423ea2d60c8d610d54 100644
--- a/Rendering/Core/vtkTDxInteractorStyle.h
+++ b/Rendering/Core/vtkTDxInteractorStyle.h
@@ -43,7 +43,7 @@ class VTKRENDERINGCORE_EXPORT vtkTDxInteractorStyle : public vtkObject
{
public:
vtkTypeMacro(vtkTDxInteractorStyle,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Action on motion event. Default implementation is empty.
@@ -85,7 +85,7 @@ public:
protected:
vtkTDxInteractorStyle();
- ~vtkTDxInteractorStyle() VTK_OVERRIDE;
+ ~vtkTDxInteractorStyle() override;
vtkTDxInteractorStyleSettings *Settings;
diff --git a/Rendering/Core/vtkTDxInteractorStyleCamera.h b/Rendering/Core/vtkTDxInteractorStyleCamera.h
index aece9c1912102c5fd61a17da714fc1f0511226a0..5a351a991051fe21d94fc1709afd5b997a75a3e0 100644
--- a/Rendering/Core/vtkTDxInteractorStyleCamera.h
+++ b/Rendering/Core/vtkTDxInteractorStyleCamera.h
@@ -38,17 +38,17 @@ class VTKRENDERINGCORE_EXPORT vtkTDxInteractorStyleCamera : public vtkTDxInterac
public:
static vtkTDxInteractorStyleCamera *New();
vtkTypeMacro(vtkTDxInteractorStyleCamera,vtkTDxInteractorStyle);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Action on motion event.
* \pre: motionInfo_exist: motionInfo!=0
*/
- void OnMotionEvent(vtkTDxMotionEventInfo *motionInfo) VTK_OVERRIDE;
+ void OnMotionEvent(vtkTDxMotionEventInfo *motionInfo) override;
protected:
vtkTDxInteractorStyleCamera();
- ~vtkTDxInteractorStyleCamera() VTK_OVERRIDE;
+ ~vtkTDxInteractorStyleCamera() override;
vtkTransform *Transform; // Used for internal intermediate calculation.
diff --git a/Rendering/Core/vtkTDxInteractorStyleSettings.h b/Rendering/Core/vtkTDxInteractorStyleSettings.h
index 8216040738e474c3c698de6b1d1528a2242d8d6d..4f452536b3661d0f4aa5df139560f373bd780501 100644
--- a/Rendering/Core/vtkTDxInteractorStyleSettings.h
+++ b/Rendering/Core/vtkTDxInteractorStyleSettings.h
@@ -36,7 +36,7 @@ class VTKRENDERINGCORE_EXPORT vtkTDxInteractorStyleSettings : public vtkObject
public:
static vtkTDxInteractorStyleSettings *New();
vtkTypeMacro(vtkTDxInteractorStyleSettings,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -118,7 +118,7 @@ public:
protected:
vtkTDxInteractorStyleSettings();
- ~vtkTDxInteractorStyleSettings() VTK_OVERRIDE;
+ ~vtkTDxInteractorStyleSettings() override;
double AngleSensitivity;
bool UseRotationX;
diff --git a/Rendering/Core/vtkTextActor.h b/Rendering/Core/vtkTextActor.h
index 6e9087c5b1ab408658a2d353dd6004327b30e8eb..f867ed9296c3b52db67c13c2a08cf054b27ca1b3 100644
--- a/Rendering/Core/vtkTextActor.h
+++ b/Rendering/Core/vtkTextActor.h
@@ -51,7 +51,7 @@ class VTKRENDERINGCORE_EXPORT vtkTextActor : public vtkTexturedActor2D
{
public:
vtkTypeMacro(vtkTextActor,vtkTexturedActor2D);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Instantiate object with a rectangle in normaled view coordinates
@@ -63,7 +63,7 @@ public:
* Shallow copy of this text actor. Overloads the virtual
* vtkProp method.
*/
- void ShallowCopy(vtkProp *prop) VTK_OVERRIDE;
+ void ShallowCopy(vtkProp *prop) override;
//@{
/**
@@ -262,7 +262,7 @@ public:
* The parameter window could be used to determine which graphic
* resources to release.
*/
- void ReleaseGraphicsResources(vtkWindow *) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *) override;
//@{
/**
@@ -270,15 +270,15 @@ public:
* DO NOT USE THIS METHOD OUTSIDE OF THE RENDERING PROCESS.
* Draw the text actor to the screen.
*/
- int RenderOpaqueGeometry(vtkViewport* viewport) VTK_OVERRIDE;
- int RenderTranslucentPolygonalGeometry(vtkViewport* ) VTK_OVERRIDE {return 0;};
- int RenderOverlay(vtkViewport* viewport) VTK_OVERRIDE;
+ int RenderOpaqueGeometry(vtkViewport* viewport) override;
+ int RenderTranslucentPolygonalGeometry(vtkViewport* ) override {return 0;};
+ int RenderOverlay(vtkViewport* viewport) override;
//@}
/**
* Does this prop have some translucent polygonal geometry?
*/
- int HasTranslucentPolygonalGeometry() VTK_OVERRIDE;
+ int HasTranslucentPolygonalGeometry() override;
protected:
/**
@@ -293,7 +293,7 @@ protected:
vtkTextProperty *tprop, vtkViewport *viewport, int bbox[4]);
vtkTextActor();
- ~vtkTextActor() VTK_OVERRIDE;
+ ~vtkTextActor() override;
int MinimumSize[2];
float MaximumLineHeight;
diff --git a/Rendering/Core/vtkTextActor3D.h b/Rendering/Core/vtkTextActor3D.h
index b688f9481f6dc46fb1954c097b0dc92dab7a5308..4523425cce379f30cb59540ff0b04b1745d87348 100644
--- a/Rendering/Core/vtkTextActor3D.h
+++ b/Rendering/Core/vtkTextActor3D.h
@@ -46,7 +46,7 @@ class VTKRENDERINGCORE_EXPORT vtkTextActor3D : public vtkProp3D
public:
static vtkTextActor3D *New();
vtkTypeMacro(vtkTextActor3D,vtkProp3D);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -76,12 +76,12 @@ public:
* Shallow copy of this text actor. Overloads the virtual
* vtkProp method.
*/
- void ShallowCopy(vtkProp *prop) VTK_OVERRIDE;
+ void ShallowCopy(vtkProp *prop) override;
/**
* Get the bounds for this Prop3D as (Xmin,Xmax,Ymin,Ymax,Zmin,Zmax).
*/
- double *GetBounds() VTK_OVERRIDE;
+ double *GetBounds() override;
void GetBounds(double bounds[6]) {this->vtkProp3D::GetBounds( bounds );}
/**
@@ -98,7 +98,7 @@ public:
* The parameter window could be used to determine which graphic
* resources to release.
*/
- void ReleaseGraphicsResources(vtkWindow *) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *) override;
/**
* Force the actor to render during the opaque or translucent pass.
@@ -120,19 +120,19 @@ public:
* DO NOT USE THIS METHOD OUTSIDE OF THE RENDERING PROCESS.
* Draw the text actor to the screen.
*/
- int RenderOpaqueGeometry(vtkViewport* viewport) VTK_OVERRIDE;
- int RenderTranslucentPolygonalGeometry(vtkViewport* viewport) VTK_OVERRIDE;
- int RenderOverlay(vtkViewport* viewport) VTK_OVERRIDE;
+ int RenderOpaqueGeometry(vtkViewport* viewport) override;
+ int RenderTranslucentPolygonalGeometry(vtkViewport* viewport) override;
+ int RenderOverlay(vtkViewport* viewport) override;
//@}
/**
* Does this prop have some translucent polygonal geometry?
*/
- int HasTranslucentPolygonalGeometry() VTK_OVERRIDE;
+ int HasTranslucentPolygonalGeometry() override;
protected:
vtkTextActor3D();
- ~vtkTextActor3D() VTK_OVERRIDE;
+ ~vtkTextActor3D() override;
char *Input;
diff --git a/Rendering/Core/vtkTextMapper.h b/Rendering/Core/vtkTextMapper.h
index fd6b05da88cd4a5b5fbef66a0771eb3477b3c134..edf21dea492e0f65d7e4728b85d16383f6fd6576 100644
--- a/Rendering/Core/vtkTextMapper.h
+++ b/Rendering/Core/vtkTextMapper.h
@@ -48,7 +48,7 @@ class VTKRENDERINGCORE_EXPORT vtkTextMapper : public vtkMapper2D
{
public:
vtkTypeMacro(vtkTextMapper,vtkMapper2D);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Creates a new text mapper.
@@ -123,13 +123,13 @@ public:
int *stringSize, float sizeFactor);
//@}
- void RenderOverlay(vtkViewport *, vtkActor2D *) VTK_OVERRIDE;
- void ReleaseGraphicsResources(vtkWindow *) VTK_OVERRIDE;
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ void RenderOverlay(vtkViewport *, vtkActor2D *) override;
+ void ReleaseGraphicsResources(vtkWindow *) override;
+ vtkMTimeType GetMTime() override;
protected:
vtkTextMapper();
- ~vtkTextMapper() VTK_OVERRIDE;
+ ~vtkTextMapper() override;
char* Input;
vtkTextProperty *TextProperty;
diff --git a/Rendering/Core/vtkTextProperty.h b/Rendering/Core/vtkTextProperty.h
index c5b9dbe02a62fd9376ad6d36d3149cffc9cc3f23..c7d0c2befdd3f763134b0e5d0839db401611e954 100644
--- a/Rendering/Core/vtkTextProperty.h
+++ b/Rendering/Core/vtkTextProperty.h
@@ -34,7 +34,7 @@ class VTKRENDERINGCORE_EXPORT vtkTextProperty : public vtkObject
{
public:
vtkTypeMacro(vtkTextProperty,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Creates a new text property with font size 12, bold off, italic off,
@@ -256,7 +256,7 @@ public:
protected:
vtkTextProperty();
- ~vtkTextProperty() VTK_OVERRIDE;
+ ~vtkTextProperty() override;
double Color[3];
double Opacity;
diff --git a/Rendering/Core/vtkTextPropertyCollection.h b/Rendering/Core/vtkTextPropertyCollection.h
index a355b7d634c8ff380991843792cbfed211f1c2d9..66f0b81d3771044e034b600af225aa43c995af70 100644
--- a/Rendering/Core/vtkTextPropertyCollection.h
+++ b/Rendering/Core/vtkTextPropertyCollection.h
@@ -35,7 +35,7 @@ class VTKRENDERINGCORE_EXPORT vtkTextPropertyCollection : public vtkCollection
public:
static vtkTextPropertyCollection *New();
vtkTypeMacro(vtkTextPropertyCollection, vtkCollection)
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Add a vtkTextProperty to the bottom of the list.
@@ -65,7 +65,7 @@ class VTKRENDERINGCORE_EXPORT vtkTextPropertyCollection : public vtkCollection
protected:
vtkTextPropertyCollection();
- ~vtkTextPropertyCollection() VTK_OVERRIDE;
+ ~vtkTextPropertyCollection() override;
private:
// hide the standard AddItem from the user and the compiler.
diff --git a/Rendering/Core/vtkTextRenderer.h b/Rendering/Core/vtkTextRenderer.h
index 91b01b4930c265423cde98941bb4fc7ac3a34c95..a05ea10fd3cad44041a33056bf7734d668e4a856 100644
--- a/Rendering/Core/vtkTextRenderer.h
+++ b/Rendering/Core/vtkTextRenderer.h
@@ -114,7 +114,7 @@ public:
};
vtkTypeMacro(vtkTextRenderer, vtkObject)
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
/**
* This is a singleton pattern New. There will be only ONE reference
@@ -296,7 +296,7 @@ public:
protected:
vtkTextRenderer();
- ~vtkTextRenderer() VTK_OVERRIDE;
+ ~vtkTextRenderer() override;
//@{
/**
diff --git a/Rendering/Core/vtkTexture.h b/Rendering/Core/vtkTexture.h
index 59c823d8a8a2e1975fde1a5a0e1d42f9c048e185..3f406e0379bac53eefdefce251ba6054a7415472 100644
--- a/Rendering/Core/vtkTexture.h
+++ b/Rendering/Core/vtkTexture.h
@@ -67,7 +67,7 @@ class VTKRENDERINGCORE_EXPORT vtkTexture : public vtkImageAlgorithm
public:
static vtkTexture* New();
vtkTypeMacro(vtkTexture, vtkImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Renders a texture map. It first checks the object's modified time
@@ -311,11 +311,11 @@ public:
protected:
vtkTexture();
- ~vtkTexture() VTK_OVERRIDE;
+ ~vtkTexture() override;
// A texture is a sink, so there is no need to do anything.
// This definition avoids a warning when doing Update() on a vtkTexture object.
- void ExecuteData(vtkDataObject *) VTK_OVERRIDE
+ void ExecuteData(vtkDataObject *) override
{
}
diff --git a/Rendering/Core/vtkTexturedActor2D.h b/Rendering/Core/vtkTexturedActor2D.h
index 7b01a2818e766df2b408c4677fdb6966dfbce9cd..ba49de3b2dd75b92393127e250232859930f49ef 100644
--- a/Rendering/Core/vtkTexturedActor2D.h
+++ b/Rendering/Core/vtkTexturedActor2D.h
@@ -39,7 +39,7 @@ class VTKRENDERINGCORE_EXPORT vtkTexturedActor2D : public vtkActor2D
{
public:
static vtkTexturedActor2D* New();
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
vtkTypeMacro(vtkTexturedActor2D, vtkActor2D);
//@{
@@ -57,30 +57,30 @@ public:
* The parameter window could be used to determine which graphic
* resources to release.
*/
- void ReleaseGraphicsResources(vtkWindow* win) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow* win) override;
//@{
/**
* Support the standard render methods.
*/
- int RenderOverlay(vtkViewport* viewport) VTK_OVERRIDE;
- int RenderOpaqueGeometry(vtkViewport* viewport) VTK_OVERRIDE;
- int RenderTranslucentPolygonalGeometry(vtkViewport* viewport) VTK_OVERRIDE;
+ int RenderOverlay(vtkViewport* viewport) override;
+ int RenderOpaqueGeometry(vtkViewport* viewport) override;
+ int RenderTranslucentPolygonalGeometry(vtkViewport* viewport) override;
//@}
/**
* Return this object's modified time.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
/**
* Shallow copy of this vtkTexturedActor2D. Overrides vtkActor2D method.
*/
- void ShallowCopy(vtkProp* prop) VTK_OVERRIDE;
+ void ShallowCopy(vtkProp* prop) override;
protected:
vtkTexturedActor2D();
- ~vtkTexturedActor2D() VTK_OVERRIDE;
+ ~vtkTexturedActor2D() override;
vtkTexture* Texture;
diff --git a/Rendering/Core/vtkTransformCoordinateSystems.h b/Rendering/Core/vtkTransformCoordinateSystems.h
index 5b6439652442c55a62bf3e2d6052b11cfce19907..3a482681c0ac07d0996cab8df8f96b04e9269ecd 100644
--- a/Rendering/Core/vtkTransformCoordinateSystems.h
+++ b/Rendering/Core/vtkTransformCoordinateSystems.h
@@ -40,7 +40,7 @@ public:
* Standard methods for type information and printing.
*/
vtkTypeMacro(vtkTransformCoordinateSystems, vtkPointSetAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
@@ -84,7 +84,7 @@ public:
/**
* Return the MTime also considering the instance of vtkCoordinate.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
//@{
/**
@@ -100,9 +100,9 @@ public:
protected:
vtkTransformCoordinateSystems();
- ~vtkTransformCoordinateSystems() VTK_OVERRIDE;
+ ~vtkTransformCoordinateSystems() override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
int InputCoordinateSystem;
int OutputCoordinateSystem;
diff --git a/Rendering/Core/vtkTransformInterpolator.h b/Rendering/Core/vtkTransformInterpolator.h
index 059ff52822ab4a450bed717535d48a27c5a8421c..b5059dda8f70fef923404cb7e7f127aecd91380a 100644
--- a/Rendering/Core/vtkTransformInterpolator.h
+++ b/Rendering/Core/vtkTransformInterpolator.h
@@ -66,7 +66,7 @@ class VTKRENDERINGCORE_EXPORT vtkTransformInterpolator : public vtkObject
{
public:
vtkTypeMacro(vtkTransformInterpolator, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Instantiate the class.
@@ -186,11 +186,11 @@ public:
* Override GetMTime() because we depend on the interpolators which may be
* modified outside of this class.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
protected:
vtkTransformInterpolator();
- ~vtkTransformInterpolator() VTK_OVERRIDE;
+ ~vtkTransformInterpolator() override;
// Control the interpolation type
int InterpolationType;
diff --git a/Rendering/Core/vtkTupleInterpolator.h b/Rendering/Core/vtkTupleInterpolator.h
index 99ee53c802301cbb711c596033d9e744fa91e132..fcf87f90fd86e1bdb7f5e13b67c2424d31f4a71f 100644
--- a/Rendering/Core/vtkTupleInterpolator.h
+++ b/Rendering/Core/vtkTupleInterpolator.h
@@ -55,7 +55,7 @@ class VTKRENDERINGCORE_EXPORT vtkTupleInterpolator : public vtkObject
{
public:
vtkTypeMacro(vtkTupleInterpolator, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Instantiate the class.
@@ -156,7 +156,7 @@ public:
protected:
vtkTupleInterpolator();
- ~vtkTupleInterpolator() VTK_OVERRIDE;
+ ~vtkTupleInterpolator() override;
// The number of components being interpolated
int NumberOfComponents;
diff --git a/Rendering/Core/vtkViewDependentErrorMetric.h b/Rendering/Core/vtkViewDependentErrorMetric.h
index d920c17a0b45b0ece5c8cb215d622b074e5b469f..05c1cd0db42dae91c9ac843731e781778087f3ad 100644
--- a/Rendering/Core/vtkViewDependentErrorMetric.h
+++ b/Rendering/Core/vtkViewDependentErrorMetric.h
@@ -49,7 +49,7 @@ public:
* Standard VTK type and error macros.
*/
vtkTypeMacro(vtkViewDependentErrorMetric,vtkGenericSubdivisionErrorMetric);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -104,7 +104,7 @@ public:
* =GetAttributeCollection()->GetNumberOfPointCenteredComponents()+6
*/
int RequiresEdgeSubdivision(double *leftPoint, double *midPoint, double *rightPoint,
- double alpha) VTK_OVERRIDE;
+ double alpha) override;
/**
* Return the error at the mid-point. The type of error depends on the state
@@ -120,11 +120,11 @@ public:
* \post positive_result: result>=0
*/
double GetError(double *leftPoint, double *midPoint,
- double *rightPoint, double alpha) VTK_OVERRIDE;
+ double *rightPoint, double alpha) override;
protected:
vtkViewDependentErrorMetric();
- ~vtkViewDependentErrorMetric() VTK_OVERRIDE;
+ ~vtkViewDependentErrorMetric() override;
/**
* Square distance between a straight line (defined by points x and y)
diff --git a/Rendering/Core/vtkViewport.h b/Rendering/Core/vtkViewport.h
index ea0c2409493619c5d13dedc61be24bb18a3c13b5..54327d7caec2d80ac1009fe7c687e53f401fe7cd 100644
--- a/Rendering/Core/vtkViewport.h
+++ b/Rendering/Core/vtkViewport.h
@@ -45,7 +45,7 @@ class VTKRENDERINGCORE_EXPORT vtkViewport : public vtkObject
{
public:
vtkTypeMacro(vtkViewport,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Add a prop to the list of props. Does nothing if the prop is
@@ -331,7 +331,7 @@ protected:
// two-sided lighting turned on, a viewport of (0,0,1,1), and back face
// culling turned off.
vtkViewport();
- ~vtkViewport() VTK_OVERRIDE;
+ ~vtkViewport() override;
// Picking functions to be implemented by sub-classes
// Perform the main picking loop
diff --git a/Rendering/Core/vtkVisibilitySort.h b/Rendering/Core/vtkVisibilitySort.h
index 1d15dbe5904d857c20ae13834c30ec700110d2e3..46804309c324c45b7bf14aa5c7a3405ee1300c6e 100644
--- a/Rendering/Core/vtkVisibilitySort.h
+++ b/Rendering/Core/vtkVisibilitySort.h
@@ -58,7 +58,7 @@ class VTKRENDERINGCORE_EXPORT vtkVisibilitySort : public vtkObject
{
public:
vtkTypeMacro(vtkVisibilitySort, vtkObject);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
//@{
/**
@@ -130,13 +130,13 @@ public:
/**
* Overwritten to enable garbage collection.
*/
- void Register(vtkObjectBase *o) VTK_OVERRIDE;
- void UnRegister(vtkObjectBase *o) VTK_OVERRIDE;
+ void Register(vtkObjectBase *o) override;
+ void UnRegister(vtkObjectBase *o) override;
//@}
protected:
vtkVisibilitySort();
- ~vtkVisibilitySort() VTK_OVERRIDE;
+ ~vtkVisibilitySort() override;
vtkTimeStamp LastSortTime;
@@ -149,7 +149,7 @@ protected:
int Direction;
- void ReportReferences(vtkGarbageCollector *collector) VTK_OVERRIDE;
+ void ReportReferences(vtkGarbageCollector *collector) override;
private:
vtkVisibilitySort(const vtkVisibilitySort &) VTK_DELETE_FUNCTION;
diff --git a/Rendering/Core/vtkVolume.h b/Rendering/Core/vtkVolume.h
index e162056e94cfd1bdcde6915fea36ca437bd4d68a..8a03436ce0438cf46bbda068a47cd0d9e31fc5da 100644
--- a/Rendering/Core/vtkVolume.h
+++ b/Rendering/Core/vtkVolume.h
@@ -45,7 +45,7 @@ class VTKRENDERINGCORE_EXPORT vtkVolume : public vtkProp3D
{
public:
vtkTypeMacro(vtkVolume, vtkProp3D);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Creates a Volume with the following defaults: origin(0,0,0)
@@ -75,7 +75,7 @@ public:
* able to collect all the actors or volumes. This method
* is used in that process.
*/
- void GetVolumes(vtkPropCollection *vc) VTK_OVERRIDE;
+ void GetVolumes(vtkPropCollection *vc) override;
/**
* Update the volume rendering pipeline by updating the volume mapper
@@ -87,7 +87,7 @@ public:
* Get the bounds - either all six at once
* (xmin, xmax, ymin, ymax, zmin, zmax) or one at a time.
*/
- double *GetBounds() VTK_OVERRIDE;
+ double *GetBounds() override;
void GetBounds(double bounds[6])
{ this->vtkProp3D::GetBounds(bounds); }
double GetMinXBound();
@@ -101,7 +101,7 @@ public:
/**
* Return the MTime also considering the property etc.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
/**
* Return the mtime of anything that would cause the rendered image to
@@ -109,12 +109,12 @@ public:
* prop plus anything else it depends on such as properties, mappers,
* etc.
*/
- vtkMTimeType GetRedrawMTime() VTK_OVERRIDE;
+ vtkMTimeType GetRedrawMTime() override;
/**
* Shallow copy of this vtkVolume. Overloads the virtual vtkProp method.
*/
- void ShallowCopy(vtkProp *prop) VTK_OVERRIDE;
+ void ShallowCopy(vtkProp *prop) override;
/**
* WARNING: INTERNAL METHOD - NOT INTENDED FOR GENERAL USE
@@ -124,7 +124,7 @@ public:
* this method (FRAMEBUFFER volume such as texture mapping will
* be rendered this way)
*/
- int RenderVolumetricGeometry(vtkViewport *viewport) VTK_OVERRIDE;
+ int RenderVolumetricGeometry(vtkViewport *viewport) override;
/**
* WARNING: INTERNAL METHOD - NOT INTENDED FOR GENERAL USE
@@ -132,7 +132,7 @@ public:
* The parameter window could be used to determine which graphic
* resources to release.
*/
- void ReleaseGraphicsResources(vtkWindow *) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *) override;
/**
* WARNING: INTERNAL METHOD - NOT INTENDED FOR GENERAL USE
@@ -206,12 +206,12 @@ public:
/// selection.
/// @warning INTERNAL METHOD - NOT INTENDED FOR GENERAL USE
/// DO NOT USE THIS METHOD OUTSIDE OF THE RENDERING PROCESS
- bool GetSupportsSelection() VTK_OVERRIDE
+ bool GetSupportsSelection() override
{ return true; }
protected:
vtkVolume();
- ~vtkVolume() VTK_OVERRIDE;
+ ~vtkVolume() override;
vtkAbstractVolumeMapper *Mapper;
vtkVolumeProperty *Property;
diff --git a/Rendering/Core/vtkVolumeCollection.h b/Rendering/Core/vtkVolumeCollection.h
index 4028ab7bd0653838287cbf06c0859f1ea1761c39..2635a2f17f88e4ff7910b05dfce601b3b70ec4a3 100644
--- a/Rendering/Core/vtkVolumeCollection.h
+++ b/Rendering/Core/vtkVolumeCollection.h
@@ -37,7 +37,7 @@ class VTKRENDERINGCORE_EXPORT vtkVolumeCollection : public vtkPropCollection
public:
static vtkVolumeCollection *New();
vtkTypeMacro(vtkVolumeCollection, vtkPropCollection);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Add a Volume to the bottom of the list.
@@ -70,7 +70,7 @@ class VTKRENDERINGCORE_EXPORT vtkVolumeCollection : public vtkPropCollection
protected:
vtkVolumeCollection() {}
- ~vtkVolumeCollection() VTK_OVERRIDE {}
+ ~vtkVolumeCollection() override {}
private:
// hide the standard AddItem from the user and the compiler.
diff --git a/Rendering/Core/vtkVolumeProperty.h b/Rendering/Core/vtkVolumeProperty.h
index 64876acf7f2ff149f22be31e63c4b37fc289d94e..0d8b3e1ee7ce6ecacb2453c6672f8e4f4aaf4367 100644
--- a/Rendering/Core/vtkVolumeProperty.h
+++ b/Rendering/Core/vtkVolumeProperty.h
@@ -68,14 +68,14 @@ class VTKRENDERINGCORE_EXPORT vtkVolumeProperty : public vtkObject
public:
static vtkVolumeProperty *New();
vtkTypeMacro(vtkVolumeProperty, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
void DeepCopy(vtkVolumeProperty *p);
/**
* Get the modified time for this object (or the properties registered
* with this object).
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
//@{
/**
@@ -429,7 +429,7 @@ public:
protected:
vtkVolumeProperty();
- ~vtkVolumeProperty() VTK_OVERRIDE;
+ ~vtkVolumeProperty() override;
/**
* WARNING: INTERNAL METHOD - NOT INTENDED FOR GENERAL USE
diff --git a/Rendering/Core/vtkWindowLevelLookupTable.h b/Rendering/Core/vtkWindowLevelLookupTable.h
index 1af1bf920944a1ba992f950565ce01db7e87640a..4fa6159186eb301142169222c5315c9ea9b51874 100644
--- a/Rendering/Core/vtkWindowLevelLookupTable.h
+++ b/Rendering/Core/vtkWindowLevelLookupTable.h
@@ -44,13 +44,13 @@ class VTKRENDERINGCORE_EXPORT vtkWindowLevelLookupTable : public vtkLookupTable
public:
static vtkWindowLevelLookupTable *New();
vtkTypeMacro(vtkWindowLevelLookupTable,vtkLookupTable);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Generate lookup table as a linear ramp between MinimumTableValue
* and MaximumTableValue.
*/
- void Build() VTK_OVERRIDE;
+ void Build() override;
//@{
/**
@@ -109,7 +109,7 @@ public:
protected:
vtkWindowLevelLookupTable(int sze=256, int ext=256);
- ~vtkWindowLevelLookupTable() VTK_OVERRIDE {}
+ ~vtkWindowLevelLookupTable() override {}
double Window;
double Level;
diff --git a/Rendering/Core/vtkWindowToImageFilter.h b/Rendering/Core/vtkWindowToImageFilter.h
index 28756abb6face87a19b507c26de161933b6014de..ddc0e542ad16a18a0183f6fbd1a0fe9cb775796e 100644
--- a/Rendering/Core/vtkWindowToImageFilter.h
+++ b/Rendering/Core/vtkWindowToImageFilter.h
@@ -74,7 +74,7 @@ public:
static vtkWindowToImageFilter *New();
vtkTypeMacro(vtkWindowToImageFilter,vtkAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Indicates what renderer to get the pixel data from. Initial value is 0.
@@ -178,11 +178,11 @@ public:
*/
int ProcessRequest(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
protected:
vtkWindowToImageFilter();
- ~vtkWindowToImageFilter() VTK_OVERRIDE;
+ ~vtkWindowToImageFilter() override;
// vtkWindow is not a vtkDataObject, so we need our own ivar.
vtkWindow *Input;
@@ -201,7 +201,7 @@ protected:
vtkInformationVector*);
// see algorithm for more info
- int FillOutputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillOutputPortInformation(int port, vtkInformation* info) override;
/**
* Allows subclasses to customize how a request for render is handled.
diff --git a/Rendering/Core/vtkWorldPointPicker.h b/Rendering/Core/vtkWorldPointPicker.h
index cd608b3c5984c845c8828a404423005cdc4c4432..83651aad5e2860ff8f9fb4af12ba6b918cae81f0 100644
--- a/Rendering/Core/vtkWorldPointPicker.h
+++ b/Rendering/Core/vtkWorldPointPicker.h
@@ -40,21 +40,21 @@ class VTKRENDERINGCORE_EXPORT vtkWorldPointPicker : public vtkAbstractPicker
public:
static vtkWorldPointPicker *New();
vtkTypeMacro(vtkWorldPointPicker,vtkAbstractPicker);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
* Perform the pick. (This method overload's the superclass.)
*/
int Pick(double selectionX, double selectionY, double selectionZ,
- vtkRenderer *renderer) VTK_OVERRIDE;
+ vtkRenderer *renderer) override;
int Pick(double selectionPt[3], vtkRenderer *renderer)
{ return this->vtkAbstractPicker::Pick( selectionPt, renderer); };
//@}
protected:
vtkWorldPointPicker ();
- ~vtkWorldPointPicker() VTK_OVERRIDE {}
+ ~vtkWorldPointPicker() override {}
private:
vtkWorldPointPicker(const vtkWorldPointPicker&) VTK_DELETE_FUNCTION;
diff --git a/Rendering/External/ExternalVTKWidget.h b/Rendering/External/ExternalVTKWidget.h
index aa7d7a9dc3dc5ac8c282c611d9df70f4e45f124c..e378ccba72a5cd58229d988c48682a3cb30ce30d 100644
--- a/Rendering/External/ExternalVTKWidget.h
+++ b/Rendering/External/ExternalVTKWidget.h
@@ -31,7 +31,7 @@ class VTKRENDERINGEXTERNAL_EXPORT ExternalVTKWidget : public vtkObject
public:
static ExternalVTKWidget *New();
vtkTypeMacro(ExternalVTKWidget, vtkObject);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
// Set/Get an external render window for the ExternalVTKWidget.
// Since this is a special environment, the methods are limited to use
@@ -49,7 +49,7 @@ public:
protected:
ExternalVTKWidget();
- ~ExternalVTKWidget() VTK_OVERRIDE;
+ ~ExternalVTKWidget() override;
vtkExternalOpenGLRenderWindow* RenderWindow;
diff --git a/Rendering/External/vtkExternalLight.h b/Rendering/External/vtkExternalLight.h
index 9c00e3787519f0f171d73654054a1177010ad19f..eb9c4963ac5072be0fdc903842ad7c0f57bad850 100644
--- a/Rendering/External/vtkExternalLight.h
+++ b/Rendering/External/vtkExternalLight.h
@@ -62,7 +62,7 @@ class VTKRENDERINGEXTERNAL_EXPORT vtkExternalLight : public vtkLight
{
public:
vtkTypeMacro(vtkExternalLight, vtkLight);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Create an external light object with the focal point at the origin and its
@@ -112,52 +112,52 @@ public:
/**
* Override Set method to keep a record of changed value
*/
- void SetPosition(double, double, double) VTK_OVERRIDE;
+ void SetPosition(double, double, double) override;
/**
* Override Set method to keep a record of changed value
*/
- void SetFocalPoint(double, double, double) VTK_OVERRIDE;
+ void SetFocalPoint(double, double, double) override;
/**
* Override Set method to keep a record of changed value
*/
- void SetAmbientColor(double, double, double) VTK_OVERRIDE;
+ void SetAmbientColor(double, double, double) override;
/**
* Override Set method to keep a record of changed value
*/
- void SetDiffuseColor(double, double, double) VTK_OVERRIDE;
+ void SetDiffuseColor(double, double, double) override;
/**
* Override Set method to keep a record of changed value
*/
- void SetSpecularColor(double, double, double) VTK_OVERRIDE;
+ void SetSpecularColor(double, double, double) override;
/**
* Override Set method to keep a record of changed value
*/
- void SetIntensity(double) VTK_OVERRIDE;
+ void SetIntensity(double) override;
/**
* Override Set method to keep a record of changed value
*/
- void SetConeAngle(double) VTK_OVERRIDE;
+ void SetConeAngle(double) override;
/**
* Override Set method to keep a record of changed value
*/
- void SetAttenuationValues(double, double, double) VTK_OVERRIDE;
+ void SetAttenuationValues(double, double, double) override;
/**
* Override Set method to keep a record of changed value
*/
- void SetExponent(double) VTK_OVERRIDE;
+ void SetExponent(double) override;
/**
* Override Set method to keep a record of changed value
*/
- void SetPositional(int) VTK_OVERRIDE;
+ void SetPositional(int) override;
//@{
/**
@@ -231,7 +231,7 @@ public:
protected:
vtkExternalLight();
- ~vtkExternalLight() VTK_OVERRIDE;
+ ~vtkExternalLight() override;
int LightIndex;
int ReplaceMode;
diff --git a/Rendering/External/vtkExternalOpenGLCamera.h b/Rendering/External/vtkExternalOpenGLCamera.h
index 4bb3b1d59cae946f4135238a2a8661d52ccb90cd..7ed15af96c52a326c495dd0ffbd452952cfd40c9 100644
--- a/Rendering/External/vtkExternalOpenGLCamera.h
+++ b/Rendering/External/vtkExternalOpenGLCamera.h
@@ -34,12 +34,12 @@ class VTKRENDERINGEXTERNAL_EXPORT vtkExternalOpenGLCamera :
public:
static vtkExternalOpenGLCamera *New();
vtkTypeMacro(vtkExternalOpenGLCamera, vtkOpenGLCamera);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Implement base class method.
*/
- void Render(vtkRenderer *ren) VTK_OVERRIDE;
+ void Render(vtkRenderer *ren) override;
/**
* Set the view transform matrix
@@ -53,13 +53,13 @@ public:
protected:
vtkExternalOpenGLCamera();
- ~vtkExternalOpenGLCamera() VTK_OVERRIDE {}
+ ~vtkExternalOpenGLCamera() override {}
/**
* These methods should only be used within vtkCamera.cxx.
* Bypass computation if user provided the view transform
*/
- void ComputeViewTransform() VTK_OVERRIDE;
+ void ComputeViewTransform() override;
private:
bool UserProvidedViewTransform;
diff --git a/Rendering/External/vtkExternalOpenGLRenderWindow.h b/Rendering/External/vtkExternalOpenGLRenderWindow.h
index 255fbb2d47838cf781bc98e840a17404b3d022e5..f37e219ce8f7fa00ade56a25b8792d1e2a5eb8d8 100644
--- a/Rendering/External/vtkExternalOpenGLRenderWindow.h
+++ b/Rendering/External/vtkExternalOpenGLRenderWindow.h
@@ -50,18 +50,18 @@ class VTKRENDERINGEXTERNAL_EXPORT vtkExternalOpenGLRenderWindow :
public:
static vtkExternalOpenGLRenderWindow *New();
vtkTypeMacro(vtkExternalOpenGLRenderWindow, vtkGenericOpenGLRenderWindow);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
/**
* Begin the rendering process using the existing context.
*/
- void Start(void) VTK_OVERRIDE;
+ void Start(void) override;
/**
* Tells if this window is the current graphics context for the calling
* thread.
*/
- bool IsCurrent() VTK_OVERRIDE;
+ bool IsCurrent() override;
//@{
/**
@@ -82,7 +82,7 @@ public:
protected:
vtkExternalOpenGLRenderWindow();
- ~vtkExternalOpenGLRenderWindow() VTK_OVERRIDE;
+ ~vtkExternalOpenGLRenderWindow() override;
int AutomaticWindowPositionAndResize;
diff --git a/Rendering/External/vtkExternalOpenGLRenderer.h b/Rendering/External/vtkExternalOpenGLRenderer.h
index 4532dff99a9c33195d09cf1a2dd2892bebd735f6..5e1718ae5ae23fd4123687a3b0fc9c10f32f08c2 100644
--- a/Rendering/External/vtkExternalOpenGLRenderer.h
+++ b/Rendering/External/vtkExternalOpenGLRenderer.h
@@ -46,18 +46,18 @@ class VTKRENDERINGEXTERNAL_EXPORT vtkExternalOpenGLRenderer :
public:
static vtkExternalOpenGLRenderer *New();
vtkTypeMacro(vtkExternalOpenGLRenderer, vtkOpenGLRenderer);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Synchronize camera and light parameters
*/
- void Render(void) VTK_OVERRIDE;
+ void Render(void) override;
/**
* Create a new Camera sutible for use with this type of Renderer.
* This function creates the vtkExternalOpenGLCamera.
*/
- vtkCamera* MakeCamera() VTK_OVERRIDE;
+ vtkCamera* MakeCamera() override;
/**
* Add an external light to the list of external lights.
@@ -77,7 +77,7 @@ public:
protected:
vtkExternalOpenGLRenderer();
- ~vtkExternalOpenGLRenderer() VTK_OVERRIDE;
+ ~vtkExternalOpenGLRenderer() override;
vtkLightCollection *ExternalLights;
diff --git a/Rendering/FreeType/Testing/Cxx/TestFTStringToPath.cxx b/Rendering/FreeType/Testing/Cxx/TestFTStringToPath.cxx
index e0ef7dc329157cfd5d9786f9467506f98e042d1e..1fc16b71ee1c102382736f1c7e98a205bbfe2f66 100644
--- a/Rendering/FreeType/Testing/Cxx/TestFTStringToPath.cxx
+++ b/Rendering/FreeType/Testing/Cxx/TestFTStringToPath.cxx
@@ -37,7 +37,7 @@ public:
static StringToPathContextTest *New();
vtkTypeMacro(StringToPathContextTest, 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;
void SetPath(vtkPath *path) { this->Path = path; }
diff --git a/Rendering/FreeType/vtkFreeTypeStringToImage.h b/Rendering/FreeType/vtkFreeTypeStringToImage.h
index afb5fafef16d07fbec7023e1bb80275980a4b8b6..ced6d5ac4c56d8ec20630a62431808d07240b85f 100644
--- a/Rendering/FreeType/vtkFreeTypeStringToImage.h
+++ b/Rendering/FreeType/vtkFreeTypeStringToImage.h
@@ -32,7 +32,7 @@ class VTKRENDERINGFREETYPE_EXPORT vtkFreeTypeStringToImage : public vtkStringToI
{
public:
vtkTypeMacro(vtkFreeTypeStringToImage, vtkStringToImage);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
static vtkFreeTypeStringToImage *New();
@@ -51,9 +51,9 @@ public:
* was empty).
*/
vtkVector2i GetBounds(vtkTextProperty *property,
- const vtkUnicodeString& string, int dpi) VTK_OVERRIDE;
+ const vtkUnicodeString& string, int dpi) override;
vtkVector2i GetBounds(vtkTextProperty *property,
- const vtkStdString& string, int dpi) VTK_OVERRIDE;
+ const vtkStdString& string, int dpi) override;
//@}
//@{
@@ -67,18 +67,18 @@ public:
int RenderString(vtkTextProperty *property,
const vtkUnicodeString& string, int dpi,
vtkImageData *data,
- int textDims[2] = nullptr) VTK_OVERRIDE;
+ int textDims[2] = nullptr) override;
int RenderString(vtkTextProperty *property,
const vtkStdString& string, int dpi,
vtkImageData *data,
- int textDims[2] = nullptr) VTK_OVERRIDE;
+ int textDims[2] = nullptr) override;
//@}
/**
* Should we produce images at powers of 2, makes rendering on old OpenGL
* hardware easier. Default is false.
*/
- void SetScaleToPowerOfTwo(bool scale) VTK_OVERRIDE;
+ void SetScaleToPowerOfTwo(bool scale) override;
/**
* Make a deep copy of the supplied utility class.
@@ -87,7 +87,7 @@ public:
protected:
vtkFreeTypeStringToImage();
- ~vtkFreeTypeStringToImage() VTK_OVERRIDE;
+ ~vtkFreeTypeStringToImage() override;
class Internals;
Internals* Implementation;
diff --git a/Rendering/FreeType/vtkFreeTypeTools.h b/Rendering/FreeType/vtkFreeTypeTools.h
index f6c8c79e23c8581d5e940e790c37cb83573d572e..14e2b9c06f216392a126bc1fc14586b0895e8fc4 100644
--- a/Rendering/FreeType/vtkFreeTypeTools.h
+++ b/Rendering/FreeType/vtkFreeTypeTools.h
@@ -86,7 +86,7 @@ public:
};
vtkTypeMacro(vtkFreeTypeTools, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Return the singleton instance with no reference counting.
@@ -378,7 +378,7 @@ protected:
bool ScaleToPowerTwo;
vtkFreeTypeTools();
- ~vtkFreeTypeTools() VTK_OVERRIDE;
+ ~vtkFreeTypeTools() override;
/**
* Attempt to get the typeface of the specified font.
diff --git a/Rendering/FreeType/vtkMathTextFreeTypeTextRenderer.h b/Rendering/FreeType/vtkMathTextFreeTypeTextRenderer.h
index 7d7fb3c0bbb99bc4a7c731e7cb108dd4cb442020..d65454a152ed8a97784fe8c6b5c1f3969ce03196 100644
--- a/Rendering/FreeType/vtkMathTextFreeTypeTextRenderer.h
+++ b/Rendering/FreeType/vtkMathTextFreeTypeTextRenderer.h
@@ -42,7 +42,7 @@ class VTKRENDERINGFREETYPE_EXPORT vtkMathTextFreeTypeTextRenderer :
{
public:
vtkTypeMacro(vtkMathTextFreeTypeTextRenderer, vtkTextRenderer)
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
static vtkMathTextFreeTypeTextRenderer *New();
@@ -50,46 +50,46 @@ public:
/**
* Test for availability of various backends
*/
- bool FreeTypeIsSupported() VTK_OVERRIDE;
- bool MathTextIsSupported() VTK_OVERRIDE;
+ bool FreeTypeIsSupported() override;
+ bool MathTextIsSupported() override;
//@}
protected:
vtkMathTextFreeTypeTextRenderer();
- ~vtkMathTextFreeTypeTextRenderer() VTK_OVERRIDE;
+ ~vtkMathTextFreeTypeTextRenderer() override;
//@{
/**
* Reimplemented from vtkTextRenderer.
*/
bool GetBoundingBoxInternal(vtkTextProperty *tprop, const vtkStdString &str,
- int bbox[4], int dpi, int backend) VTK_OVERRIDE;
+ int bbox[4], int dpi, int backend) override;
bool GetBoundingBoxInternal(vtkTextProperty *tprop,
const vtkUnicodeString &str,
- int bbox[4], int dpi, int backend) VTK_OVERRIDE;
+ int bbox[4], int dpi, int backend) override;
bool GetMetricsInternal(vtkTextProperty *tprop, const vtkStdString &str,
- Metrics &metrics, int dpi, int backend) VTK_OVERRIDE;
+ Metrics &metrics, int dpi, int backend) override;
bool GetMetricsInternal(vtkTextProperty *tprop, const vtkUnicodeString &str,
- Metrics &metrics, int dpi, int backend) VTK_OVERRIDE;
+ Metrics &metrics, int dpi, int backend) override;
bool RenderStringInternal(vtkTextProperty *tprop, const vtkStdString &str,
vtkImageData *data, int textDims[2], int dpi,
- int backend) VTK_OVERRIDE;
+ int backend) override;
bool RenderStringInternal(vtkTextProperty *tprop, const vtkUnicodeString &str,
vtkImageData *data, int textDims[2], int dpi,
- int backend) VTK_OVERRIDE;
+ int backend) override;
int GetConstrainedFontSizeInternal(const vtkStdString &str,
vtkTextProperty *tprop,
int targetWidth, int targetHeight, int dpi,
- int backend) VTK_OVERRIDE;
+ int backend) override;
int GetConstrainedFontSizeInternal(const vtkUnicodeString &str,
vtkTextProperty *tprop,
int targetWidth, int targetHeight, int dpi,
- int backend) VTK_OVERRIDE;
+ int backend) override;
bool StringToPathInternal(vtkTextProperty *tprop, const vtkStdString &str,
- vtkPath *path, int dpi, int backend) VTK_OVERRIDE;
+ vtkPath *path, int dpi, int backend) override;
bool StringToPathInternal(vtkTextProperty *tprop, const vtkUnicodeString &str,
- vtkPath *path, int dpi, int backend) VTK_OVERRIDE;
- void SetScaleToPowerOfTwoInternal(bool scale) VTK_OVERRIDE;
+ vtkPath *path, int dpi, int backend) override;
+ void SetScaleToPowerOfTwoInternal(bool scale) override;
//@}
private:
diff --git a/Rendering/FreeType/vtkMathTextUtilities.h b/Rendering/FreeType/vtkMathTextUtilities.h
index 934f6abc88e2ef37e696760f72ca8358fb834950..bef221719652e8d988bbfface0430f37ffb6a2b7 100644
--- a/Rendering/FreeType/vtkMathTextUtilities.h
+++ b/Rendering/FreeType/vtkMathTextUtilities.h
@@ -52,7 +52,7 @@ class VTKRENDERINGFREETYPE_EXPORT vtkMathTextUtilities : public vtkObject
{
public:
vtkTypeMacro(vtkMathTextUtilities, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Returns true if mathtext rendering is available.
@@ -134,7 +134,7 @@ public:
protected:
vtkMathTextUtilities();
- ~vtkMathTextUtilities() VTK_OVERRIDE;
+ ~vtkMathTextUtilities() override;
private:
vtkMathTextUtilities(const vtkMathTextUtilities&) VTK_DELETE_FUNCTION;
diff --git a/Rendering/FreeType/vtkScaledTextActor.h b/Rendering/FreeType/vtkScaledTextActor.h
index 8670ebe46c162b857990033a0ffa40de6587b7f5..1e9198a924f33d2fde2b692aa2ea6ab98b98f5c2 100644
--- a/Rendering/FreeType/vtkScaledTextActor.h
+++ b/Rendering/FreeType/vtkScaledTextActor.h
@@ -33,7 +33,7 @@ class VTKRENDERINGFREETYPE_EXPORT vtkScaledTextActor : public vtkTextActor
{
public:
vtkTypeMacro(vtkScaledTextActor,vtkTextActor);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Instantiate object with a rectangle in normaled view coordinates
diff --git a/Rendering/FreeType/vtkTextRendererStringToImage.h b/Rendering/FreeType/vtkTextRendererStringToImage.h
index 4864567b8eaba2c25f2d12096014f0e2e9f6b514..23de2a8a8c1a12317aa93855c43d5a71e386e5cb 100644
--- a/Rendering/FreeType/vtkTextRendererStringToImage.h
+++ b/Rendering/FreeType/vtkTextRendererStringToImage.h
@@ -30,7 +30,7 @@ class VTKRENDERINGFREETYPE_EXPORT vtkTextRendererStringToImage :
{
public:
vtkTypeMacro(vtkTextRendererStringToImage, vtkStringToImage);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
static vtkTextRendererStringToImage *New();
@@ -50,10 +50,10 @@ public:
*/
vtkVector2i GetBounds(vtkTextProperty *property,
const vtkUnicodeString& string,
- int dpi) VTK_OVERRIDE;
+ int dpi) override;
vtkVector2i GetBounds(vtkTextProperty *property,
const vtkStdString& string,
- int dpi) VTK_OVERRIDE;
+ int dpi) override;
//@}
//@{
@@ -68,19 +68,19 @@ public:
const vtkUnicodeString& string,
int dpi,
vtkImageData *data,
- int textDims[2] = nullptr) VTK_OVERRIDE;
+ int textDims[2] = nullptr) override;
int RenderString(vtkTextProperty *property,
const vtkStdString& string,
int dpi,
vtkImageData *data,
- int textDims[2] = nullptr) VTK_OVERRIDE;
+ int textDims[2] = nullptr) override;
//@}
/**
* Should we produce images at powers of 2, makes rendering on old OpenGL
* hardware easier. Default is false.
*/
- void SetScaleToPowerOfTwo(bool scale) VTK_OVERRIDE;
+ void SetScaleToPowerOfTwo(bool scale) override;
/**
* Make a deep copy of the supplied utility class.
@@ -89,7 +89,7 @@ public:
protected:
vtkTextRendererStringToImage();
- ~vtkTextRendererStringToImage() VTK_OVERRIDE;
+ ~vtkTextRendererStringToImage() override;
class Internals;
Internals* Implementation;
diff --git a/Rendering/FreeType/vtkVectorText.h b/Rendering/FreeType/vtkVectorText.h
index a7df4d933685e1b445d1f8e624b27c90c838c89a..29f4dc56674bcbffe6e52105113e7f1076a752e6 100644
--- a/Rendering/FreeType/vtkVectorText.h
+++ b/Rendering/FreeType/vtkVectorText.h
@@ -43,7 +43,7 @@ class VTKRENDERINGFREETYPE_EXPORT vtkVectorText : public vtkPolyDataAlgorithm
public:
static vtkVectorText *New();
vtkTypeMacro(vtkVectorText,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -55,9 +55,9 @@ public:
protected:
vtkVectorText();
- ~vtkVectorText() VTK_OVERRIDE;
+ ~vtkVectorText() override;
- int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
char *Text;
private:
diff --git a/Rendering/GL2PS/vtkGL2PSContextDevice2D.h b/Rendering/GL2PS/vtkGL2PSContextDevice2D.h
index bad36da73ffe8b07120253871b0d4bce090cd3c0..b1e7a2cf8e1c7d2f50281dc08ad14110650a39a5 100644
--- a/Rendering/GL2PS/vtkGL2PSContextDevice2D.h
+++ b/Rendering/GL2PS/vtkGL2PSContextDevice2D.h
@@ -39,7 +39,7 @@ class VTKRENDERINGGL2PS_EXPORT vtkGL2PSContextDevice2D
{
public:
vtkTypeMacro(vtkGL2PSContextDevice2D, vtkOpenGLContextDevice2D);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
static vtkGL2PSContextDevice2D *New();
@@ -52,14 +52,14 @@ public:
* OpenGL calls are emitted.
*/
void DrawPoly(float *f, int n, unsigned char *colors = 0,
- int nc_comps = 0) VTK_OVERRIDE;
+ int nc_comps = 0) override;
/**
* Draw a series of points - fastest code path due to memory layout of the
* coordinates. The colors and nc_comps are optional - color array.
*/
void DrawPoints(float *points, int n, unsigned char* colors = 0,
- int nc_comps = 0) VTK_OVERRIDE;
+ int nc_comps = 0) override;
/**
* Draw a series of point sprites, images centred at the points supplied.
@@ -69,17 +69,17 @@ public:
* \param nc_comps is the number of components for the color.
*/
void DrawPointSprites(vtkImageData *sprite, float *points, int n,
- unsigned char *colors = 0, int nc_comps = 0) VTK_OVERRIDE;
+ unsigned char *colors = 0, int nc_comps = 0) override;
/**
* Draw a quad using the specified number of points.
*/
- void DrawQuadStrip(float *, int) VTK_OVERRIDE;
+ void DrawQuadStrip(float *, int) override;
/**
* Draw a polygon using the specified number of points.
*/
- void DrawPolygon(float *, int) VTK_OVERRIDE;
+ void DrawPolygon(float *, int) override;
/**
* Draw an elliptic wedge with center at x, y, outer radii outRx, outRy,
@@ -94,7 +94,7 @@ public:
*/
void DrawEllipseWedge(float x, float y, float outRx, float outRy,
float inRx, float inRy, float startAngle,
- float stopAngle) VTK_OVERRIDE;
+ float stopAngle) override;
/**
* Draw an elliptic arc with center at x,y with radii rX and rY between
@@ -103,7 +103,7 @@ public:
* \pre positive_rY: rY>=0
*/
void DrawEllipticArc(float x, float y, float rX, float rY,
- float startAngle, float stopAngle) VTK_OVERRIDE;
+ float startAngle, float stopAngle) override;
/**
* Draw a series of markers centered at the points supplied. The \a shape
@@ -117,54 +117,54 @@ public:
* \param nc_comps is the number of components for the color.
*/
void DrawMarkers(int shape, bool highlight, float *points, int n,
- unsigned char *colors = 0, int nc_comps = 0) VTK_OVERRIDE;
+ unsigned char *colors = 0, int nc_comps = 0) override;
/**
* Draws a rectangle
*/
- void DrawQuad(float *points, int n) VTK_OVERRIDE;
+ void DrawQuad(float *points, int n) override;
/**
* Draw some text to the screen!
*/
- void DrawString(float *point, const vtkStdString &string) VTK_OVERRIDE;
+ void DrawString(float *point, const vtkStdString &string) override;
/**
* Draw some text to the screen.
*/
- void DrawString(float *point, const vtkUnicodeString &string) VTK_OVERRIDE;
+ void DrawString(float *point, const vtkUnicodeString &string) override;
/**
* Draw text using MathText markup for mathematical equations. See
* http://matplotlib.sourceforge.net/users/mathtext.html for more information.
*/
- void DrawMathTextString(float point[2], const vtkStdString &string) VTK_OVERRIDE;
+ void DrawMathTextString(float point[2], const vtkStdString &string) override;
/**
* Apply the supplied pen which controls the outlines of shapes, as well as
* lines, points and related primitives. This makes a deep copy of the vtkPen
* object in the vtkContext2D, it does not hold a pointer to the supplied object.
*/
- void ApplyPen(vtkPen *pen) VTK_OVERRIDE;
+ void ApplyPen(vtkPen *pen) override;
/**
* Set the point size for glyphs/sprites.
*/
- void SetPointSize(float size) VTK_OVERRIDE;
+ void SetPointSize(float size) override;
/**
* Set the line width for glyphs/sprites.
*/
- void SetLineWidth(float width) VTK_OVERRIDE;
+ void SetLineWidth(float width) override;
/**
* Set the line type type (using anonymous enum in vtkPen).
*/
- void SetLineType(int type) VTK_OVERRIDE;
+ void SetLineType(int type) override;
protected:
vtkGL2PSContextDevice2D();
- ~vtkGL2PSContextDevice2D() VTK_OVERRIDE;
+ ~vtkGL2PSContextDevice2D() override;
private:
vtkGL2PSContextDevice2D(const vtkGL2PSContextDevice2D &) VTK_DELETE_FUNCTION;
diff --git a/Rendering/GL2PS/vtkGL2PSUtilities.h b/Rendering/GL2PS/vtkGL2PSUtilities.h
index e08e4eb093cd5433add87743f11353da7cf05682..33309fcf084ced475910a4a5da51d84937e4a4ac 100644
--- a/Rendering/GL2PS/vtkGL2PSUtilities.h
+++ b/Rendering/GL2PS/vtkGL2PSUtilities.h
@@ -40,7 +40,7 @@ class VTKRENDERINGGL2PS_EXPORT vtkGL2PSUtilities : public vtkObject
public:
static vtkGL2PSUtilities *New();
vtkTypeMacro(vtkGL2PSUtilities, vtkObject)
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE
+ void PrintSelf(ostream& os, vtkIndent indent) override
{
this->Superclass::PrintSelf(os, indent);
}
@@ -147,7 +147,7 @@ protected:
float strokeWidth = -1, const char *label = NULL);
vtkGL2PSUtilities() {}
- ~vtkGL2PSUtilities() VTK_OVERRIDE {}
+ ~vtkGL2PSUtilities() override {}
private:
vtkGL2PSUtilities(const vtkGL2PSUtilities &) VTK_DELETE_FUNCTION;
diff --git a/Rendering/GL2PSOpenGL2/vtkOpenGLGL2PSHelperImpl.h b/Rendering/GL2PSOpenGL2/vtkOpenGLGL2PSHelperImpl.h
index 2803b971c4242fee292df9e7df7406fac247f1a1..67af043a03cfe4775edd4b4c96089c9274fbda56 100644
--- a/Rendering/GL2PSOpenGL2/vtkOpenGLGL2PSHelperImpl.h
+++ b/Rendering/GL2PSOpenGL2/vtkOpenGLGL2PSHelperImpl.h
@@ -34,35 +34,35 @@ class VTKRENDERINGGL2PSOPENGL2_EXPORT vtkOpenGLGL2PSHelperImpl
public:
static vtkOpenGLGL2PSHelperImpl *New();
vtkTypeMacro(vtkOpenGLGL2PSHelperImpl, vtkOpenGLGL2PSHelper)
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
void ProcessTransformFeedback(vtkTransformFeedback *tfc,
- vtkRenderer *ren, vtkActor *act) VTK_OVERRIDE;
+ vtkRenderer *ren, vtkActor *act) override;
void ProcessTransformFeedback(vtkTransformFeedback *tfc,
vtkRenderer *ren,
- unsigned char col[4]) VTK_OVERRIDE;
+ unsigned char col[4]) override;
void ProcessTransformFeedback(vtkTransformFeedback *tfc,
vtkRenderer *ren,
- float col[4]) VTK_OVERRIDE;
+ float col[4]) override;
void DrawString(const std::string &str, vtkTextProperty *tprop,
double pos[3], double backgroundDepth,
- vtkRenderer *ren) VTK_OVERRIDE;
+ vtkRenderer *ren) override;
void DrawPath(vtkPath *path, double rasterPos[3], double windowPos[2],
unsigned char rgba[4], double scale[2] = nullptr,
double rotateAngle = 0.0, float strokeWidth = -1,
- const char *label = nullptr) VTK_OVERRIDE;
+ const char *label = nullptr) override;
void Draw3DPath(vtkPath *path, vtkMatrix4x4 *actorMatrix,
double rasterPos[3], unsigned char actorColor[4],
- vtkRenderer *ren, const char *label = nullptr) VTK_OVERRIDE;
+ vtkRenderer *ren, const char *label = nullptr) override;
- void DrawImage(vtkImageData *image, double pos[3]) VTK_OVERRIDE;
+ void DrawImage(vtkImageData *image, double pos[3]) override;
protected:
vtkOpenGLGL2PSHelperImpl();
- ~vtkOpenGLGL2PSHelperImpl() VTK_OVERRIDE;
+ ~vtkOpenGLGL2PSHelperImpl() override;
/**
* Translate the tprop's fontname into a Postscript font name.
diff --git a/Rendering/Image/vtkDepthImageToPointCloud.h b/Rendering/Image/vtkDepthImageToPointCloud.h
index 973bd90f81927b25ae615f7f83434d6998bf7ac7..ee570cbd7ecf29a11aa275da187245f091c5b38e 100644
--- a/Rendering/Image/vtkDepthImageToPointCloud.h
+++ b/Rendering/Image/vtkDepthImageToPointCloud.h
@@ -83,13 +83,13 @@ public:
*/
static vtkDepthImageToPointCloud *New();
vtkTypeMacro(vtkDepthImageToPointCloud, vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
* Return the MTime also considering the camera.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
/**
* Indicates what camera was used to generate the depth image. The camera
@@ -163,7 +163,7 @@ public:
protected:
vtkDepthImageToPointCloud();
- ~vtkDepthImageToPointCloud() VTK_OVERRIDE;
+ ~vtkDepthImageToPointCloud() override;
vtkCamera *Camera;
bool CullNearPoints;
@@ -174,18 +174,18 @@ protected:
int RequestInformation(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
int RequestUpdateExtent(vtkInformation *request,
vtkInformationVector **inInfo,
- vtkInformationVector *outInfo) VTK_OVERRIDE;
+ vtkInformationVector *outInfo) override;
int RequestData(vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
- int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
- int FillOutputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation *info) override;
+ int FillOutputPortInformation(int port, vtkInformation *info) override;
private:
vtkDepthImageToPointCloud(const vtkDepthImageToPointCloud&) VTK_DELETE_FUNCTION;
diff --git a/Rendering/Image/vtkImageResliceMapper.h b/Rendering/Image/vtkImageResliceMapper.h
index 8db6f6d5a39bc4930a7e6b4c220207abdfb1a840..b37869c5cb770651692e1372dfe17003f45ed7a5 100644
--- a/Rendering/Image/vtkImageResliceMapper.h
+++ b/Rendering/Image/vtkImageResliceMapper.h
@@ -48,7 +48,7 @@ class VTKRENDERINGIMAGE_EXPORT vtkImageResliceMapper : public vtkImageMapper3D
public:
static vtkImageResliceMapper *New();
vtkTypeMacro(vtkImageResliceMapper,vtkImageMapper3D);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Set the slice that will be used to cut through the image.
@@ -168,27 +168,27 @@ public:
/**
* This should only be called by the renderer.
*/
- void Render(vtkRenderer *renderer, vtkImageSlice *prop) VTK_OVERRIDE;
+ void Render(vtkRenderer *renderer, vtkImageSlice *prop) override;
/**
* Release any graphics resources that are being consumed by
* this mapper. The parameter window is used to determine
* which graphic resources to release.
*/
- void ReleaseGraphicsResources(vtkWindow *) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *) override;
/**
* Get the mtime for the mapper.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
//@{
/**
* The bounding box (array of six doubles) of the data expressed as
* (xmin,xmax, ymin,ymax, zmin,zmax).
*/
- double *GetBounds() VTK_OVERRIDE;
- void GetBounds(double bounds[6]) VTK_OVERRIDE
+ double *GetBounds() override;
+ void GetBounds(double bounds[6]) override
{ this->vtkAbstractMapper3D::GetBounds(bounds); };
//@}
@@ -197,11 +197,11 @@ public:
*/
int ProcessRequest(vtkInformation* request,
vtkInformationVector** inInfo,
- vtkInformationVector* outInfo) VTK_OVERRIDE;
+ vtkInformationVector* outInfo) override;
protected:
vtkImageResliceMapper();
- ~vtkImageResliceMapper() VTK_OVERRIDE;
+ ~vtkImageResliceMapper() override;
/**
* Do a checkerboard pattern to the alpha of an RGBA image
@@ -250,16 +250,16 @@ protected:
/**
* Override Update to handle some tricky details.
*/
- void Update(int port) VTK_OVERRIDE;
- void Update() VTK_OVERRIDE;
- int Update(int port, vtkInformationVector* requests) VTK_OVERRIDE;
- int Update(vtkInformation* requests) VTK_OVERRIDE;
+ void Update(int port) override;
+ void Update() override;
+ int Update(int port, vtkInformationVector* requests) override;
+ int Update(vtkInformation* requests) override;
//@}
/**
* Garbage collection for reference loops.
*/
- void ReportReferences(vtkGarbageCollector*) VTK_OVERRIDE;
+ void ReportReferences(vtkGarbageCollector*) override;
vtkImageSliceMapper *SliceMapper; // Does the OpenGL rendering
diff --git a/Rendering/Image/vtkImageSliceCollection.h b/Rendering/Image/vtkImageSliceCollection.h
index 665dcc1bb27b5ece8f0825e1f8d303b130d004f1..855b97190582ffe642921a45e1ea523f950acb2d 100644
--- a/Rendering/Image/vtkImageSliceCollection.h
+++ b/Rendering/Image/vtkImageSliceCollection.h
@@ -71,9 +71,9 @@ class VTKRENDERINGIMAGE_EXPORT vtkImageSliceCollection : public vtkPropCollectio
protected:
vtkImageSliceCollection() {}
- ~vtkImageSliceCollection() VTK_OVERRIDE;
+ ~vtkImageSliceCollection() override;
- void DeleteElement(vtkCollectionElement *) VTK_OVERRIDE;
+ void DeleteElement(vtkCollectionElement *) override;
private:
// hide the standard AddItem from the user and the compiler.
diff --git a/Rendering/Image/vtkImageStack.h b/Rendering/Image/vtkImageStack.h
index 19e6d8b53b3e82308f5b2e2454513c4dfa168570..c75210461f5d8478166d5fad5348c8848b6e5614 100644
--- a/Rendering/Image/vtkImageStack.h
+++ b/Rendering/Image/vtkImageStack.h
@@ -44,7 +44,7 @@ class VTKRENDERINGIMAGE_EXPORT vtkImageStack : public vtkImageSlice
{
public:
vtkTypeMacro(vtkImageStack,vtkImageSlice);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkImageStack *New();
/**
@@ -88,25 +88,25 @@ public:
/**
* Get the mapper for the currently active image.
*/
- vtkImageMapper3D *GetMapper() VTK_OVERRIDE;
+ vtkImageMapper3D *GetMapper() override;
/**
* Get the property for the currently active image.
*/
- vtkImageProperty *GetProperty() VTK_OVERRIDE;
+ vtkImageProperty *GetProperty() override;
//@{
/**
* Get the combined bounds of all of the images.
*/
- double *GetBounds() VTK_OVERRIDE;
+ double *GetBounds() override;
void GetBounds(double bounds[6]) { this->vtkProp3D::GetBounds( bounds ); };
//@}
/**
* Return the max MTime of all the images.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
/**
* Return the mtime of anything that would cause the rendered image to
@@ -114,12 +114,12 @@ public:
* prop plus anything else it depends on such as properties, mappers,
* etc.
*/
- vtkMTimeType GetRedrawMTime() VTK_OVERRIDE;
+ vtkMTimeType GetRedrawMTime() override;
/**
* Shallow copy of this prop. Overloads the virtual vtkProp method.
*/
- void ShallowCopy(vtkProp *prop) VTK_OVERRIDE;
+ void ShallowCopy(vtkProp *prop) override;
/**
* For some exporters and other other operations we must be
@@ -132,29 +132,29 @@ public:
/**
* Support the standard render methods.
*/
- int RenderOverlay(vtkViewport *viewport) VTK_OVERRIDE;
- int RenderOpaqueGeometry(vtkViewport *viewport) VTK_OVERRIDE;
- int RenderTranslucentPolygonalGeometry(vtkViewport *viewport) VTK_OVERRIDE;
+ int RenderOverlay(vtkViewport *viewport) override;
+ int RenderOpaqueGeometry(vtkViewport *viewport) override;
+ int RenderTranslucentPolygonalGeometry(vtkViewport *viewport) override;
//@}
/**
* Does this prop have some translucent polygonal geometry?
*/
- int HasTranslucentPolygonalGeometry() VTK_OVERRIDE;
+ int HasTranslucentPolygonalGeometry() override;
/**
* Release any resources held by this prop.
*/
- void ReleaseGraphicsResources(vtkWindow *win) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *win) override;
//@{
/**
* Methods for traversing the stack as if it was an assembly.
* The traversal only gives the view prop for the active layer.
*/
- void InitPathTraversal() VTK_OVERRIDE;
- vtkAssemblyPath *GetNextPath() VTK_OVERRIDE;
- int GetNumberOfPaths() VTK_OVERRIDE;
+ void InitPathTraversal() override;
+ vtkAssemblyPath *GetNextPath() override;
+ int GetNumberOfPaths() override;
//@}
/**
@@ -162,11 +162,11 @@ public:
* DO NOT USE THIS METHOD OUTSIDE OF THE RENDERING PROCESS
* Used to construct assembly paths and perform part traversal.
*/
- void BuildPaths(vtkAssemblyPaths *paths, vtkAssemblyPath *path) VTK_OVERRIDE;
+ void BuildPaths(vtkAssemblyPaths *paths, vtkAssemblyPath *path) override;
protected:
vtkImageStack();
- ~vtkImageStack() VTK_OVERRIDE;
+ ~vtkImageStack() override;
void SetMapper(vtkImageMapper3D *mapper);
void SetProperty(vtkImageProperty *property);
diff --git a/Rendering/LIC/vtkImageDataLIC2D.h b/Rendering/LIC/vtkImageDataLIC2D.h
index fa08f87b6112062896258f54d8aa95d06d560376..14ad7d8eefb0f38adeb8843c7d885c5f7f2090b1 100644
--- a/Rendering/LIC/vtkImageDataLIC2D.h
+++ b/Rendering/LIC/vtkImageDataLIC2D.h
@@ -49,7 +49,7 @@ class VTKRENDERINGLIC_EXPORT vtkImageDataLIC2D : public vtkImageAlgorithm
public:
static vtkImageDataLIC2D* New();
vtkTypeMacro(vtkImageDataLIC2D, vtkImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -111,10 +111,10 @@ public:
protected:
vtkImageDataLIC2D();
- ~vtkImageDataLIC2D() VTK_OVERRIDE;
+ ~vtkImageDataLIC2D() override;
int RequestInformation(vtkInformation *,
- vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector **, vtkInformationVector *) override;
/**
* Fill the input port information objects for this algorithm. This
@@ -123,11 +123,11 @@ protected:
* Redefined from the superclass.
*/
int FillInputPortInformation(int port,
- vtkInformation *info) VTK_OVERRIDE;
+ vtkInformation *info) override;
int RequestUpdateExtent (vtkInformation * vtkNotUsed(request),
vtkInformationVector **inputVector,
- vtkInformationVector *vtkNotUsed( outputVector )) VTK_OVERRIDE;
+ vtkInformationVector *vtkNotUsed( outputVector )) override;
/**
* This is called by the superclass.
@@ -135,7 +135,7 @@ protected:
*/
int RequestData(vtkInformation *request,
vtkInformationVector **inputVector,
- vtkInformationVector *outputVector) VTK_OVERRIDE;
+ vtkInformationVector *outputVector) override;
vtkWeakPointer<vtkRenderWindow> Context;
bool OwnWindow;
diff --git a/Rendering/LIC/vtkLineIntegralConvolution2D.h b/Rendering/LIC/vtkLineIntegralConvolution2D.h
index fa5415dcad703824a4b816bdbc23a441241d8b53..72c61d6e3a49e920eac2e81153e29e3beb27a696 100644
--- a/Rendering/LIC/vtkLineIntegralConvolution2D.h
+++ b/Rendering/LIC/vtkLineIntegralConvolution2D.h
@@ -109,7 +109,7 @@ class VTKRENDERINGLIC_EXPORT vtkLineIntegralConvolution2D : public vtkObject
public:
static vtkLineIntegralConvolution2D *New();
vtkTypeMacro(vtkLineIntegralConvolution2D, vtkObject);
- void PrintSelf(ostream & os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream & os, vtkIndent indent) override;
/**
* Returns if the context supports the required extensions.
@@ -369,7 +369,7 @@ public:
protected:
vtkLineIntegralConvolution2D();
- ~vtkLineIntegralConvolution2D() VTK_OVERRIDE;
+ ~vtkLineIntegralConvolution2D() override;
void SetVTShader(vtkShaderProgram2 *prog);
void SetLIC0Shader(vtkShaderProgram2 *prog);
diff --git a/Rendering/LIC/vtkStructuredGridLIC2D.h b/Rendering/LIC/vtkStructuredGridLIC2D.h
index c8ef6b4b689d40fa1c3d63ef9303a06b9d41ba6d..8a922fe394d71c27e06a7c9f9bebf944064fa04b 100644
--- a/Rendering/LIC/vtkStructuredGridLIC2D.h
+++ b/Rendering/LIC/vtkStructuredGridLIC2D.h
@@ -55,7 +55,7 @@ class VTKRENDERINGLIC_EXPORT vtkStructuredGridLIC2D
public:
static vtkStructuredGridLIC2D* New();
vtkTypeMacro(vtkStructuredGridLIC2D, vtkStructuredGridAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -123,7 +123,7 @@ public:
protected:
vtkStructuredGridLIC2D();
- ~vtkStructuredGridLIC2D() VTK_OVERRIDE;
+ ~vtkStructuredGridLIC2D() override;
/**
* Fill the input port information objects for this algorithm. This
@@ -132,7 +132,7 @@ protected:
* Redefined from the superclass.
*/
int FillInputPortInformation(int port,
- vtkInformation *info) VTK_OVERRIDE;
+ vtkInformation *info) override;
/**
* Fill the output port information objects for this algorithm.
@@ -141,15 +141,15 @@ protected:
* Redefined from the superclass.
*/
int FillOutputPortInformation(int port,
- vtkInformation *info) VTK_OVERRIDE;
+ vtkInformation *info) override;
int RequestInformation(vtkInformation *request,
vtkInformationVector **inputVector,
- vtkInformationVector *outputVector) VTK_OVERRIDE;
+ vtkInformationVector *outputVector) override;
int RequestUpdateExtent (vtkInformation *request,
vtkInformationVector **inputVector,
- vtkInformationVector *outputVector) VTK_OVERRIDE;
+ vtkInformationVector *outputVector) override;
/**
* Stolen from vtkImageAlgorithm. Should be in vtkStructuredGridAlgorithm.
@@ -168,7 +168,7 @@ protected:
*/
int RequestData(vtkInformation *request,
vtkInformationVector **inputVector,
- vtkInformationVector *outputVector) VTK_OVERRIDE;
+ vtkInformationVector *outputVector) override;
int Steps;
double StepSize;
diff --git a/Rendering/LIC/vtkSurfaceLICComposite.h b/Rendering/LIC/vtkSurfaceLICComposite.h
index 3fe9fd3aa86ac101df2ab42bce321251c94f4644..a29c7fd56489509c210ac463fafc6276d6038beb 100644
--- a/Rendering/LIC/vtkSurfaceLICComposite.h
+++ b/Rendering/LIC/vtkSurfaceLICComposite.h
@@ -41,7 +41,7 @@ class VTKRENDERINGLIC_EXPORT vtkSurfaceLICComposite : public vtkObject
public:
static vtkSurfaceLICComposite *New();
vtkTypeMacro(vtkSurfaceLICComposite, vtkObject);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
/**
* Initialize the object based on the following description of the
@@ -206,7 +206,7 @@ public:
protected:
vtkSurfaceLICComposite();
- ~vtkSurfaceLICComposite() VTK_OVERRIDE;
+ ~vtkSurfaceLICComposite() override;
/**
* For serial run. Make a decomposition disjoint. Sorts extents and
diff --git a/Rendering/LIC/vtkSurfaceLICDefaultPainter.h b/Rendering/LIC/vtkSurfaceLICDefaultPainter.h
index d42ec668dc54bf2f948a6d3d97b1abe33b5edd58..5ad6b9b1a33f5399efe5a8d467113428c2567aad 100644
--- a/Rendering/LIC/vtkSurfaceLICDefaultPainter.h
+++ b/Rendering/LIC/vtkSurfaceLICDefaultPainter.h
@@ -41,7 +41,7 @@ class VTKRENDERINGLIC_EXPORT vtkSurfaceLICDefaultPainter
public:
static vtkSurfaceLICDefaultPainter* New();
vtkTypeMacro(vtkSurfaceLICDefaultPainter, vtkDefaultPainter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -53,22 +53,22 @@ public:
protected:
vtkSurfaceLICDefaultPainter();
- ~vtkSurfaceLICDefaultPainter() VTK_OVERRIDE;
+ ~vtkSurfaceLICDefaultPainter() override;
/**
* Setup the the painter chain.
*/
- void BuildPainterChain() VTK_OVERRIDE;
+ void BuildPainterChain() override;
/**
* Take part in garbage collection.
*/
- void ReportReferences(vtkGarbageCollector *collector) VTK_OVERRIDE;
+ void ReportReferences(vtkGarbageCollector *collector) override;
/**
* Override.
*/
- void UpdateBounds(double bounds[6]) VTK_OVERRIDE;
+ void UpdateBounds(double bounds[6]) override;
protected:
vtkSurfaceLICPainter* SurfaceLICPainter;
diff --git a/Rendering/LIC/vtkSurfaceLICPainter.h b/Rendering/LIC/vtkSurfaceLICPainter.h
index 20cecd6036e53f8b5976d3ad88b718bf36c735b7..3470adfcaa394713458b0fec924ab50b010d8c86 100644
--- a/Rendering/LIC/vtkSurfaceLICPainter.h
+++ b/Rendering/LIC/vtkSurfaceLICPainter.h
@@ -72,14 +72,14 @@ class VTKRENDERINGLIC_EXPORT vtkSurfaceLICPainter : public vtkPainter
public:
static vtkSurfaceLICPainter* New();
vtkTypeMacro(vtkSurfaceLICPainter, vtkPainter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Release any graphics resources that are being consumed by this mapper.
* The parameter window could be used to determine which graphic
* resources to release. In this case, releases the display lists.
*/
- void ReleaseGraphicsResources(vtkWindow * win) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow * win) override;
/**
* Get the output data object from this painter.
@@ -87,7 +87,7 @@ public:
* the deletage painters. This is required by the internal GLSL shader
* programs used for generating LIC.
*/
- vtkDataObject* GetOutput() VTK_OVERRIDE;
+ vtkDataObject* GetOutput() override;
//@{
/**
@@ -483,14 +483,14 @@ public:
protected:
vtkSurfaceLICPainter();
- ~vtkSurfaceLICPainter() VTK_OVERRIDE;
+ ~vtkSurfaceLICPainter() override;
/**
* Called before RenderInternal() if the Information has been changed
* since the last time this method was called. We use this to detect
* when LUT has changed.
*/
- void ProcessInformation(vtkInformation* info) VTK_OVERRIDE;
+ void ProcessInformation(vtkInformation* info) override;
/**
* Get the min/max across all ranks. min/max are in/out.
@@ -530,7 +530,7 @@ protected:
/**
* Take part in garbage collection.
*/
- void ReportReferences(vtkGarbageCollector *collector) VTK_OVERRIDE;
+ void ReportReferences(vtkGarbageCollector *collector) override;
/**
* Updates the noise texture, downsampling by the requested sample rate.
@@ -548,7 +548,7 @@ protected:
vtkRenderer* renderer,
vtkActor* actor,
unsigned long typeflags,
- bool forceCompileOnly) VTK_OVERRIDE;
+ bool forceCompileOnly) override;
/**
diff --git a/Rendering/LICOpenGL2/vtkCompositeSurfaceLICMapper.cxx b/Rendering/LICOpenGL2/vtkCompositeSurfaceLICMapper.cxx
index 5d1e8f9c44ba363dec20c400f4148e13cee704a3..62529739ab77458d4a7542d09a364111c201d4ba 100644
--- a/Rendering/LICOpenGL2/vtkCompositeSurfaceLICMapper.cxx
+++ b/Rendering/LICOpenGL2/vtkCompositeSurfaceLICMapper.cxx
@@ -85,7 +85,7 @@ public:
protected:
vtkCompositeLICHelper();
- ~vtkCompositeLICHelper() VTK_OVERRIDE;
+ ~vtkCompositeLICHelper() override;
/**
* Build the VBO/IBO, called by UpdateBufferObjects
@@ -94,20 +94,20 @@ protected:
vtkActor *act, vtkCompositeMapperHelperData *hdata,
unsigned int &flat_index,
std::vector<unsigned char> &colors,
- std::vector<float> &norms) VTK_OVERRIDE;
+ std::vector<float> &norms) override;
protected:
/**
* Set the shader parameteres related to the mapper/input data, called by UpdateShader
*/
- void SetMapperShaderParameters(vtkOpenGLHelper &cellBO, vtkRenderer *ren, vtkActor *act) VTK_OVERRIDE;
+ void SetMapperShaderParameters(vtkOpenGLHelper &cellBO, vtkRenderer *ren, vtkActor *act) override;
/**
* Perform string replacments on the shader templates
*/
void ReplaceShaderValues(
std::map<vtkShader::Type, vtkShader *> shaders,
- vtkRenderer *ren, vtkActor *act) VTK_OVERRIDE;
+ vtkRenderer *ren, vtkActor *act) override;
private:
vtkCompositeLICHelper(const vtkCompositeLICHelper&) VTK_DELETE_FUNCTION;
diff --git a/Rendering/LICOpenGL2/vtkCompositeSurfaceLICMapper.h b/Rendering/LICOpenGL2/vtkCompositeSurfaceLICMapper.h
index 11563fa7fb638ac34f141984d0ea6ffa83bbee40..48d9f6826e11ee6e28431fe37b280361a7c6b7dc 100644
--- a/Rendering/LICOpenGL2/vtkCompositeSurfaceLICMapper.h
+++ b/Rendering/LICOpenGL2/vtkCompositeSurfaceLICMapper.h
@@ -38,7 +38,7 @@ class VTKRENDERINGLICOPENGL2_EXPORT vtkCompositeSurfaceLICMapper
public:
static vtkCompositeSurfaceLICMapper* New();
vtkTypeMacro(vtkCompositeSurfaceLICMapper, vtkCompositePolyDataMapper2);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -51,18 +51,18 @@ public:
/**
* Lots of LIC setup code
*/
- void Render(vtkRenderer *ren, vtkActor *act) VTK_OVERRIDE;
+ void Render(vtkRenderer *ren, vtkActor *act) override;
protected:
vtkCompositeSurfaceLICMapper();
- ~vtkCompositeSurfaceLICMapper() VTK_OVERRIDE;
+ ~vtkCompositeSurfaceLICMapper() override;
vtkNew<vtkSurfaceLICInterface> LICInterface;
- vtkCompositeMapperHelper2 *CreateHelper() VTK_OVERRIDE;
+ vtkCompositeMapperHelper2 *CreateHelper() override;
// copy values to the helpers
- void CopyMapperValuesToHelper(vtkCompositeMapperHelper2 *helper) VTK_OVERRIDE;
+ void CopyMapperValuesToHelper(vtkCompositeMapperHelper2 *helper) override;
private:
vtkCompositeSurfaceLICMapper(
diff --git a/Rendering/LICOpenGL2/vtkImageDataLIC2D.h b/Rendering/LICOpenGL2/vtkImageDataLIC2D.h
index 20f2f2c98bb7f432987895de9fe416d397f3e785..cc357b80b02f284556cda8b3d759166cc3bac862 100644
--- a/Rendering/LICOpenGL2/vtkImageDataLIC2D.h
+++ b/Rendering/LICOpenGL2/vtkImageDataLIC2D.h
@@ -49,7 +49,7 @@ class VTKRENDERINGLICOPENGL2_EXPORT vtkImageDataLIC2D : public vtkImageAlgorithm
public:
static vtkImageDataLIC2D* New();
vtkTypeMacro(vtkImageDataLIC2D, vtkImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -111,10 +111,10 @@ public:
protected:
vtkImageDataLIC2D();
- ~vtkImageDataLIC2D() VTK_OVERRIDE;
+ ~vtkImageDataLIC2D() override;
int RequestInformation(vtkInformation *,
- vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector **, vtkInformationVector *) override;
/**
* Fill the input port information objects for this algorithm. This
@@ -123,11 +123,11 @@ protected:
* Redefined from the superclass.
*/
int FillInputPortInformation(int port,
- vtkInformation *info) VTK_OVERRIDE;
+ vtkInformation *info) override;
int RequestUpdateExtent (vtkInformation * vtkNotUsed(request),
vtkInformationVector **inputVector,
- vtkInformationVector *vtkNotUsed( outputVector )) VTK_OVERRIDE;
+ vtkInformationVector *vtkNotUsed( outputVector )) override;
/**
* This is called by the superclass.
@@ -135,7 +135,7 @@ protected:
*/
int RequestData(vtkInformation *request,
vtkInformationVector **inputVector,
- vtkInformationVector *outputVector) VTK_OVERRIDE;
+ vtkInformationVector *outputVector) override;
vtkWeakPointer<vtkOpenGLRenderWindow> Context;
bool OwnWindow;
diff --git a/Rendering/LICOpenGL2/vtkLineIntegralConvolution2D.h b/Rendering/LICOpenGL2/vtkLineIntegralConvolution2D.h
index 779d270ba433f7da630554a1ca794c455037c87e..e69bef384d5f297953c5ac19c47ccaed10854d7c 100644
--- a/Rendering/LICOpenGL2/vtkLineIntegralConvolution2D.h
+++ b/Rendering/LICOpenGL2/vtkLineIntegralConvolution2D.h
@@ -111,7 +111,7 @@ class VTKRENDERINGLICOPENGL2_EXPORT vtkLineIntegralConvolution2D : public vtkObj
public:
static vtkLineIntegralConvolution2D *New();
vtkTypeMacro(vtkLineIntegralConvolution2D, vtkObject);
- void PrintSelf(ostream & os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream & os, vtkIndent indent) override;
/**
* Returns if the context supports the required extensions.
@@ -371,7 +371,7 @@ public:
protected:
vtkLineIntegralConvolution2D();
- ~vtkLineIntegralConvolution2D() VTK_OVERRIDE;
+ ~vtkLineIntegralConvolution2D() override;
vtkPainterCommunicator *Comm;
diff --git a/Rendering/LICOpenGL2/vtkStructuredGridLIC2D.h b/Rendering/LICOpenGL2/vtkStructuredGridLIC2D.h
index d7e6714341e4c07eb05cdfdf0a02536aa981cfd3..d761b2ce83f5898c49a0c346ca1b3cc6d3364034 100644
--- a/Rendering/LICOpenGL2/vtkStructuredGridLIC2D.h
+++ b/Rendering/LICOpenGL2/vtkStructuredGridLIC2D.h
@@ -56,7 +56,7 @@ class VTKRENDERINGLICOPENGL2_EXPORT vtkStructuredGridLIC2D
public:
static vtkStructuredGridLIC2D* New();
vtkTypeMacro(vtkStructuredGridLIC2D, vtkStructuredGridAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -117,7 +117,7 @@ public:
protected:
vtkStructuredGridLIC2D();
- ~vtkStructuredGridLIC2D() VTK_OVERRIDE;
+ ~vtkStructuredGridLIC2D() override;
/**
* Fill the input port information objects for this algorithm. This
@@ -126,7 +126,7 @@ protected:
* Redefined from the superclass.
*/
int FillInputPortInformation(int port,
- vtkInformation *info) VTK_OVERRIDE;
+ vtkInformation *info) override;
/**
* Fill the output port information objects for this algorithm.
@@ -135,15 +135,15 @@ protected:
* Redefined from the superclass.
*/
int FillOutputPortInformation(int port,
- vtkInformation *info) VTK_OVERRIDE;
+ vtkInformation *info) override;
int RequestInformation(vtkInformation *request,
vtkInformationVector **inputVector,
- vtkInformationVector *outputVector) VTK_OVERRIDE;
+ vtkInformationVector *outputVector) override;
int RequestUpdateExtent (vtkInformation *request,
vtkInformationVector **inputVector,
- vtkInformationVector *outputVector) VTK_OVERRIDE;
+ vtkInformationVector *outputVector) override;
/**
* Stolen from vtkImageAlgorithm. Should be in vtkStructuredGridAlgorithm.
@@ -162,7 +162,7 @@ protected:
*/
int RequestData(vtkInformation *request,
vtkInformationVector **inputVector,
- vtkInformationVector *outputVector) VTK_OVERRIDE;
+ vtkInformationVector *outputVector) override;
int Steps;
double StepSize;
diff --git a/Rendering/LICOpenGL2/vtkSurfaceLICComposite.h b/Rendering/LICOpenGL2/vtkSurfaceLICComposite.h
index 2859aafba2b391d4eacb334e0fcf315c9a08778f..2be14cc7a73408a228509b7b0b3b5e0847af712d 100644
--- a/Rendering/LICOpenGL2/vtkSurfaceLICComposite.h
+++ b/Rendering/LICOpenGL2/vtkSurfaceLICComposite.h
@@ -41,7 +41,7 @@ class VTKRENDERINGLICOPENGL2_EXPORT vtkSurfaceLICComposite : public vtkObject
public:
static vtkSurfaceLICComposite *New();
vtkTypeMacro(vtkSurfaceLICComposite, vtkObject);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
/**
* Initialize the object based on the following description of the
@@ -206,7 +206,7 @@ public:
protected:
vtkSurfaceLICComposite();
- ~vtkSurfaceLICComposite() VTK_OVERRIDE;
+ ~vtkSurfaceLICComposite() override;
/**
* For serial run. Make a decomposition disjoint. Sorts extents and
diff --git a/Rendering/LICOpenGL2/vtkSurfaceLICInterface.h b/Rendering/LICOpenGL2/vtkSurfaceLICInterface.h
index 09a389a93d9251dcbc5e0873c714cf8fe98075d9..f665d75c7a102eeec0439915a6a1cafd47460bef 100644
--- a/Rendering/LICOpenGL2/vtkSurfaceLICInterface.h
+++ b/Rendering/LICOpenGL2/vtkSurfaceLICInterface.h
@@ -73,7 +73,7 @@ class VTKRENDERINGLICOPENGL2_EXPORT vtkSurfaceLICInterface : public vtkObject
public:
static vtkSurfaceLICInterface* New();
vtkTypeMacro(vtkSurfaceLICInterface, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -528,7 +528,7 @@ public:
protected:
vtkSurfaceLICInterface();
- ~vtkSurfaceLICInterface() VTK_OVERRIDE;
+ ~vtkSurfaceLICInterface() override;
/**
* Updates the noise texture, downsampling by the requested sample rate.
diff --git a/Rendering/LICOpenGL2/vtkSurfaceLICMapper.h b/Rendering/LICOpenGL2/vtkSurfaceLICMapper.h
index 2dafc23c792737c10b1b94e7b9cfc37544e37403..660eb36f546ee9ae2041c2bdb9ddbf93e4a7c8b6 100644
--- a/Rendering/LICOpenGL2/vtkSurfaceLICMapper.h
+++ b/Rendering/LICOpenGL2/vtkSurfaceLICMapper.h
@@ -67,19 +67,19 @@ class VTKRENDERINGLICOPENGL2_EXPORT vtkSurfaceLICMapper : public vtkOpenGLPolyDa
public:
static vtkSurfaceLICMapper* New();
vtkTypeMacro(vtkSurfaceLICMapper, vtkOpenGLPolyDataMapper);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Release any graphics resources that are being consumed by this mapper.
* The parameter window could be used to determine which graphic
* resources to release. In this case, releases the display lists.
*/
- void ReleaseGraphicsResources(vtkWindow * win) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow * win) override;
/**
* Implemented by sub classes. Actual rendering is done here.
*/
- void RenderPiece(vtkRenderer *ren, vtkActor *act) VTK_OVERRIDE;
+ void RenderPiece(vtkRenderer *ren, vtkActor *act) override;
/**
* Shallow copy of an actor.
@@ -95,7 +95,7 @@ public:
protected:
vtkSurfaceLICMapper();
- ~vtkSurfaceLICMapper() VTK_OVERRIDE;
+ ~vtkSurfaceLICMapper() override;
/**
* Methods used for parallel benchmarks. Use cmake to define
@@ -109,20 +109,20 @@ protected:
/**
* Build the VBO/IBO, called by UpdateBufferObjects
*/
- void BuildBufferObjects(vtkRenderer *ren, vtkActor *act) VTK_OVERRIDE;
+ void BuildBufferObjects(vtkRenderer *ren, vtkActor *act) override;
protected:
/**
* Set the shader parameteres related to the mapper/input data, called by UpdateShader
*/
- void SetMapperShaderParameters(vtkOpenGLHelper &cellBO, vtkRenderer *ren, vtkActor *act) VTK_OVERRIDE;
+ void SetMapperShaderParameters(vtkOpenGLHelper &cellBO, vtkRenderer *ren, vtkActor *act) override;
/**
* Perform string replacments on the shader templates
*/
void ReplaceShaderValues(
std::map<vtkShader::Type, vtkShader *> shaders,
- vtkRenderer *ren, vtkActor *act) VTK_OVERRIDE;
+ vtkRenderer *ren, vtkActor *act) override;
vtkSurfaceLICInterface *LICInterface;
diff --git a/Rendering/LOD/vtkLODActor.h b/Rendering/LOD/vtkLODActor.h
index a649e30a557f8244fe64c4e620f33e99052d9359..4213e97a79e6c5448778987c4e52efdc7b8d93f0 100644
--- a/Rendering/LOD/vtkLODActor.h
+++ b/Rendering/LOD/vtkLODActor.h
@@ -71,7 +71,7 @@ class VTKRENDERINGLOD_EXPORT vtkLODActor : public vtkActor
{
public:
vtkTypeMacro(vtkLODActor, vtkActor);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Creates a vtkLODActor with the following defaults: origin(0,0,0)
@@ -84,20 +84,20 @@ public:
* This causes the actor to be rendered.
* It, in turn, will render the actor's property and then mapper.
*/
- void Render(vtkRenderer *, vtkMapper *) VTK_OVERRIDE;
+ void Render(vtkRenderer *, vtkMapper *) override;
/**
* This method is used internally by the rendering process. We override
* the superclass method to properly set the estimated render time.
*/
- int RenderOpaqueGeometry(vtkViewport* viewport) VTK_OVERRIDE;
+ int RenderOpaqueGeometry(vtkViewport* viewport) override;
/**
* Release any graphics resources that are being consumed by this actor.
* The parameter window could be used to determine which graphic
* resources to release.
*/
- void ReleaseGraphicsResources(vtkWindow*) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow*) override;
/**
* Add another level of detail.
@@ -136,16 +136,16 @@ public:
/**
* When this objects gets modified, this method also modifies the object.
*/
- void Modified() VTK_OVERRIDE;
+ void Modified() override;
/**
* Shallow copy of an LOD actor. Overloads the virtual vtkProp method.
*/
- void ShallowCopy(vtkProp *prop) VTK_OVERRIDE;
+ void ShallowCopy(vtkProp *prop) override;
protected:
vtkLODActor();
- ~vtkLODActor() VTK_OVERRIDE;
+ ~vtkLODActor() override;
vtkActor* Device;
vtkMapperCollection* LODMappers;
diff --git a/Rendering/LOD/vtkQuadricLODActor.h b/Rendering/LOD/vtkQuadricLODActor.h
index cc8b495f308b696929ee97c2c14c14075e41524b..b4d2b72981a359a3ea7fadf2b40351f51ae1f42e 100644
--- a/Rendering/LOD/vtkQuadricLODActor.h
+++ b/Rendering/LOD/vtkQuadricLODActor.h
@@ -71,7 +71,7 @@ public:
* Standard class methods.
*/
vtkTypeMacro(vtkQuadricLODActor, vtkActor);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
@@ -208,29 +208,29 @@ public:
* it will use either a full resolution render or an interactive render (i.e.,
* it will use the decimated geometry).
*/
- void Render(vtkRenderer *, vtkMapper *) VTK_OVERRIDE;
+ void Render(vtkRenderer *, vtkMapper *) override;
/**
* This method is used internally by the rendering process. We override
* the superclass method to properly set the estimated render time.
*/
- int RenderOpaqueGeometry(vtkViewport *viewport) VTK_OVERRIDE;
+ int RenderOpaqueGeometry(vtkViewport *viewport) override;
/**
* Release any graphics resources that are being consumed by this actor.
* The parameter window could be used to determine which graphic
* resources to release.
*/
- void ReleaseGraphicsResources(vtkWindow *) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *) override;
/**
* Shallow copy of an LOD actor. Overloads the virtual vtkProp method.
*/
- void ShallowCopy(vtkProp *prop) VTK_OVERRIDE;
+ void ShallowCopy(vtkProp *prop) override;
protected:
vtkQuadricLODActor();
- ~vtkQuadricLODActor() VTK_OVERRIDE;
+ ~vtkQuadricLODActor() override;
// Renders the LOD
vtkActor *LODActor;
diff --git a/Rendering/Label/vtkDynamic2DLabelMapper.h b/Rendering/Label/vtkDynamic2DLabelMapper.h
index 88acf484707b12fee91650303e37f572db65f800..ccb3a0c02800b07b05b94422c9bcb08704bf0f30 100644
--- a/Rendering/Label/vtkDynamic2DLabelMapper.h
+++ b/Rendering/Label/vtkDynamic2DLabelMapper.h
@@ -66,7 +66,7 @@ public:
*/
static vtkDynamic2DLabelMapper *New();
vtkTypeMacro(vtkDynamic2DLabelMapper, vtkLabeledDataMapper);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
@@ -109,13 +109,13 @@ public:
/**
* Draw non-overlapping labels to the screen.
*/
- void RenderOpaqueGeometry(vtkViewport* viewport, vtkActor2D* actor) VTK_OVERRIDE;
- void RenderOverlay(vtkViewport *viewport, vtkActor2D *actor) VTK_OVERRIDE;
+ void RenderOpaqueGeometry(vtkViewport* viewport, vtkActor2D* actor) override;
+ void RenderOverlay(vtkViewport *viewport, vtkActor2D *actor) override;
//@}
protected:
vtkDynamic2DLabelMapper();
- ~vtkDynamic2DLabelMapper() VTK_OVERRIDE;
+ ~vtkDynamic2DLabelMapper() override;
/**
* Calculate the current zoom scale of the viewport.
diff --git a/Rendering/Label/vtkFreeTypeLabelRenderStrategy.h b/Rendering/Label/vtkFreeTypeLabelRenderStrategy.h
index be9b2053b581532f1009a5235deb87d40a203d43..e8ffe37a9cfc54c7226f5df7270d8d21f9de889e 100644
--- a/Rendering/Label/vtkFreeTypeLabelRenderStrategy.h
+++ b/Rendering/Label/vtkFreeTypeLabelRenderStrategy.h
@@ -34,39 +34,39 @@ class vtkTextMapper;
class VTKRENDERINGLABEL_EXPORT vtkFreeTypeLabelRenderStrategy : public vtkLabelRenderStrategy
{
public:
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
vtkTypeMacro(vtkFreeTypeLabelRenderStrategy, vtkLabelRenderStrategy);
static vtkFreeTypeLabelRenderStrategy* New();
/**
* The free type render strategy currently does not support rotation.
*/
- bool SupportsRotation() VTK_OVERRIDE
+ bool SupportsRotation() override
{ return false; }
/**
* The free type render strategy currently does not support bounded size labels.
*/
- bool SupportsBoundedSize() VTK_OVERRIDE
+ bool SupportsBoundedSize() override
{ return false; }
/**
* Compute the bounds of a label. Must be performed after the renderer is set.
*/
- void ComputeLabelBounds(vtkTextProperty* tprop, vtkStdString label, double bds[4]) VTK_OVERRIDE
+ void ComputeLabelBounds(vtkTextProperty* tprop, vtkStdString label, double bds[4]) override
{ this->Superclass::ComputeLabelBounds(tprop, label, bds); }
- void ComputeLabelBounds(vtkTextProperty* tprop, vtkUnicodeString label, double bds[4]) VTK_OVERRIDE;
+ void ComputeLabelBounds(vtkTextProperty* tprop, vtkUnicodeString label, double bds[4]) override;
/**
* Render a label at a location in world coordinates.
* Must be performed between StartFrame() and EndFrame() calls.
*/
- void RenderLabel(int x[2], vtkTextProperty* tprop, vtkStdString label) VTK_OVERRIDE
+ void RenderLabel(int x[2], vtkTextProperty* tprop, vtkStdString label) override
{ this->Superclass::RenderLabel(x, tprop, label); }
- void RenderLabel(int x[2], vtkTextProperty* tprop, vtkStdString label, int width) VTK_OVERRIDE
+ void RenderLabel(int x[2], vtkTextProperty* tprop, vtkStdString label, int width) override
{ this->Superclass::RenderLabel(x, tprop, label, width); }
- void RenderLabel(int x[2], vtkTextProperty* tprop, vtkUnicodeString label) VTK_OVERRIDE;
- void RenderLabel(int x[2], vtkTextProperty* tprop, vtkUnicodeString label, int width) VTK_OVERRIDE
+ void RenderLabel(int x[2], vtkTextProperty* tprop, vtkUnicodeString label) override;
+ void RenderLabel(int x[2], vtkTextProperty* tprop, vtkUnicodeString label, int width) override
{ this->Superclass::RenderLabel(x, tprop, label, width); }
/**
@@ -74,11 +74,11 @@ class VTKRENDERINGLABEL_EXPORT vtkFreeTypeLabelRenderStrategy : public vtkLabelR
* The parameter window could be used to determine which graphic
* resources to release.
*/
- void ReleaseGraphicsResources(vtkWindow *window) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *window) override;
protected:
vtkFreeTypeLabelRenderStrategy();
- ~vtkFreeTypeLabelRenderStrategy() VTK_OVERRIDE;
+ ~vtkFreeTypeLabelRenderStrategy() override;
vtkTextRenderer *TextRenderer;
vtkTextMapper* Mapper;
diff --git a/Rendering/Label/vtkLabelHierarchy.cxx b/Rendering/Label/vtkLabelHierarchy.cxx
index b47d69c8c963297f3b2417c869c7e8fa43e6e78c..aa9881ca663ee15d67dda9794c00f190f0143b88 100644
--- a/Rendering/Label/vtkLabelHierarchy.cxx
+++ b/Rendering/Label/vtkLabelHierarchy.cxx
@@ -86,15 +86,15 @@ public:
vtkTypeMacro(vtkLabelHierarchyFrustumIterator,vtkLabelHierarchyIterator);
static vtkLabelHierarchyFrustumIterator* New();
void Prepare( vtkLabelHierarchy* hier, vtkCamera* cam, double frustumPlanes[24] );
- void Begin( vtkIdTypeArray* lastPlaced ) VTK_OVERRIDE;
+ void Begin( vtkIdTypeArray* lastPlaced ) override;
virtual void BeginOctreeTraversal();
- void Next() VTK_OVERRIDE;
- bool IsAtEnd() VTK_OVERRIDE;
- vtkIdType GetLabelId() VTK_OVERRIDE;
- void GetNodeGeometry( double center[3], double& sz ) VTK_OVERRIDE;
+ void Next() override;
+ bool IsAtEnd() override;
+ vtkIdType GetLabelId() override;
+ void GetNodeGeometry( double center[3], double& sz ) override;
protected:
vtkLabelHierarchyFrustumIterator();
- ~vtkLabelHierarchyFrustumIterator() VTK_OVERRIDE;
+ ~vtkLabelHierarchyFrustumIterator() override;
bool IsCursorInFrustum();
virtual void SetCamera( vtkCamera* camera );
@@ -504,11 +504,11 @@ public:
void Prepare( vtkLabelHierarchy* hier, vtkCamera* cam,
double frustumPlanes[24], bool positionsAsNormals );
- void Begin( vtkIdTypeArray* lastPlaced ) VTK_OVERRIDE;
- void Next() VTK_OVERRIDE;
- bool IsAtEnd() VTK_OVERRIDE;
- vtkIdType GetLabelId() VTK_OVERRIDE;
- void GetNodeGeometry( double center[3], double& sz ) VTK_OVERRIDE;
+ void Begin( vtkIdTypeArray* lastPlaced ) override;
+ void Next() override;
+ bool IsAtEnd() override;
+ vtkIdType GetLabelId() override;
+ void GetNodeGeometry( double center[3], double& sz ) override;
// Give internal class access to this protected type.
typedef vtkLabelHierarchy::Implementation::HierarchyType3::octree_node_pointer NodePointer;
@@ -537,7 +537,7 @@ public:
protected:
vtkLabelHierarchyFullSortIterator();
- ~vtkLabelHierarchyFullSortIterator() VTK_OVERRIDE;
+ ~vtkLabelHierarchyFullSortIterator() override;
std::set<vtkHierarchyNode, vtkHierarchyNodeSorter> NodeSet;
std::set<vtkHierarchyNode, vtkHierarchyNodeSorter>::iterator NodeIterator;
@@ -775,11 +775,11 @@ public:
typedef vtkLabelHierarchy::Implementation::HierarchyType2::octree_node_pointer NodePointer;
void Prepare( vtkLabelHierarchy* hier, vtkCamera* cam, double frustumPlanes[24], vtkRenderer* ren, float bucketSize[2] );
- void Begin( vtkIdTypeArray* lastPlaced ) VTK_OVERRIDE;
- void Next() VTK_OVERRIDE;
- bool IsAtEnd() VTK_OVERRIDE;
- vtkIdType GetLabelId() VTK_OVERRIDE;
- void GetNodeGeometry( double center[3], double& sz ) VTK_OVERRIDE;
+ void Begin( vtkIdTypeArray* lastPlaced ) override;
+ void Next() override;
+ bool IsAtEnd() override;
+ vtkIdType GetLabelId() override;
+ void GetNodeGeometry( double center[3], double& sz ) override;
bool IsNodeInFrustum( NodePointer node );
vtkGetObjectMacro(Camera,vtkCamera);
vtkGetObjectMacro(Renderer,vtkRenderer);
@@ -790,7 +790,7 @@ public:
protected:
vtkLabelHierarchyQuadtreeIterator();
- ~vtkLabelHierarchyQuadtreeIterator() VTK_OVERRIDE;
+ ~vtkLabelHierarchyQuadtreeIterator() override;
virtual void SetCamera( vtkCamera* camera );
virtual void SetRenderer( vtkRenderer* renderer );
@@ -1100,11 +1100,11 @@ public:
typedef vtkLabelHierarchy::Implementation::HierarchyType3::octree_node_pointer NodePointer;
void Prepare( vtkLabelHierarchy* hier, vtkCamera* cam, double frustumPlanes[24], vtkRenderer* ren, float bucketSize[2] );
- void Begin( vtkIdTypeArray* lastPlaced ) VTK_OVERRIDE;
- void Next() VTK_OVERRIDE;
- bool IsAtEnd() VTK_OVERRIDE;
- vtkIdType GetLabelId() VTK_OVERRIDE;
- void GetNodeGeometry( double center[3], double& sz ) VTK_OVERRIDE;
+ void Begin( vtkIdTypeArray* lastPlaced ) override;
+ void Next() override;
+ bool IsAtEnd() override;
+ vtkIdType GetLabelId() override;
+ void GetNodeGeometry( double center[3], double& sz ) override;
bool IsNodeInFrustum( NodePointer node );
vtkGetObjectMacro(Camera,vtkCamera);
vtkGetObjectMacro(Renderer,vtkRenderer);
@@ -1115,7 +1115,7 @@ public:
protected:
vtkLabelHierarchyOctreeQueueIterator();
- ~vtkLabelHierarchyOctreeQueueIterator() VTK_OVERRIDE;
+ ~vtkLabelHierarchyOctreeQueueIterator() override;
virtual void SetCamera( vtkCamera* camera );
virtual void SetRenderer( vtkRenderer* renderer );
@@ -1479,11 +1479,11 @@ public:
static vtkLabelHierarchy3DepthFirstIterator* New();
void Prepare( vtkLabelHierarchy* hier, vtkCamera* cam, double frustumPlanes[24], vtkRenderer* ren, float bucketSize[2] );
- void Begin( vtkIdTypeArray* lastPlaced ) VTK_OVERRIDE;
- void Next() VTK_OVERRIDE;
- bool IsAtEnd() VTK_OVERRIDE;
- vtkIdType GetLabelId() VTK_OVERRIDE;
- void GetNodeGeometry( double center[3], double& sz ) VTK_OVERRIDE;
+ void Begin( vtkIdTypeArray* lastPlaced ) override;
+ void Next() override;
+ bool IsAtEnd() override;
+ vtkIdType GetLabelId() override;
+ void GetNodeGeometry( double center[3], double& sz ) override;
bool IsNodeInFrustum();
void ReorderChildrenForView( int order[8] );
vtkGetObjectMacro(Camera,vtkCamera);
@@ -1491,7 +1491,7 @@ public:
protected:
vtkLabelHierarchy3DepthFirstIterator();
- ~vtkLabelHierarchy3DepthFirstIterator() VTK_OVERRIDE;
+ ~vtkLabelHierarchy3DepthFirstIterator() override;
virtual void SetCamera( vtkCamera* camera );
virtual void SetRenderer( vtkRenderer* renderer );
diff --git a/Rendering/Label/vtkLabelHierarchy.h b/Rendering/Label/vtkLabelHierarchy.h
index 0ecf3f345a6681f484153629849f4fc29041edb6..c450afba2d6deecd46fa26017ba813d5e9af7029 100644
--- a/Rendering/Label/vtkLabelHierarchy.h
+++ b/Rendering/Label/vtkLabelHierarchy.h
@@ -80,12 +80,12 @@ class VTKRENDERINGLABEL_EXPORT vtkLabelHierarchy : public vtkPointSet
public:
static vtkLabelHierarchy* New();
vtkTypeMacro(vtkLabelHierarchy,vtkPointSet);
- void PrintSelf( ostream& os, vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf( ostream& os, vtkIndent indent ) override;
/**
* Override SetPoints so we can reset the hierarchy when the points change.
*/
- void SetPoints( vtkPoints* ) VTK_OVERRIDE;
+ void SetPoints( vtkPoints* ) override;
/**
* Fill the hierarchy with the input labels.
@@ -217,16 +217,16 @@ public:
/**
* Inherited members (from vtkDataSet)
*/
- vtkIdType GetNumberOfCells() VTK_OVERRIDE;
+ vtkIdType GetNumberOfCells() override;
using vtkDataSet::GetCell;
- vtkCell* GetCell(vtkIdType) VTK_OVERRIDE;
- void GetCell(vtkIdType, vtkGenericCell*) VTK_OVERRIDE;
- int GetCellType(vtkIdType) VTK_OVERRIDE;
- void GetCellPoints(vtkIdType, vtkIdList*) VTK_OVERRIDE;
- void GetPointCells(vtkIdType, vtkIdList*) VTK_OVERRIDE;
- vtkIdType FindCell(double*, vtkCell*, vtkIdType, double, int&, double*, double*) VTK_OVERRIDE;
- vtkIdType FindCell(double*, vtkCell*, vtkGenericCell*, vtkIdType, double, int&, double*, double*) VTK_OVERRIDE;
- int GetMaxCellSize() VTK_OVERRIDE;
+ vtkCell* GetCell(vtkIdType) override;
+ void GetCell(vtkIdType, vtkGenericCell*) override;
+ int GetCellType(vtkIdType) override;
+ void GetCellPoints(vtkIdType, vtkIdList*) override;
+ void GetPointCells(vtkIdType, vtkIdList*) override;
+ vtkIdType FindCell(double*, vtkCell*, vtkIdType, double, int&, double*, double*) override;
+ vtkIdType FindCell(double*, vtkCell*, vtkGenericCell*, vtkIdType, double, int&, double*, double*) override;
+ int GetMaxCellSize() override;
//@}
class Implementation;
@@ -250,7 +250,7 @@ public:
protected:
vtkLabelHierarchy();
- ~vtkLabelHierarchy() VTK_OVERRIDE;
+ ~vtkLabelHierarchy() override;
int TargetLabelCount;
int MaximumDepth;
diff --git a/Rendering/Label/vtkLabelHierarchyAlgorithm.h b/Rendering/Label/vtkLabelHierarchyAlgorithm.h
index 7cb91690fef065c75fb7288c27639b4f533a2c52..47d4a6de0ee1fb5c246b6f12a1b465a448ed14c2 100644
--- a/Rendering/Label/vtkLabelHierarchyAlgorithm.h
+++ b/Rendering/Label/vtkLabelHierarchyAlgorithm.h
@@ -45,7 +45,7 @@ class VTKRENDERINGLABEL_EXPORT vtkLabelHierarchyAlgorithm : public vtkAlgorithm
public:
static vtkLabelHierarchyAlgorithm *New();
vtkTypeMacro(vtkLabelHierarchyAlgorithm,vtkAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -61,7 +61,7 @@ public:
*/
int ProcessRequest(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
// this method is not recommended for use, but lots of old style filters use it
vtkDataObject* GetInput();
@@ -90,7 +90,7 @@ public:
protected:
vtkLabelHierarchyAlgorithm();
- ~vtkLabelHierarchyAlgorithm() VTK_OVERRIDE;
+ ~vtkLabelHierarchyAlgorithm() override;
/**
* This is called by the superclass.
@@ -126,8 +126,8 @@ protected:
vtkInformationVector* );
// see algorithm for more info
- int FillOutputPortInformation( int port, vtkInformation* info ) VTK_OVERRIDE;
- int FillInputPortInformation( int port, vtkInformation* info ) VTK_OVERRIDE;
+ int FillOutputPortInformation( int port, vtkInformation* info ) override;
+ int FillInputPortInformation( int port, vtkInformation* info ) override;
private:
vtkLabelHierarchyAlgorithm( const vtkLabelHierarchyAlgorithm& ) VTK_DELETE_FUNCTION;
diff --git a/Rendering/Label/vtkLabelHierarchyCompositeIterator.h b/Rendering/Label/vtkLabelHierarchyCompositeIterator.h
index 18ad54632a62d598ec1e1c48e45c5bce4878d499..ca5a6f5674083a867a2cf79768f6dc6c4d8a322a 100644
--- a/Rendering/Label/vtkLabelHierarchyCompositeIterator.h
+++ b/Rendering/Label/vtkLabelHierarchyCompositeIterator.h
@@ -49,7 +49,7 @@ class VTKRENDERINGLABEL_EXPORT vtkLabelHierarchyCompositeIterator : public vtkLa
{
public:
vtkTypeMacro(vtkLabelHierarchyCompositeIterator, vtkLabelHierarchyIterator);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkLabelHierarchyCompositeIterator* New();
/**
@@ -72,27 +72,27 @@ public:
* This could include labels placed during a previous rendering or
* a label located under the mouse pointer. You may pass a null pointer.
*/
- void Begin( vtkIdTypeArray* ) VTK_OVERRIDE;
+ void Begin( vtkIdTypeArray* ) override;
/**
* Advance the iterator.
*/
- void Next() VTK_OVERRIDE;
+ void Next() override;
/**
* Returns true if the iterator is at the end.
*/
- bool IsAtEnd() VTK_OVERRIDE;
+ bool IsAtEnd() override;
/**
* Retrieves the current label id.
*/
- vtkIdType GetLabelId() VTK_OVERRIDE;
+ vtkIdType GetLabelId() override;
/**
* Retrieve the current label hierarchy.
*/
- vtkLabelHierarchy* GetHierarchy() VTK_OVERRIDE;
+ vtkLabelHierarchy* GetHierarchy() override;
/**
* Retrieve the coordinates of the center of the current hierarchy node
@@ -100,21 +100,21 @@ public:
* Nodes are n-cubes, so the size is the length of any edge of the cube.
* This is used by BoxNode().
*/
- void GetNodeGeometry( double ctr[3], double& size ) VTK_OVERRIDE;
+ void GetNodeGeometry( double ctr[3], double& size ) override;
/**
* Not implemented.
*/
- void BoxNode() VTK_OVERRIDE { }
+ void BoxNode() override { }
/**
* Not implemented.
*/
- void BoxAllNodes( vtkPolyData* ) VTK_OVERRIDE { }
+ void BoxAllNodes( vtkPolyData* ) override { }
protected:
vtkLabelHierarchyCompositeIterator();
- ~vtkLabelHierarchyCompositeIterator() VTK_OVERRIDE;
+ ~vtkLabelHierarchyCompositeIterator() override;
class Internal;
Internal* Implementation;
diff --git a/Rendering/Label/vtkLabelHierarchyIterator.h b/Rendering/Label/vtkLabelHierarchyIterator.h
index 1e2211ef5b06443c1c2c2b9e9ebcff22a5d8c4db..91df8fcc98437b19385a9ed8945732b73a04f8fc 100644
--- a/Rendering/Label/vtkLabelHierarchyIterator.h
+++ b/Rendering/Label/vtkLabelHierarchyIterator.h
@@ -41,7 +41,7 @@ class VTKRENDERINGLABEL_EXPORT vtkLabelHierarchyIterator : public vtkObject
{
public:
vtkTypeMacro(vtkLabelHierarchyIterator,vtkObject);
- void PrintSelf( ostream& os, vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf( ostream& os, vtkIndent indent ) override;
/**
* Initializes the iterator. lastLabels is an array holding labels
@@ -149,7 +149,7 @@ public:
protected:
vtkLabelHierarchyIterator();
- ~vtkLabelHierarchyIterator() VTK_OVERRIDE;
+ ~vtkLabelHierarchyIterator() override;
void BoxNodeInternal3( const double* ctr, double sz );
void BoxNodeInternal2( const double* ctr, double sz );
diff --git a/Rendering/Label/vtkLabelPlacementMapper.h b/Rendering/Label/vtkLabelPlacementMapper.h
index 43d127bfa85edab34c2e5915b0737d9fc8a04901..0e9aa7e03e23fcf8ad286ff7a5bef219d170a1a6 100644
--- a/Rendering/Label/vtkLabelPlacementMapper.h
+++ b/Rendering/Label/vtkLabelPlacementMapper.h
@@ -47,12 +47,12 @@ class VTKRENDERINGLABEL_EXPORT vtkLabelPlacementMapper : public vtkMapper2D
public:
static vtkLabelPlacementMapper *New();
vtkTypeMacro(vtkLabelPlacementMapper, vtkMapper2D);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Draw non-overlapping labels to the screen.
*/
- void RenderOverlay(vtkViewport *viewport, vtkActor2D *actor) VTK_OVERRIDE;
+ void RenderOverlay(vtkViewport *viewport, vtkActor2D *actor) override;
//@{
/**
@@ -217,15 +217,15 @@ public:
* The parameter window could be used to determine which graphic
* resources to release.
*/
- void ReleaseGraphicsResources(vtkWindow *) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *) override;
protected:
vtkLabelPlacementMapper();
- ~vtkLabelPlacementMapper() VTK_OVERRIDE;
+ ~vtkLabelPlacementMapper() override;
virtual void SetAnchorTransform( vtkCoordinate* );
- int FillInputPortInformation( int port, vtkInformation* info ) VTK_OVERRIDE;
+ int FillInputPortInformation( int port, vtkInformation* info ) override;
class Internal;
Internal* Buckets;
diff --git a/Rendering/Label/vtkLabelPlacer.h b/Rendering/Label/vtkLabelPlacer.h
index 0f1dbfe88dbdaf296ccca4e1c166bdaf45f1c3c8..7023ce9b2b99542c1a6f1293500fa7ece7a7f908 100644
--- a/Rendering/Label/vtkLabelPlacer.h
+++ b/Rendering/Label/vtkLabelPlacer.h
@@ -54,7 +54,7 @@ class VTKRENDERINGLABEL_EXPORT vtkLabelPlacer : public vtkPolyDataAlgorithm
public:
static vtkLabelPlacer* New();
vtkTypeMacro(vtkLabelPlacer,vtkPolyDataAlgorithm);
- void PrintSelf( ostream& os, vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf( ostream& os, vtkIndent indent ) override;
vtkGetObjectMacro(Renderer,vtkRenderer);
virtual void SetRenderer( vtkRenderer* );
@@ -133,7 +133,7 @@ public:
vtkBooleanMacro(UseUnicodeStrings,bool);
//@}
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
//@{
/**
@@ -188,13 +188,13 @@ public:
protected:
vtkLabelPlacer();
- ~vtkLabelPlacer() VTK_OVERRIDE;
+ ~vtkLabelPlacer() override;
virtual void SetAnchorTransform( vtkCoordinate* );
- int FillInputPortInformation( int port, vtkInformation* info ) VTK_OVERRIDE;
+ int FillInputPortInformation( int port, vtkInformation* info ) override;
int RequestData( vtkInformation* request,
- vtkInformationVector** inputVector, vtkInformationVector* outputVector ) VTK_OVERRIDE;
+ vtkInformationVector** inputVector, vtkInformationVector* outputVector ) override;
class Internal;
Internal* Buckets;
diff --git a/Rendering/Label/vtkLabelRenderStrategy.h b/Rendering/Label/vtkLabelRenderStrategy.h
index 0c0f8a5e2eb8979395945cb4065befcccf1bead8..94c29bb56c4a66b3ce531bb7d70a4ca66a56951c 100644
--- a/Rendering/Label/vtkLabelRenderStrategy.h
+++ b/Rendering/Label/vtkLabelRenderStrategy.h
@@ -36,7 +36,7 @@ class vtkTextProperty;
class VTKRENDERINGLABEL_EXPORT vtkLabelRenderStrategy : public vtkObject
{
public:
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
vtkTypeMacro(vtkLabelRenderStrategy, vtkObject);
/**
@@ -123,7 +123,7 @@ class VTKRENDERINGLABEL_EXPORT vtkLabelRenderStrategy : public vtkObject
protected:
vtkLabelRenderStrategy();
- ~vtkLabelRenderStrategy() VTK_OVERRIDE;
+ ~vtkLabelRenderStrategy() override;
vtkRenderer* Renderer;
vtkTextProperty* DefaultTextProperty;
diff --git a/Rendering/Label/vtkLabelSizeCalculator.h b/Rendering/Label/vtkLabelSizeCalculator.h
index ffd33f4fb6f05981f488d2982ec99183999cb63e..56b52ebd7621907e1c8e41b79bcb68bdc91fca85 100644
--- a/Rendering/Label/vtkLabelSizeCalculator.h
+++ b/Rendering/Label/vtkLabelSizeCalculator.h
@@ -49,7 +49,7 @@ class VTKRENDERINGLABEL_EXPORT vtkLabelSizeCalculator : public vtkPassInputTypeA
{
public:
static vtkLabelSizeCalculator* New();
- void PrintSelf( ostream& os, vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf( ostream& os, vtkIndent indent ) override;
vtkTypeMacro(vtkLabelSizeCalculator,vtkPassInputTypeAlgorithm);
//@{
@@ -83,13 +83,13 @@ public:
protected:
vtkLabelSizeCalculator();
- ~vtkLabelSizeCalculator() VTK_OVERRIDE;
+ ~vtkLabelSizeCalculator() override;
- int FillInputPortInformation( int port, vtkInformation* info ) VTK_OVERRIDE;
+ int FillInputPortInformation( int port, vtkInformation* info ) override;
int RequestData(
vtkInformation* request,
vtkInformationVector** inInfo,
- vtkInformationVector* outInfo ) VTK_OVERRIDE;
+ vtkInformationVector* outInfo ) override;
virtual vtkIntArray* LabelSizesForArray( vtkAbstractArray* labels, vtkIntArray* types );
diff --git a/Rendering/Label/vtkLabeledDataMapper.h b/Rendering/Label/vtkLabeledDataMapper.h
index 8357ea444cdaa542a1548aaf1bd23d88fcfa5b55..683778ea4145a8d9102f8d8a7081668e4d3b77c3 100644
--- a/Rendering/Label/vtkLabeledDataMapper.h
+++ b/Rendering/Label/vtkLabeledDataMapper.h
@@ -75,7 +75,7 @@ public:
static vtkLabeledDataMapper *New();
vtkTypeMacro(vtkLabeledDataMapper,vtkMapper2D);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -175,14 +175,14 @@ public:
/**
* Draw the text to the screen at each input point.
*/
- void RenderOpaqueGeometry(vtkViewport* viewport, vtkActor2D* actor) VTK_OVERRIDE;
- void RenderOverlay(vtkViewport* viewport, vtkActor2D* actor) VTK_OVERRIDE;
+ void RenderOpaqueGeometry(vtkViewport* viewport, vtkActor2D* actor) override;
+ void RenderOverlay(vtkViewport* viewport, vtkActor2D* actor) override;
//@}
/**
* Release any graphics resources that are being consumed by this actor.
*/
- void ReleaseGraphicsResources(vtkWindow *) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *) override;
//@{
/**
@@ -213,7 +213,7 @@ public:
/**
* Return the modified time for this object.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
//@{
/**
@@ -242,7 +242,7 @@ public:
protected:
vtkLabeledDataMapper();
- ~vtkLabeledDataMapper() VTK_OVERRIDE;
+ ~vtkLabeledDataMapper() override;
vtkDataSet *Input;
@@ -261,7 +261,7 @@ protected:
double* LabelPositions;
vtkTransform *Transform;
- int FillInputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
+ int FillInputPortInformation(int, vtkInformation*) override;
void AllocateLabels(int numLabels);
void BuildLabels();
diff --git a/Rendering/Label/vtkLabeledTreeMapDataMapper.h b/Rendering/Label/vtkLabeledTreeMapDataMapper.h
index 65f45f2baa18436e9cbe8a812e6e15c80b2a40f7..747dbd425b6717bf08dbf93b3677ba269b0a7cd3 100644
--- a/Rendering/Label/vtkLabeledTreeMapDataMapper.h
+++ b/Rendering/Label/vtkLabeledTreeMapDataMapper.h
@@ -59,14 +59,14 @@ class VTKRENDERINGLABEL_EXPORT vtkLabeledTreeMapDataMapper : public vtkLabeledDa
public:
static vtkLabeledTreeMapDataMapper *New();
vtkTypeMacro(vtkLabeledTreeMapDataMapper,vtkLabeledDataMapper);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
* Draw the text to the screen at each input point.
*/
- void RenderOpaqueGeometry(vtkViewport* viewport, vtkActor2D* actor) VTK_OVERRIDE;
- void RenderOverlay(vtkViewport *viewport, vtkActor2D *actor) VTK_OVERRIDE;
+ void RenderOpaqueGeometry(vtkViewport* viewport, vtkActor2D* actor) override;
+ void RenderOverlay(vtkViewport *viewport, vtkActor2D *actor) override;
//@}
/**
@@ -108,7 +108,7 @@ public:
/**
* Release any graphics resources that are being consumed by this actor.
*/
- void ReleaseGraphicsResources(vtkWindow *) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *) override;
//@{
/**
@@ -130,7 +130,7 @@ public:
protected:
vtkLabeledTreeMapDataMapper();
- ~vtkLabeledTreeMapDataMapper() VTK_OVERRIDE;
+ ~vtkLabeledTreeMapDataMapper() override;
void LabelTree(vtkTree *tree, vtkFloatArray *boxInfo,
vtkDataArray *numericData, vtkStringArray *stringData,
int activeComp, int numComps);
diff --git a/Rendering/Label/vtkPointSetToLabelHierarchy.h b/Rendering/Label/vtkPointSetToLabelHierarchy.h
index af41deb876b45b0e95f9cfbd8a2b60383a96e36d..18569a13ad55061972422f854f10f26c644faa94 100644
--- a/Rendering/Label/vtkPointSetToLabelHierarchy.h
+++ b/Rendering/Label/vtkPointSetToLabelHierarchy.h
@@ -43,7 +43,7 @@ class VTKRENDERINGLABEL_EXPORT vtkPointSetToLabelHierarchy : public vtkLabelHier
public:
static vtkPointSetToLabelHierarchy* New();
vtkTypeMacro(vtkPointSetToLabelHierarchy,vtkLabelHierarchyAlgorithm);
- void PrintSelf( ostream& os, vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf( ostream& os, vtkIndent indent ) override;
//@{
/**
@@ -128,14 +128,14 @@ public:
protected:
vtkPointSetToLabelHierarchy();
- ~vtkPointSetToLabelHierarchy() VTK_OVERRIDE;
+ ~vtkPointSetToLabelHierarchy() override;
- int FillInputPortInformation( int port, vtkInformation* info ) VTK_OVERRIDE;
+ int FillInputPortInformation( int port, vtkInformation* info ) override;
int RequestData(
vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector ) VTK_OVERRIDE;
+ vtkInformationVector* outputVector ) override;
int TargetLabelCount;
int MaximumDepth;
diff --git a/Rendering/Matplotlib/Testing/Cxx/TestContextMathTextImage.cxx b/Rendering/Matplotlib/Testing/Cxx/TestContextMathTextImage.cxx
index 83ff3328dae6b164c047ea1df18ada155a418730..073681c3877ec785d83092b7c0a8ead021b9e266 100644
--- a/Rendering/Matplotlib/Testing/Cxx/TestContextMathTextImage.cxx
+++ b/Rendering/Matplotlib/Testing/Cxx/TestContextMathTextImage.cxx
@@ -33,7 +33,7 @@ public:
static ContextMathTextImageTest *New();
vtkTypeMacro(ContextMathTextImageTest, vtkContextItem);
// Paint event for the chart, called whenever the chart needs to be drawn
- virtual bool Paint(vtkContext2D *painter) VTK_OVERRIDE;
+ virtual bool Paint(vtkContext2D *painter) override;
};
//----------------------------------------------------------------------------
diff --git a/Rendering/Matplotlib/Testing/Cxx/TestGL2PSMathTextOutput.cxx b/Rendering/Matplotlib/Testing/Cxx/TestGL2PSMathTextOutput.cxx
index dd20293aa0ff37f7dec56716d731fc06b3343f9f..2c16de5d93f9d897a1773613aeabb9851e60d31b 100644
--- a/Rendering/Matplotlib/Testing/Cxx/TestGL2PSMathTextOutput.cxx
+++ b/Rendering/Matplotlib/Testing/Cxx/TestGL2PSMathTextOutput.cxx
@@ -37,7 +37,7 @@ public:
static GL2PSMathTextOutputTest *New();
vtkTypeMacro(GL2PSMathTextOutputTest, vtkContextItem)
// Paint event for the chart, called whenever the chart needs to be drawn
- virtual bool Paint(vtkContext2D *painter) VTK_OVERRIDE;
+ virtual bool Paint(vtkContext2D *painter) override;
};
//----------------------------------------------------------------------------
diff --git a/Rendering/Matplotlib/Testing/Cxx/TestGL2PSMathTextScaling.cxx b/Rendering/Matplotlib/Testing/Cxx/TestGL2PSMathTextScaling.cxx
index 697d296d01e12fdf981a59a057eaa531666bbdb8..3338130971246c93095510973c7522a37f903959 100644
--- a/Rendering/Matplotlib/Testing/Cxx/TestGL2PSMathTextScaling.cxx
+++ b/Rendering/Matplotlib/Testing/Cxx/TestGL2PSMathTextScaling.cxx
@@ -37,7 +37,7 @@ public:
static GL2PSMathTextScalingTest *New();
vtkTypeMacro(GL2PSMathTextScalingTest, vtkContextItem)
// Paint event for the chart, called whenever the chart needs to be drawn
- virtual bool Paint(vtkContext2D *painter) VTK_OVERRIDE;
+ virtual bool Paint(vtkContext2D *painter) override;
};
//----------------------------------------------------------------------------
diff --git a/Rendering/Matplotlib/Testing/Cxx/TestStringToPath.cxx b/Rendering/Matplotlib/Testing/Cxx/TestStringToPath.cxx
index 3e2cfee3647ced0ea217954272860d372fa64e4f..4544455caac982bc33f5a3ba473f1fa821f17865 100644
--- a/Rendering/Matplotlib/Testing/Cxx/TestStringToPath.cxx
+++ b/Rendering/Matplotlib/Testing/Cxx/TestStringToPath.cxx
@@ -37,7 +37,7 @@ public:
static StringToPathContextTest *New();
vtkTypeMacro(StringToPathContextTest, vtkContextItem);
// Paint event for the chart, called whenever the chart needs to be drawn
- virtual bool Paint(vtkContext2D *painter) VTK_OVERRIDE;
+ virtual bool Paint(vtkContext2D *painter) override;
void SetPath(vtkPath *path) { this->Path = path; }
diff --git a/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h b/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h
index d7775c998c9fa369af73042c4dfbac9a71a7912d..4c49c22e2e12894696f4d7e396c46031c21bd5aa 100644
--- a/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h
+++ b/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h
@@ -43,11 +43,11 @@ class VTKRENDERINGMATPLOTLIB_EXPORT vtkMatplotlibMathTextUtilities :
{
public:
vtkTypeMacro(vtkMatplotlibMathTextUtilities, vtkMathTextUtilities);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkMatplotlibMathTextUtilities *New();
- bool IsAvailable() VTK_OVERRIDE;
+ bool IsAvailable() override;
/**
* Given a text property and a string, get the bounding box {xmin, xmax,
@@ -57,10 +57,10 @@ public:
* Returns true on success, false otherwise.
*/
bool GetBoundingBox(vtkTextProperty *tprop, const char *str, int dpi,
- int bbox[4]) VTK_OVERRIDE;
+ int bbox[4]) override;
bool GetMetrics(vtkTextProperty *tprop, const char *str, int dpi,
- vtkTextRenderer::Metrics &metrics) VTK_OVERRIDE;
+ vtkTextRenderer::Metrics &metrics) override;
/**
* Render the given string @a str into the vtkImageData @a data with a
@@ -73,7 +73,7 @@ public:
* options.
*/
bool RenderString(const char *str, vtkImageData *data, vtkTextProperty *tprop,
- int dpi, int textDims[2] = NULL) VTK_OVERRIDE;
+ int dpi, int textDims[2] = NULL) override;
/**
* Parse the MathText expression in str and fill path with a contour of the
@@ -82,7 +82,7 @@ public:
* options.
*/
bool StringToPath(const char *str, vtkPath *path, vtkTextProperty *tprop,
- int dpi) VTK_OVERRIDE;
+ int dpi) override;
//@{
/**
@@ -90,13 +90,13 @@ public:
* to be a power of two. Default is true, but this member will be set
* appropriately when GL is inited.
*/
- void SetScaleToPowerOfTwo(bool val) VTK_OVERRIDE;
- bool GetScaleToPowerOfTwo() VTK_OVERRIDE;
+ void SetScaleToPowerOfTwo(bool val) override;
+ bool GetScaleToPowerOfTwo() override;
//@}
protected:
vtkMatplotlibMathTextUtilities();
- ~vtkMatplotlibMathTextUtilities() VTK_OVERRIDE;
+ ~vtkMatplotlibMathTextUtilities() override;
bool InitializeMaskParser();
bool InitializePathParser();
diff --git a/Rendering/OSPRay/Testing/Cxx/vtkOSPRayTestInteractor.h b/Rendering/OSPRay/Testing/Cxx/vtkOSPRayTestInteractor.h
index 94c4680525189b480a0e318db1148b5088eba465..9ac34a4adb5ec25d1927a3699d92b2fb5255bbfd 100644
--- a/Rendering/OSPRay/Testing/Cxx/vtkOSPRayTestInteractor.h
+++ b/Rendering/OSPRay/Testing/Cxx/vtkOSPRayTestInteractor.h
@@ -57,7 +57,7 @@ public:
void SetPipelineControlPoints(vtkOpenGLRenderer *g,
vtkRenderPass *_O,
vtkRenderPass *_G);
- virtual void OnKeyPress() VTK_OVERRIDE;
+ virtual void OnKeyPress() override;
static void AddName(const char *name);
diff --git a/Rendering/OSPRay/vtkOSPRayActorNode.h b/Rendering/OSPRay/vtkOSPRayActorNode.h
index 3a3742841b3f7e8c492ec2348c350ea713e584a4..042bef075fe0ff757dfb049b1a6c5d0eee7de0c7 100644
--- a/Rendering/OSPRay/vtkOSPRayActorNode.h
+++ b/Rendering/OSPRay/vtkOSPRayActorNode.h
@@ -47,13 +47,13 @@ class VTKRENDERINGOSPRAY_EXPORT vtkOSPRayActorNode :
public:
static vtkOSPRayActorNode* New();
vtkTypeMacro(vtkOSPRayActorNode, vtkActorNode);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Overridden to take into account my renderables time, including
* mapper and data into mapper inclusive of composite input
*/
- virtual vtkMTimeType GetMTime() VTK_OVERRIDE;
+ virtual vtkMTimeType GetMTime() override;
/**
* When added to the mapper, enables scale array and scale function.
diff --git a/Rendering/OSPRay/vtkOSPRayCameraNode.h b/Rendering/OSPRay/vtkOSPRayCameraNode.h
index 0b51d452e0373b63cb7d5efa2ae951b6919ed7b2..0d0f71bab2dfc706c75f6c685c34ffd9339d8c30 100644
--- a/Rendering/OSPRay/vtkOSPRayCameraNode.h
+++ b/Rendering/OSPRay/vtkOSPRayCameraNode.h
@@ -31,12 +31,12 @@ class VTKRENDERINGOSPRAY_EXPORT vtkOSPRayCameraNode :
public:
static vtkOSPRayCameraNode* New();
vtkTypeMacro(vtkOSPRayCameraNode, vtkCameraNode);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Make ospray calls to render me.
*/
- virtual void Render(bool prepass) VTK_OVERRIDE;
+ virtual void Render(bool prepass) override;
protected:
vtkOSPRayCameraNode();
diff --git a/Rendering/OSPRay/vtkOSPRayCompositePolyDataMapper2Node.h b/Rendering/OSPRay/vtkOSPRayCompositePolyDataMapper2Node.h
index eea90915449a77fddd79ddac084e8a408d60ec05..7252adcd53eb44184388527220e70de25d25037d 100644
--- a/Rendering/OSPRay/vtkOSPRayCompositePolyDataMapper2Node.h
+++ b/Rendering/OSPRay/vtkOSPRayCompositePolyDataMapper2Node.h
@@ -37,17 +37,17 @@ class VTKRENDERINGOSPRAY_EXPORT vtkOSPRayCompositePolyDataMapper2Node :
public:
static vtkOSPRayCompositePolyDataMapper2Node* New();
vtkTypeMacro(vtkOSPRayCompositePolyDataMapper2Node, vtkOSPRayPolyDataMapperNode);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Make ospray calls to render me.
*/
- virtual void Render(bool prepass) VTK_OVERRIDE;
+ virtual void Render(bool prepass) override;
/**
* Invalidates cached rendering data.
*/
- virtual void Invalidate(bool prepass) VTK_OVERRIDE;
+ virtual void Invalidate(bool prepass) override;
protected:
vtkOSPRayCompositePolyDataMapper2Node();
diff --git a/Rendering/OSPRay/vtkOSPRayLightNode.h b/Rendering/OSPRay/vtkOSPRayLightNode.h
index 99052e1f168080e0f8ddce911f5fd342878774d6..7b3df47be6d6ab5ee8dec09cbd6e2041a6306350 100644
--- a/Rendering/OSPRay/vtkOSPRayLightNode.h
+++ b/Rendering/OSPRay/vtkOSPRayLightNode.h
@@ -35,12 +35,12 @@ class VTKRENDERINGOSPRAY_EXPORT vtkOSPRayLightNode :
public:
static vtkOSPRayLightNode* New();
vtkTypeMacro(vtkOSPRayLightNode, vtkLightNode);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Make ospray calls to render me.
*/
- virtual void Render(bool prepass) VTK_OVERRIDE;
+ virtual void Render(bool prepass) override;
//@{
/**
diff --git a/Rendering/OSPRay/vtkOSPRayMaterialLibrary.h b/Rendering/OSPRay/vtkOSPRayMaterialLibrary.h
index dc4188a7c1b22a6ca42ab4cefcf68f709eb766d8..ecc969228b3b308172dd6aa75ff1e7b8d5998560 100644
--- a/Rendering/OSPRay/vtkOSPRayMaterialLibrary.h
+++ b/Rendering/OSPRay/vtkOSPRayMaterialLibrary.h
@@ -39,7 +39,7 @@ class VTKRENDERINGOSPRAY_EXPORT vtkOSPRayMaterialLibrary : public vtkObject
public:
static vtkOSPRayMaterialLibrary *New();
vtkTypeMacro(vtkOSPRayMaterialLibrary,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Called to kick off events in all followers.
diff --git a/Rendering/OSPRay/vtkOSPRayPass.cxx b/Rendering/OSPRay/vtkOSPRayPass.cxx
index c26aa38f499882d1d35dbd7b88175ae8054a7996..0547b64d86e4997f07cb4997523aff4cb3af5c3f 100644
--- a/Rendering/OSPRay/vtkOSPRayPass.cxx
+++ b/Rendering/OSPRay/vtkOSPRayPass.cxx
@@ -48,7 +48,7 @@ public:
{
this->Factory->Delete();
}
- void Render(const vtkRenderState *s) VTK_OVERRIDE
+ void Render(const vtkRenderState *s) override
{
this->Parent->RenderInternal(s);
}
diff --git a/Rendering/OSPRay/vtkOSPRayPass.h b/Rendering/OSPRay/vtkOSPRayPass.h
index 8f482874c530fd77e4692f40b932dafc5d293b20..ac32880219c2a4a1744a4fb7e317a3d71452b11e 100644
--- a/Rendering/OSPRay/vtkOSPRayPass.h
+++ b/Rendering/OSPRay/vtkOSPRayPass.h
@@ -54,12 +54,12 @@ class VTKRENDERINGOSPRAY_EXPORT vtkOSPRayPass : public vtkRenderPass
public:
static vtkOSPRayPass *New();
vtkTypeMacro(vtkOSPRayPass,vtkRenderPass);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Perform rendering according to a render state s.
*/
- virtual void Render(const vtkRenderState *s) VTK_OVERRIDE;
+ virtual void Render(const vtkRenderState *s) override;
//@{
/**
diff --git a/Rendering/OSPRay/vtkOSPRayPolyDataMapperNode.h b/Rendering/OSPRay/vtkOSPRayPolyDataMapperNode.h
index dd0abc1142160c2dd5dbb3b669047fb1edcb210d..86d9c7b4cbdee9c2f52845f625f7a92f07b605a1 100644
--- a/Rendering/OSPRay/vtkOSPRayPolyDataMapperNode.h
+++ b/Rendering/OSPRay/vtkOSPRayPolyDataMapperNode.h
@@ -34,17 +34,17 @@ class VTKRENDERINGOSPRAY_EXPORT vtkOSPRayPolyDataMapperNode :
public:
static vtkOSPRayPolyDataMapperNode* New();
vtkTypeMacro(vtkOSPRayPolyDataMapperNode, vtkPolyDataMapperNode);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Make ospray calls to render me.
*/
- virtual void Render(bool prepass) VTK_OVERRIDE;
+ virtual void Render(bool prepass) override;
/**
* Invalidates cached rendering data.
*/
- virtual void Invalidate(bool prepass) VTK_OVERRIDE;
+ virtual void Invalidate(bool prepass) override;
protected:
vtkOSPRayPolyDataMapperNode();
diff --git a/Rendering/OSPRay/vtkOSPRayRendererNode.h b/Rendering/OSPRay/vtkOSPRayRendererNode.h
index a0d990db4eb7366d7059791fa4013bfad6237fa6..002c88bf1b090dfe2952786c44d3dc6a67befa3f 100644
--- a/Rendering/OSPRay/vtkOSPRayRendererNode.h
+++ b/Rendering/OSPRay/vtkOSPRayRendererNode.h
@@ -56,22 +56,22 @@ class VTKRENDERINGOSPRAY_EXPORT vtkOSPRayRendererNode :
public:
static vtkOSPRayRendererNode* New();
vtkTypeMacro(vtkOSPRayRendererNode, vtkRendererNode);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Builds myself.
*/
- virtual void Build(bool prepass) VTK_OVERRIDE;
+ virtual void Build(bool prepass) override;
/**
* Traverse graph in ospray's preferred order and render
*/
- virtual void Render(bool prepass) VTK_OVERRIDE;
+ virtual void Render(bool prepass) override;
/**
* Invalidates cached rendering data.
*/
- virtual void Invalidate(bool prepass) VTK_OVERRIDE;
+ virtual void Invalidate(bool prepass) override;
/**
* Put my results into the correct place in the provided pixel buffer.
@@ -203,7 +203,7 @@ public:
// if you want to traverse your children in a specific order
// or way override this method
- virtual void Traverse(int operation) VTK_OVERRIDE;
+ virtual void Traverse(int operation) override;
/**
* Convenience method to get and downcast renderable.
diff --git a/Rendering/OSPRay/vtkOSPRayViewNodeFactory.h b/Rendering/OSPRay/vtkOSPRayViewNodeFactory.h
index f2613f566dcbd3cdd4a11f843ea970d78afc5b76..2988febb6fc2fa962bd41982d9c3ec495ae0f32b 100644
--- a/Rendering/OSPRay/vtkOSPRayViewNodeFactory.h
+++ b/Rendering/OSPRay/vtkOSPRayViewNodeFactory.h
@@ -33,7 +33,7 @@ class VTKRENDERINGOSPRAY_EXPORT vtkOSPRayViewNodeFactory :
public:
static vtkOSPRayViewNodeFactory* New();
vtkTypeMacro(vtkOSPRayViewNodeFactory, vtkViewNodeFactory);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkOSPRayViewNodeFactory();
diff --git a/Rendering/OSPRay/vtkOSPRayVolumeMapper.h b/Rendering/OSPRay/vtkOSPRayVolumeMapper.h
index 113687351a82a023895928cefb55f8a96e4ef16a..c468fea73974a14085d8cfe336ed54d08a2a9db3 100644
--- a/Rendering/OSPRay/vtkOSPRayVolumeMapper.h
+++ b/Rendering/OSPRay/vtkOSPRayVolumeMapper.h
@@ -37,14 +37,14 @@ class VTKRENDERINGOSPRAY_EXPORT vtkOSPRayVolumeMapper
public:
static vtkOSPRayVolumeMapper *New();
vtkTypeMacro(vtkOSPRayVolumeMapper,vtkOSPRayVolumeInterface);
- void PrintSelf( ostream& os, vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf( ostream& os, vtkIndent indent ) override;
/**
* Release any graphics resources that are being consumed by this mapper.
* The parameter window could be used to determine which graphic
* resources to release.
*/
- virtual void ReleaseGraphicsResources(vtkWindow *) VTK_OVERRIDE;
+ virtual void ReleaseGraphicsResources(vtkWindow *) override;
// Initialize internal constructs
virtual void Init();
@@ -53,7 +53,7 @@ public:
* Render the volume onto the screen.
* Overridden to use OSPRay to do the work.
*/
- virtual void Render(vtkRenderer *, vtkVolume *) VTK_OVERRIDE;
+ virtual void Render(vtkRenderer *, vtkVolume *) override;
protected:
vtkOSPRayVolumeMapper();
diff --git a/Rendering/OSPRay/vtkOSPRayVolumeMapperNode.h b/Rendering/OSPRay/vtkOSPRayVolumeMapperNode.h
index b962b83c0c39f5f91082221391e1eaae3b1021f4..b33d02fec70d7f4976241898f748a924ee80eb94 100644
--- a/Rendering/OSPRay/vtkOSPRayVolumeMapperNode.h
+++ b/Rendering/OSPRay/vtkOSPRayVolumeMapperNode.h
@@ -40,12 +40,12 @@ class VTKRENDERINGOSPRAY_EXPORT vtkOSPRayVolumeMapperNode :
public:
static vtkOSPRayVolumeMapperNode* New();
vtkTypeMacro(vtkOSPRayVolumeMapperNode, vtkVolumeMapperNode);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Make ospray calls to render me.
*/
- virtual void Render(bool prepass) VTK_OVERRIDE;
+ virtual void Render(bool prepass) override;
/**
* TODO: fix me
diff --git a/Rendering/OSPRay/vtkOSPRayVolumeNode.h b/Rendering/OSPRay/vtkOSPRayVolumeNode.h
index 9e435c444adc13c826f61a949b2d8936a995666b..4bb5bdd92236d8f7001cada29bb01e172ff48915 100644
--- a/Rendering/OSPRay/vtkOSPRayVolumeNode.h
+++ b/Rendering/OSPRay/vtkOSPRayVolumeNode.h
@@ -40,13 +40,13 @@ class VTKRENDERINGOSPRAY_EXPORT vtkOSPRayVolumeNode :
public:
static vtkOSPRayVolumeNode* New();
vtkTypeMacro(vtkOSPRayVolumeNode, vtkVolumeNode);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Overridden to take into account my renderables time, including
* mapper and data into mapper inclusive of composite input
*/
- virtual vtkMTimeType GetMTime() VTK_OVERRIDE;
+ virtual vtkMTimeType GetMTime() override;
protected:
vtkOSPRayVolumeNode();
diff --git a/Rendering/OSPRay/vtkOSPRayWindowNode.h b/Rendering/OSPRay/vtkOSPRayWindowNode.h
index 0221dcb9ad21fe86088cf9a500851076409f177f..7227fd53d07f371fd21532d947e19f9975517776 100644
--- a/Rendering/OSPRay/vtkOSPRayWindowNode.h
+++ b/Rendering/OSPRay/vtkOSPRayWindowNode.h
@@ -31,12 +31,12 @@ class VTKRENDERINGOSPRAY_EXPORT vtkOSPRayWindowNode :
public:
static vtkOSPRayWindowNode* New();
vtkTypeMacro(vtkOSPRayWindowNode, vtkWindowNode);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Make ospray calls to render me.
*/
- virtual void Render(bool prepass) VTK_OVERRIDE;
+ virtual void Render(bool prepass) override;
protected:
vtkOSPRayWindowNode();
diff --git a/Rendering/OpenGL/Testing/Cxx/TestValuePasses.cxx b/Rendering/OpenGL/Testing/Cxx/TestValuePasses.cxx
index 8cefd07830d9c8984abc7fd3f2ca43b451a67792..7c3722ac961d63dd9418799423f2f73aafaee864 100644
--- a/Rendering/OpenGL/Testing/Cxx/TestValuePasses.cxx
+++ b/Rendering/OpenGL/Testing/Cxx/TestValuePasses.cxx
@@ -126,7 +126,7 @@ class KeyPressInteractorStyle : public vtkInteractorStyleTrackballCamera
this->Alg = p;
}
- void OnKeyPress() VTK_OVERRIDE
+ void OnKeyPress() override
{
if (this->GLRenderer == NULL)
{
diff --git a/Rendering/OpenGL/vtkCameraPass.h b/Rendering/OpenGL/vtkCameraPass.h
index 8d7587d87fe28940e890927fd208fca7590f3585..e9a43ee76b4bd2c117e5ab3785ef3e94b009ed2c 100644
--- a/Rendering/OpenGL/vtkCameraPass.h
+++ b/Rendering/OpenGL/vtkCameraPass.h
@@ -40,20 +40,20 @@ class VTKRENDERINGOPENGL_EXPORT vtkCameraPass : public vtkRenderPass
public:
static vtkCameraPass *New();
vtkTypeMacro(vtkCameraPass,vtkRenderPass);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Perform rendering according to a render state \p s.
* \pre s_exists: s!=0
*/
- void Render(const vtkRenderState *s) VTK_OVERRIDE;
+ void Render(const vtkRenderState *s) override;
/**
* Release graphics resources and ask components to release their own
* resources.
* \pre w_exists: w!=0
*/
- void ReleaseGraphicsResources(vtkWindow *w) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *w) override;
//@{
/**
@@ -85,7 +85,7 @@ public:
/**
* Destructor.
*/
- ~vtkCameraPass() VTK_OVERRIDE;
+ ~vtkCameraPass() override;
virtual void GetTiledSizeAndOrigin(
const vtkRenderState* render_state,
int* width, int* height, int *originX,
diff --git a/Rendering/OpenGL/vtkChooserPainter.h b/Rendering/OpenGL/vtkChooserPainter.h
index a296b588aecda515593226611868a6130180b789..3905288d2e4ed590112c640a5a78ce4a0b81378e 100644
--- a/Rendering/OpenGL/vtkChooserPainter.h
+++ b/Rendering/OpenGL/vtkChooserPainter.h
@@ -36,7 +36,7 @@ class VTKRENDERINGOPENGL_EXPORT vtkChooserPainter : public vtkPolyDataPainter
public:
static vtkChooserPainter *New();
vtkTypeMacro(vtkChooserPainter, vtkPolyDataPainter);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
void SetVertPainter(vtkPolyDataPainter*);
void SetLinePainter(vtkPolyDataPainter*);
@@ -52,7 +52,7 @@ public:
protected:
vtkChooserPainter();
- ~vtkChooserPainter() VTK_OVERRIDE;
+ ~vtkChooserPainter() override;
vtkPolyDataPainter *VertPainter;
vtkPolyDataPainter *LinePainter;
@@ -69,7 +69,7 @@ protected:
* but before RenderInternal().
* Overridden to setup the the painters if needed.
*/
- void PrepareForRendering(vtkRenderer*, vtkActor*) VTK_OVERRIDE;
+ void PrepareForRendering(vtkRenderer*, vtkActor*) override;
/**
* Called to pick which painters to used based on the current state of
@@ -105,12 +105,12 @@ protected:
* has been called.
*/
void RenderInternal(vtkRenderer* renderer, vtkActor* actor,
- unsigned long typeflags, bool forceCompileOnly) VTK_OVERRIDE;
+ unsigned long typeflags, bool forceCompileOnly) override;
/**
* Take part in garbage collection.
*/
- void ReportReferences(vtkGarbageCollector *collector) VTK_OVERRIDE;
+ void ReportReferences(vtkGarbageCollector *collector) override;
vtkRenderer *LastRenderer;
vtkTimeStamp PaintersChoiceTime;
diff --git a/Rendering/OpenGL/vtkClearRGBPass.h b/Rendering/OpenGL/vtkClearRGBPass.h
index 7a02c55dcdfc418f6fa27bf9ea891009381e727b..feed1a432b85b6197ec796f13381ea72adc0c060 100644
--- a/Rendering/OpenGL/vtkClearRGBPass.h
+++ b/Rendering/OpenGL/vtkClearRGBPass.h
@@ -35,12 +35,12 @@ class VTKRENDERINGOPENGL_EXPORT vtkClearRGBPass : public vtkRenderPass
public:
static vtkClearRGBPass *New();
vtkTypeMacro(vtkClearRGBPass,vtkRenderPass);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Perform rendering according to a render state s.
*/
- void Render(const vtkRenderState *s) VTK_OVERRIDE;
+ void Render(const vtkRenderState *s) override;
//@{
/**
@@ -60,7 +60,7 @@ public:
/**
* Destructor.
*/
- ~vtkClearRGBPass() VTK_OVERRIDE;
+ ~vtkClearRGBPass() override;
double Background[3];
diff --git a/Rendering/OpenGL/vtkClearZPass.h b/Rendering/OpenGL/vtkClearZPass.h
index 8f226907707862c31fa3525c7ee8b4939469acff..15c1c64d11c68c0724e7d67a37e21ac311640069 100644
--- a/Rendering/OpenGL/vtkClearZPass.h
+++ b/Rendering/OpenGL/vtkClearZPass.h
@@ -35,13 +35,13 @@ class VTKRENDERINGOPENGL_EXPORT vtkClearZPass : public vtkRenderPass
public:
static vtkClearZPass *New();
vtkTypeMacro(vtkClearZPass,vtkRenderPass);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Perform rendering according to a render state \p s.
* \pre s_exists: s!=0
*/
- void Render(const vtkRenderState *s) VTK_OVERRIDE;
+ void Render(const vtkRenderState *s) override;
//@{
/**
@@ -60,7 +60,7 @@ public:
/**
* Destructor.
*/
- ~vtkClearZPass() VTK_OVERRIDE;
+ ~vtkClearZPass() override;
double Depth;
diff --git a/Rendering/OpenGL/vtkClipPlanesPainter.h b/Rendering/OpenGL/vtkClipPlanesPainter.h
index 4d2caa22b3566786ec3e54c26dac6cf04643f3b0..c1bac4bb12970dfffd62165e5cc054a791019c1a 100644
--- a/Rendering/OpenGL/vtkClipPlanesPainter.h
+++ b/Rendering/OpenGL/vtkClipPlanesPainter.h
@@ -32,7 +32,7 @@ class VTKRENDERINGOPENGL_EXPORT vtkClipPlanesPainter : public vtkPainter
public:
static vtkClipPlanesPainter* New();
vtkTypeMacro(vtkClipPlanesPainter, vtkPainter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Get/Set the vtkPlaneCollection which specifies the clipping planes.
@@ -41,13 +41,13 @@ public:
protected:
vtkClipPlanesPainter();
- ~vtkClipPlanesPainter() VTK_OVERRIDE;
+ ~vtkClipPlanesPainter() override;
/**
* Called before RenderInternal() if the Information has been changed
* since the last time this method was called.
*/
- void ProcessInformation(vtkInformation*) VTK_OVERRIDE;
+ void ProcessInformation(vtkInformation*) override;
void SetClippingPlanes(vtkPlaneCollection*);
vtkPlaneCollection* ClippingPlanes;
diff --git a/Rendering/OpenGL/vtkCocoaRenderWindow.h b/Rendering/OpenGL/vtkCocoaRenderWindow.h
index e74565c820bb4d5d4797ef45f7cba66e27afcfb1..2de6310130b5aa54cb22e8d407d4b3aed8e76235 100644
--- a/Rendering/OpenGL/vtkCocoaRenderWindow.h
+++ b/Rendering/OpenGL/vtkCocoaRenderWindow.h
@@ -50,17 +50,17 @@ class VTKRENDERINGOPENGL_EXPORT vtkCocoaRenderWindow : public vtkOpenGLRenderWin
public:
static vtkCocoaRenderWindow *New();
vtkTypeMacro(vtkCocoaRenderWindow,vtkOpenGLRenderWindow);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Begin the rendering process.
*/
- void Start() VTK_OVERRIDE;
+ void Start() override;
/**
* Finish the rendering process.
*/
- void Frame() VTK_OVERRIDE;
+ void Frame() override;
/**
* Specify various window parameters.
@@ -83,12 +83,12 @@ public:
* before the window has been created, and it might not work on all
* versions of OS X.
*/
- void SetFullScreen(int) VTK_OVERRIDE;
+ void SetFullScreen(int) override;
/**
* Remap the window. This is not implemented for the vtkCocoaRenderWindow.
*/
- void WindowRemap() VTK_OVERRIDE;
+ void WindowRemap() override;
/**
* Set the preferred window size to full screen. This is not implemented
@@ -100,53 +100,53 @@ public:
/**
* Set the size of the window in pixels.
*/
- void SetSize(int a[2]) VTK_OVERRIDE;
- void SetSize(int,int) VTK_OVERRIDE;
+ void SetSize(int a[2]) override;
+ void SetSize(int,int) override;
//@}
/**
* Get the current size of the window in pixels.
*/
- int *GetSize() VTK_OVERRIDE;
+ int *GetSize() override;
//@{
/**
* Set the position of the window.
*/
- void SetPosition(int a[2]) VTK_OVERRIDE;
- void SetPosition(int,int) VTK_OVERRIDE;
+ void SetPosition(int a[2]) override;
+ void SetPosition(int,int) override;
//@}
/**
* Get the current size of the screen in pixels.
*/
- int *GetScreenSize() VTK_OVERRIDE;
+ int *GetScreenSize() override;
/**
* Get the position in screen coordinates of the window.
*/
- int *GetPosition() VTK_OVERRIDE;
+ int *GetPosition() override;
/**
* Set the name of the window. This appears at the top of the window
* normally.
*/
- void SetWindowName(const char *) VTK_OVERRIDE;
+ void SetWindowName(const char *) override;
- void SetNextWindowInfo(char *) VTK_OVERRIDE
+ void SetNextWindowInfo(char *) override
{
vtkWarningMacro("SetNextWindowInfo not implemented (WindowRemap not implemented).");
}
- void* GetGenericDrawable() VTK_OVERRIDE
+ void* GetGenericDrawable() override
{
vtkWarningMacro("Method not implemented.");
return 0;
}
- void SetDisplayId(void*) VTK_OVERRIDE
+ void SetDisplayId(void*) override
{
vtkWarningMacro("Method not implemented.");
}
- void *GetGenericDisplayId() VTK_OVERRIDE
+ void *GetGenericDisplayId() override
{
vtkWarningMacro("Method not implemented.");
return 0;
@@ -157,16 +157,16 @@ public:
* The paramater is an ASCII string of a decimal number representing
* a pointer to the window.
*/
- void SetWindowInfo(char*) VTK_OVERRIDE;
+ void SetWindowInfo(char*) override;
/**
* See the documenation for SetParentId(). This method allows the ParentId
* to be set as an ASCII string of a decimal number that is the memory
* address of the parent NSView.
*/
- void SetParentInfo(char*) VTK_OVERRIDE;
+ void SetParentInfo(char*) override;
- void SetNextWindowId(void*) VTK_OVERRIDE
+ void SetNextWindowId(void*) override
{
vtkWarningMacro("SetNextWindowId not implemented (WindowRemap not implemented).");
}
@@ -175,7 +175,7 @@ public:
* Initialize the render window from the information associated
* with the currently activated OpenGL context.
*/
- bool InitializeFromCurrentContext() VTK_OVERRIDE;
+ bool InitializeFromCurrentContext() override;
/**
* Prescribe that the window be created in a stereo-capable mode. This
@@ -183,17 +183,17 @@ public:
* overrrides the superclass method since this class can actually check
* whether the window has been realized yet.
*/
- void SetStereoCapableWindow(int capable) VTK_OVERRIDE;
+ void SetStereoCapableWindow(int capable) override;
/**
* Make this windows OpenGL context the current context.
*/
- void MakeCurrent() VTK_OVERRIDE;
+ void MakeCurrent() override;
/**
* Tells if this window is the current OpenGL context for the calling thread.
*/
- bool IsCurrent() VTK_OVERRIDE;
+ bool IsCurrent() override;
/**
* Test if the window has a valid drawable. This is
@@ -201,7 +201,7 @@ public:
* to an invalid drawable results in all OpenGL calls to fail
* with "invalid framebuffer operation".
*/
- bool IsDrawable() VTK_OVERRIDE;
+ bool IsDrawable() override;
/**
* Update this window's OpenGL context, e.g. when the window is resized.
@@ -211,30 +211,30 @@ public:
/**
* Get report of capabilities for the render window
*/
- const char *ReportCapabilities() VTK_OVERRIDE;
+ const char *ReportCapabilities() override;
/**
* Does this render window support OpenGL? 0-false, 1-true
*/
- int SupportsOpenGL() VTK_OVERRIDE;
+ int SupportsOpenGL() override;
/**
* Is this render window using hardware acceleration? 0-false, 1-true
*/
- int IsDirect() VTK_OVERRIDE;
+ int IsDirect() override;
/**
* If called, allow MakeCurrent() to skip cache-check when called.
* MakeCurrent() reverts to original behavior of cache-checking
* on the next render.
*/
- void SetForceMakeCurrent() VTK_OVERRIDE;
+ void SetForceMakeCurrent() override;
/**
* Check to see if an event is pending for this window.
* This is a useful check to abort a long render.
*/
- int GetEventPending() VTK_OVERRIDE;
+ int GetEventPending() override;
//@{
/**
@@ -248,12 +248,12 @@ public:
/**
* Clean up device contexts, rendering contexts, etc.
*/
- void Finalize() VTK_OVERRIDE;
+ void Finalize() override;
/**
* Get the size of the depth buffer.
*/
- int GetDepthBufferSize() VTK_OVERRIDE;
+ int GetDepthBufferSize() override;
//@{
/**
@@ -262,15 +262,15 @@ public:
* Set cursor position in window (note that (0,0) is the lower left
* corner).
*/
- void HideCursor() VTK_OVERRIDE;
- void ShowCursor() VTK_OVERRIDE;
- void SetCursorPosition(int x, int y) VTK_OVERRIDE;
+ void HideCursor() override;
+ void ShowCursor() override;
+ void SetCursorPosition(int x, int y) override;
//@}
/**
* Change the shape of the cursor.
*/
- void SetCurrentCursor(int) VTK_OVERRIDE;
+ void SetCurrentCursor(int) override;
/**
* Get the ViewCreated flag. It is 1 if this object created an instance
@@ -290,7 +290,7 @@ public:
*/
void SetContextId(void *);
void *GetContextId();
- void *GetGenericContext() VTK_OVERRIDE {return this->GetContextId();}
+ void *GetGenericContext() override {return this->GetContextId();}
//@}
/**
@@ -320,13 +320,13 @@ public:
* and SetWindowId(), respectively, early on (before WindowInitialize()
* is executed). In the case of Java, you should call only SetWindowId().
*/
- void SetWindowId(void *) VTK_OVERRIDE;
+ void SetWindowId(void *) override;
/**
* Returns the NSView* associated with this vtkRenderWindow.
*/
virtual void *GetWindowId();
- void *GetGenericWindowId() VTK_OVERRIDE {return this->GetWindowId();}
+ void *GetGenericWindowId() override {return this->GetWindowId();}
/**
* Set the NSView* for the vtkRenderWindow to be parented within. The
@@ -334,7 +334,7 @@ public:
* NSView that the vtkRenderWindow will create within this parent.
* If you set the WindowId, then this ParentId will be ignored.
*/
- void SetParentId(void *nsview) VTK_OVERRIDE;
+ void SetParentId(void *nsview) override;
/**
* Get the parent NSView* for this vtkRenderWindow. This method will
@@ -342,7 +342,7 @@ public:
* SetParentInfo().
*/
virtual void *GetParentId();
- void *GetGenericParentId() VTK_OVERRIDE { return this->GetParentId(); }
+ void *GetGenericParentId() override { return this->GetParentId(); }
/**
* Whenever an NSView is created, this value will be passed to
@@ -366,12 +366,12 @@ public:
protected:
vtkCocoaRenderWindow();
- ~vtkCocoaRenderWindow() VTK_OVERRIDE;
+ ~vtkCocoaRenderWindow() override;
void CreateGLContext();
- void CreateAWindow() VTK_OVERRIDE;
- void DestroyWindow() VTK_OVERRIDE;
+ void CreateAWindow() override;
+ void DestroyWindow() override;
void DestroyOffScreenWindow();
int OffScreenInitialized;
diff --git a/Rendering/OpenGL/vtkCocoaRenderWindowInteractor.h b/Rendering/OpenGL/vtkCocoaRenderWindowInteractor.h
index 34deb22df9799e3c013213f815aa9b52de8dc52e..ea3583cbcadcb2a17c8e209123c51ef26b2ac698 100644
--- a/Rendering/OpenGL/vtkCocoaRenderWindowInteractor.h
+++ b/Rendering/OpenGL/vtkCocoaRenderWindowInteractor.h
@@ -49,12 +49,12 @@ public:
static vtkCocoaRenderWindowInteractor *New();
vtkTypeMacro(vtkCocoaRenderWindowInteractor,vtkRenderWindowInteractor);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Initialize the even handler
*/
- void Initialize() VTK_OVERRIDE;
+ void Initialize() override;
//@{
/**
@@ -66,8 +66,8 @@ public:
* and all other interactors associated with the widget are disabled
* when their data is not displayed.
*/
- void Enable() VTK_OVERRIDE;
- void Disable() VTK_OVERRIDE;
+ void Enable() override;
+ void Disable() override;
//@}
/**
@@ -75,7 +75,7 @@ public:
* calls PostQuitMessage(0) to terminate app. An application can Specify
* ExitMethod for alternative behaviour (i.e. suppresion of keyboard exit)
*/
- void TerminateApp() VTK_OVERRIDE;
+ void TerminateApp() override;
//@{
/**
@@ -92,14 +92,14 @@ public:
* These methods correspond to the the Exit, User and Pick
* callbacks. They allow for the Style to invoke them.
*/
- void ExitCallback() VTK_OVERRIDE;
+ void ExitCallback() override;
// int GetButtonDown();
// void SetButtonDown(int button);
protected:
vtkCocoaRenderWindowInteractor();
- ~vtkCocoaRenderWindowInteractor() VTK_OVERRIDE;
+ ~vtkCocoaRenderWindowInteractor() override;
/**
* Accessors for the Cocoa member variables. These should be used at all time, even
@@ -124,8 +124,8 @@ protected:
* Cocoa-specific internal timer methods. See the superclass for detailed
* documentation.
*/
- int InternalCreateTimer(int timerId, int timerType, unsigned long duration) VTK_OVERRIDE;
- int InternalDestroyTimer(int platformTimerId) VTK_OVERRIDE;
+ int InternalCreateTimer(int timerId, int timerType, unsigned long duration) override;
+ int InternalDestroyTimer(int platformTimerId) override;
//@}
/**
@@ -133,7 +133,7 @@ protected:
* call this method it will loop processing events until the
* application is exited.
*/
- void StartEventLoop() VTK_OVERRIDE;
+ void StartEventLoop() override;
//@{
/**
diff --git a/Rendering/OpenGL/vtkCoincidentTopologyResolutionPainter.h b/Rendering/OpenGL/vtkCoincidentTopologyResolutionPainter.h
index 6a617407d8dd8f6039d20575fd2e46b5dbd44002..f0c7fd1f8be348030fcd356745793be383857c30 100644
--- a/Rendering/OpenGL/vtkCoincidentTopologyResolutionPainter.h
+++ b/Rendering/OpenGL/vtkCoincidentTopologyResolutionPainter.h
@@ -40,7 +40,7 @@ public:
static vtkCoincidentTopologyResolutionPainter* New();
vtkTypeMacro(vtkCoincidentTopologyResolutionPainter,
vtkPolyDataPainter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Set/Get a global flag that controls whether coincident topology (e.g., a
@@ -77,13 +77,13 @@ public:
protected:
vtkCoincidentTopologyResolutionPainter();
- ~vtkCoincidentTopologyResolutionPainter() VTK_OVERRIDE;
+ ~vtkCoincidentTopologyResolutionPainter() override;
/**
* Called before RenderInternal() if the Information has been changed
* since the last time this method was called.
*/
- void ProcessInformation(vtkInformation*) VTK_OVERRIDE;
+ void ProcessInformation(vtkInformation*) override;
// These are method to set ivars. These are purpisefully protected.
// The only means to affect these values is through information object.
diff --git a/Rendering/OpenGL/vtkColorMaterialHelper.h b/Rendering/OpenGL/vtkColorMaterialHelper.h
index ca9c4de2d44d8a1fef61cd0d9e05d61b4e2aa845..6bfe15f1767d6539b089e4ac2e50f12cac547c64 100644
--- a/Rendering/OpenGL/vtkColorMaterialHelper.h
+++ b/Rendering/OpenGL/vtkColorMaterialHelper.h
@@ -39,7 +39,7 @@ class VTKRENDERINGOPENGL_EXPORT vtkColorMaterialHelper : public vtkObject
public:
static vtkColorMaterialHelper* New();
vtkTypeMacro(vtkColorMaterialHelper, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
void Initialize(vtkShaderProgram2*);
vtkGetObjectMacro(Shader, vtkShaderProgram2);
@@ -66,7 +66,7 @@ public:
protected:
vtkColorMaterialHelper();
- ~vtkColorMaterialHelper() VTK_OVERRIDE;
+ ~vtkColorMaterialHelper() override;
void SetShader(vtkShaderProgram2*);
vtkShaderProgram2 * Shader;
diff --git a/Rendering/OpenGL/vtkCompositePainter.h b/Rendering/OpenGL/vtkCompositePainter.h
index fbd6b05803ef50b2517c1813877707225b74066e..281cd6633d9aeb272fac8f5832a6ca9277f4fbd0 100644
--- a/Rendering/OpenGL/vtkCompositePainter.h
+++ b/Rendering/OpenGL/vtkCompositePainter.h
@@ -40,13 +40,13 @@ class VTKRENDERINGOPENGL_EXPORT vtkCompositePainter : public vtkPainter
public:
static vtkCompositePainter* New();
vtkTypeMacro(vtkCompositePainter, vtkPainter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Get the output data object from this painter. The default implementation
* simply forwards the input data object as the output.
*/
- vtkDataObject* GetOutput() VTK_OVERRIDE;
+ vtkDataObject* GetOutput() override;
/**
* Key used to pass a vtkCompositeDataDisplayAttributesLegacy instance doing the
@@ -64,18 +64,18 @@ public:
protected:
vtkCompositePainter();
- ~vtkCompositePainter() VTK_OVERRIDE;
+ ~vtkCompositePainter() override;
/**
* Take part in garbage collection.
*/
- void ReportReferences(vtkGarbageCollector *collector) VTK_OVERRIDE;
+ void ReportReferences(vtkGarbageCollector *collector) override;
/**
* Called before RenderInternal() if the Information has been changed
* since the last time this method was called.
*/
- void ProcessInformation(vtkInformation* information) VTK_OVERRIDE;
+ void ProcessInformation(vtkInformation* information) override;
/**
* Performs the actual rendering. Subclasses may override this method.
@@ -85,7 +85,7 @@ protected:
* has been called.
*/
void RenderInternal(vtkRenderer* renderer, vtkActor* actor,
- unsigned long typeflags, bool forceCompileOnly) VTK_OVERRIDE;
+ unsigned long typeflags, bool forceCompileOnly) override;
class RenderBlockState
{
diff --git a/Rendering/OpenGL/vtkCompositePolyDataMapper2.h b/Rendering/OpenGL/vtkCompositePolyDataMapper2.h
index db425b552098cea89556a6491aebe4a8aa334d0e..9beb8d6b21431a0ac4be4c88cce186a58a2df339 100644
--- a/Rendering/OpenGL/vtkCompositePolyDataMapper2.h
+++ b/Rendering/OpenGL/vtkCompositePolyDataMapper2.h
@@ -36,7 +36,7 @@ class VTKRENDERINGOPENGL_EXPORT vtkCompositePolyDataMapper2 : public vtkPainterP
public:
static vtkCompositePolyDataMapper2* New();
vtkTypeMacro(vtkCompositePolyDataMapper2, vtkPainterPolyDataMapper);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Returns if the mapper does not expect to have translucent geometry. This
@@ -48,7 +48,7 @@ public:
* Overridden to use the actual data and ScalarMode to determine if we have
* opaque geometry.
*/
- bool GetIsOpaque() VTK_OVERRIDE;
+ bool GetIsOpaque() override;
//@{
/**
@@ -96,30 +96,30 @@ public:
protected:
vtkCompositePolyDataMapper2();
- ~vtkCompositePolyDataMapper2() VTK_OVERRIDE;
+ ~vtkCompositePolyDataMapper2() override;
/**
* We need to override this method because the standard streaming
* demand driven pipeline is not what we want - we are expecting
* hierarchical data as input
*/
- vtkExecutive* CreateDefaultExecutive() VTK_OVERRIDE;
+ vtkExecutive* CreateDefaultExecutive() override;
/**
* Need to define the type of data handled by this mapper.
*/
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
/**
* Need to loop over the hierarchy to compute bounds
*/
- void ComputeBounds() VTK_OVERRIDE;
+ void ComputeBounds() override;
/**
* Called when the PainterInformation becomes obsolete. Overridden to pass
* CompositeDataDisplayAttributes to the painters.
*/
- void UpdatePainterInformation() VTK_OVERRIDE;
+ void UpdatePainterInformation() override;
/**
* Time stamp for computation of bounds.
diff --git a/Rendering/OpenGL/vtkCoreGraphicsGPUInfoList.h b/Rendering/OpenGL/vtkCoreGraphicsGPUInfoList.h
index 04cf383e3f72b3c36463a5a780e3ce0ee830c3a4..7ffd155c1e27d76e5ca023f4e9afde7f9409ca90 100644
--- a/Rendering/OpenGL/vtkCoreGraphicsGPUInfoList.h
+++ b/Rendering/OpenGL/vtkCoreGraphicsGPUInfoList.h
@@ -33,13 +33,13 @@ class VTKRENDERINGOPENGL_EXPORT vtkCoreGraphicsGPUInfoList : public vtkGPUInfoLi
public:
static vtkCoreGraphicsGPUInfoList* New();
vtkTypeMacro(vtkCoreGraphicsGPUInfoList, vtkGPUInfoList);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Build the list of vtkInfoGPU if not done yet.
* \post probed: IsProbed()
*/
- void Probe() VTK_OVERRIDE;
+ void Probe() override;
protected:
//@{
@@ -47,7 +47,7 @@ protected:
* Default constructor.
*/
vtkCoreGraphicsGPUInfoList();
- ~vtkCoreGraphicsGPUInfoList() VTK_OVERRIDE;
+ ~vtkCoreGraphicsGPUInfoList() override;
//@}
private:
diff --git a/Rendering/OpenGL/vtkDataTransferHelper.h b/Rendering/OpenGL/vtkDataTransferHelper.h
index c1024591bed65aa268d6937f77de8446dd2c4371..2643fc3ffc02eb3ef2550f66a299014590f73186 100644
--- a/Rendering/OpenGL/vtkDataTransferHelper.h
+++ b/Rendering/OpenGL/vtkDataTransferHelper.h
@@ -47,7 +47,7 @@ class VTKRENDERINGOPENGL_EXPORT vtkDataTransferHelper : public vtkObject
public:
static vtkDataTransferHelper* New();
vtkTypeMacro(vtkDataTransferHelper, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -224,7 +224,7 @@ public:
protected:
vtkDataTransferHelper();
- ~vtkDataTransferHelper() VTK_OVERRIDE;
+ ~vtkDataTransferHelper() override;
/**
* Load all necessary extensions.
diff --git a/Rendering/OpenGL/vtkDefaultPainter.h b/Rendering/OpenGL/vtkDefaultPainter.h
index 0a9da8b32ef6c4de29b8e1c9bb8ceeed66296463..2d7a194727213eba74951e53ca9d6bcc0eea1de8 100644
--- a/Rendering/OpenGL/vtkDefaultPainter.h
+++ b/Rendering/OpenGL/vtkDefaultPainter.h
@@ -49,7 +49,7 @@ class VTKRENDERINGOPENGL_EXPORT vtkDefaultPainter : public vtkPainter
public:
static vtkDefaultPainter *New();
vtkTypeMacro(vtkDefaultPainter, vtkPainter);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
//@{
/**
@@ -114,8 +114,8 @@ public:
* These methods are overridden so that the delegate is set
* to the end of the Painter Chain.
*/
- void SetDelegatePainter(vtkPainter*) VTK_OVERRIDE;
- vtkPainter* GetDelegatePainter() VTK_OVERRIDE { return this->DefaultPainterDelegate; }
+ void SetDelegatePainter(vtkPainter*) override;
+ vtkPainter* GetDelegatePainter() override { return this->DefaultPainterDelegate; }
/**
* Overridden to setup the chain of painter depending on the
@@ -126,7 +126,7 @@ public:
* hence it does not check if the input has changed at all.
*/
void Render(vtkRenderer* renderer, vtkActor* actor,
- unsigned long typeflags, bool forceCompileOnly) VTK_OVERRIDE;
+ unsigned long typeflags, bool forceCompileOnly) override;
/**
* Release any graphics resources that are being consumed by this painter.
@@ -134,18 +134,18 @@ public:
* resources to release.
* The call is propagated to the delegate painter, if any.
*/
- void ReleaseGraphicsResources(vtkWindow *) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *) override;
/**
* Expand or shrink the estimated bounds based on the geometric
* transformations applied in the painter. The bounds are left unchanged
* if the painter does not change the geometry.
*/
- void UpdateBounds(double bounds[6]) VTK_OVERRIDE;
+ void UpdateBounds(double bounds[6]) override;
protected:
vtkDefaultPainter();
- ~vtkDefaultPainter() VTK_OVERRIDE;
+ ~vtkDefaultPainter() override;
/**
* Setups the the painter chain.
@@ -155,7 +155,7 @@ protected:
/**
* Take part in garbage collection.
*/
- void ReportReferences(vtkGarbageCollector *collector) VTK_OVERRIDE;
+ void ReportReferences(vtkGarbageCollector *collector) override;
vtkScalarsToColorsPainter* ScalarsToColorsPainter;
vtkClipPlanesPainter* ClipPlanesPainter;
diff --git a/Rendering/OpenGL/vtkDefaultPass.h b/Rendering/OpenGL/vtkDefaultPass.h
index 59e1f7d09ad1507dc4bc9159e4201fc9963c2c78..81905845dbcc88f295cc8f185ded2f9977c7742c 100644
--- a/Rendering/OpenGL/vtkDefaultPass.h
+++ b/Rendering/OpenGL/vtkDefaultPass.h
@@ -45,7 +45,7 @@ class VTKRENDERINGOPENGL_EXPORT vtkDefaultPass : public vtkRenderPass
public:
static vtkDefaultPass *New();
vtkTypeMacro(vtkDefaultPass,vtkRenderPass);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Perform rendering according to a render state \p s.
@@ -53,7 +53,7 @@ public:
* RenderVolumetricGeometry(), RenderOverlay()
* \pre s_exists: s!=0
*/
- void Render(const vtkRenderState *s) VTK_OVERRIDE;
+ void Render(const vtkRenderState *s) override;
protected:
/**
@@ -64,7 +64,7 @@ public:
/**
* Destructor.
*/
- ~vtkDefaultPass() VTK_OVERRIDE;
+ ~vtkDefaultPass() override;
/**
* Opaque pass without key checking.
diff --git a/Rendering/OpenGL/vtkDepthPeelingPass.h b/Rendering/OpenGL/vtkDepthPeelingPass.h
index 516388772ea994cf983e3521306c77af112ace8e..6d2848af726e9ec453a85edad199687139c4a765 100644
--- a/Rendering/OpenGL/vtkDepthPeelingPass.h
+++ b/Rendering/OpenGL/vtkDepthPeelingPass.h
@@ -52,20 +52,20 @@ class VTKRENDERINGOPENGL_EXPORT vtkDepthPeelingPass : public vtkRenderPass
public:
static vtkDepthPeelingPass *New();
vtkTypeMacro(vtkDepthPeelingPass,vtkRenderPass);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Perform rendering according to a render state \p s.
* \pre s_exists: s!=0
*/
- void Render(const vtkRenderState *s) VTK_OVERRIDE;
+ void Render(const vtkRenderState *s) override;
/**
* Release graphics resources and ask components to release their own
* resources.
* \pre w_exists: w!=0
*/
- void ReleaseGraphicsResources(vtkWindow *w) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *w) override;
//@{
/**
@@ -127,7 +127,7 @@ public:
/**
* Destructor.
*/
- ~vtkDepthPeelingPass() VTK_OVERRIDE;
+ ~vtkDepthPeelingPass() override;
/**
* Check if depth peeling is supported by the current OpenGL context.
diff --git a/Rendering/OpenGL/vtkDisplayListPainter.h b/Rendering/OpenGL/vtkDisplayListPainter.h
index 59bff38439db274c1a1da2144bfe1854c006b7c4..b7fe183dbb00d487871819affd55128232848177 100644
--- a/Rendering/OpenGL/vtkDisplayListPainter.h
+++ b/Rendering/OpenGL/vtkDisplayListPainter.h
@@ -31,7 +31,7 @@ class VTKRENDERINGOPENGL_EXPORT vtkDisplayListPainter : public vtkPainter
public:
static vtkDisplayListPainter* New();
vtkTypeMacro(vtkDisplayListPainter, vtkPainter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Turn on/off flag to control whether data is rendered using
@@ -48,17 +48,17 @@ public:
* Overridden to avoid adding of delegate rendering time
* when Display Lists are used.
*/
- double GetTimeToDraw() VTK_OVERRIDE;
+ double GetTimeToDraw() override;
protected:
vtkDisplayListPainter();
- ~vtkDisplayListPainter() VTK_OVERRIDE;
+ ~vtkDisplayListPainter() override;
/**
* Called before RenderInternal() if the Information has been changed
* since the last time this method was called.
*/
- void ProcessInformation(vtkInformation*) VTK_OVERRIDE;
+ void ProcessInformation(vtkInformation*) override;
// These methods set the ivars. These are purposefully protected.
diff --git a/Rendering/OpenGL/vtkFrameBufferObject.h b/Rendering/OpenGL/vtkFrameBufferObject.h
index a4d966a3398759b33c3a1427c9ca84e78e99f691..1a45626f769a7312746921c85262a40400d4fbe5 100644
--- a/Rendering/OpenGL/vtkFrameBufferObject.h
+++ b/Rendering/OpenGL/vtkFrameBufferObject.h
@@ -48,7 +48,7 @@ class VTKRENDERINGOPENGL_EXPORT vtkFrameBufferObject : public vtkFrameBufferObje
public:
static vtkFrameBufferObject* New();
vtkTypeMacro(vtkFrameBufferObject, vtkFrameBufferObjectBase);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -183,16 +183,16 @@ public:
/**
* Dimensions in pixels of the framebuffer.
*/
- int *GetLastSize() VTK_OVERRIDE
+ int *GetLastSize() override
{
return this->LastSize;
}
- void GetLastSize (int &_arg1, int &_arg2) VTK_OVERRIDE
+ void GetLastSize (int &_arg1, int &_arg2) override
{
_arg1 = this->LastSize[0];
_arg2 = this->LastSize[1];
}
- void GetLastSize (int _arg[2]) VTK_OVERRIDE
+ void GetLastSize (int _arg[2]) override
{
this->GetLastSize(_arg[0], _arg[1]);
}
@@ -271,7 +271,7 @@ protected:
void DisplayBuffer(int value);
vtkFrameBufferObject();
- ~vtkFrameBufferObject() VTK_OVERRIDE;
+ ~vtkFrameBufferObject() override;
vtkWeakPointer<vtkRenderWindow> Context;
diff --git a/Rendering/OpenGL/vtkFrameBufferObject2.h b/Rendering/OpenGL/vtkFrameBufferObject2.h
index 0be555c91a8ae1859ee0810c1ae8477e33f38bb0..4f0e2484780e4f501886a3815b47266676e2fd11 100644
--- a/Rendering/OpenGL/vtkFrameBufferObject2.h
+++ b/Rendering/OpenGL/vtkFrameBufferObject2.h
@@ -88,7 +88,7 @@ class VTKRENDERINGOPENGL_EXPORT vtkFrameBufferObject2 : public vtkObject
public:
static vtkFrameBufferObject2* New();
vtkTypeMacro(vtkFrameBufferObject2, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -330,7 +330,7 @@ protected:
int GetOpenGLType(int vtkType);
vtkFrameBufferObject2();
- ~vtkFrameBufferObject2() VTK_OVERRIDE;
+ ~vtkFrameBufferObject2() override;
vtkWeakPointer<vtkRenderWindow> Context;
diff --git a/Rendering/OpenGL/vtkGLSLShaderDeviceAdapter2.h b/Rendering/OpenGL/vtkGLSLShaderDeviceAdapter2.h
index 2939324b39914f1ce248a1b8ee8c9ee3ea441d93..ff9955c4a38952d31422fd9d075d4d2bf8031f36 100644
--- a/Rendering/OpenGL/vtkGLSLShaderDeviceAdapter2.h
+++ b/Rendering/OpenGL/vtkGLSLShaderDeviceAdapter2.h
@@ -34,13 +34,13 @@ class VTKRENDERINGOPENGL_EXPORT vtkGLSLShaderDeviceAdapter2
public:
vtkTypeMacro(vtkGLSLShaderDeviceAdapter2, vtkShaderDeviceAdapter2);
static vtkGLSLShaderDeviceAdapter2 *New();
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
// Descrition:
// This method is called before rendering. This gives the shader device
// adapter an opportunity to collect information, such as attribute indices
// that it will need while rendering.
- void PrepareForRender() VTK_OVERRIDE;
+ void PrepareForRender() override;
/**
* Sends a single attribute to the graphics card.
@@ -61,11 +61,11 @@ public:
int components,
int type,
const void *attribute,
- unsigned long offset=0) VTK_OVERRIDE;
+ unsigned long offset=0) override;
protected:
vtkGLSLShaderDeviceAdapter2();
- ~vtkGLSLShaderDeviceAdapter2() VTK_OVERRIDE;
+ ~vtkGLSLShaderDeviceAdapter2() override;
int GetAttributeLocation(const char* attrName);
diff --git a/Rendering/OpenGL/vtkGaussianBlurPass.h b/Rendering/OpenGL/vtkGaussianBlurPass.h
index 17d134614759a80b451d9d6eada1fd91045cc129..cb9aaaeb036c501c8544a5e1bc63ad146b66da72 100644
--- a/Rendering/OpenGL/vtkGaussianBlurPass.h
+++ b/Rendering/OpenGL/vtkGaussianBlurPass.h
@@ -64,20 +64,20 @@ class VTKRENDERINGOPENGL_EXPORT vtkGaussianBlurPass : public vtkImageProcessingP
public:
static vtkGaussianBlurPass *New();
vtkTypeMacro(vtkGaussianBlurPass,vtkImageProcessingPass);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Perform rendering according to a render state \p s.
* \pre s_exists: s!=0
*/
- void Render(const vtkRenderState *s) VTK_OVERRIDE;
+ void Render(const vtkRenderState *s) override;
/**
* Release graphics resources and ask components to release their own
* resources.
* \pre w_exists: w!=0
*/
- void ReleaseGraphicsResources(vtkWindow *w) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *w) override;
protected:
/**
@@ -88,7 +88,7 @@ public:
/**
* Destructor.
*/
- ~vtkGaussianBlurPass() VTK_OVERRIDE;
+ ~vtkGaussianBlurPass() override;
/**
* Graphics resources.
diff --git a/Rendering/OpenGL/vtkGenericOpenGLRenderWindow.h b/Rendering/OpenGL/vtkGenericOpenGLRenderWindow.h
index 93025aba4e6f5d93759337cc1f2a5cf8492ec5d0..bc0735cc4684b0a2bdeb32f88338a17e901dc057 100644
--- a/Rendering/OpenGL/vtkGenericOpenGLRenderWindow.h
+++ b/Rendering/OpenGL/vtkGenericOpenGLRenderWindow.h
@@ -35,38 +35,38 @@ class VTKRENDERINGOPENGL_EXPORT vtkGenericOpenGLRenderWindow : public vtkOpenGLR
public:
static vtkGenericOpenGLRenderWindow* New();
vtkTypeMacro(vtkGenericOpenGLRenderWindow, vtkOpenGLRenderWindow);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkGenericOpenGLRenderWindow();
- ~vtkGenericOpenGLRenderWindow() VTK_OVERRIDE;
+ ~vtkGenericOpenGLRenderWindow() override;
public:
//! Cleans up graphics resources allocated in the context for this VTK scene.
- void Finalize() VTK_OVERRIDE;
+ void Finalize() override;
//! flush the pending drawing operations
//! Class user may to watch for WindowFrameEvent and act on it
- void Frame() VTK_OVERRIDE;
+ void Frame() override;
//! Makes the context current. It is the class user's
//! responsibility to watch for WindowMakeCurrentEvent and set it current.
- void MakeCurrent() VTK_OVERRIDE;
+ void MakeCurrent() override;
//! Returns if the context is current. It is the class user's
//! responsibility to watch for WindowIsCurrentEvent and set the bool* flag
//! passed through the call data parameter.
- bool IsCurrent() VTK_OVERRIDE;
+ bool IsCurrent() override;
//! Returns if OpenGL is supported. It is the class user's
//! responsibility to watch for WindowSupportsOpenGLEvent and set the int* flag
//! passed through the call data parameter.
- int SupportsOpenGL() VTK_OVERRIDE;
+ int SupportsOpenGL() override;
//! Returns if the context is direct. It is the class user's
//! responsibility to watch for WindowIsDirectEvent and set the int* flag
//! passed through the call data parameter.
- int IsDirect() VTK_OVERRIDE;
+ int IsDirect() override;
// {@
//! set the drawing buffers to use
@@ -85,27 +85,27 @@ public:
// {@
//! does nothing
- void SetWindowId(void*) VTK_OVERRIDE;
- void* GetGenericWindowId() VTK_OVERRIDE;
- void SetDisplayId(void*) VTK_OVERRIDE;
- void SetParentId(void*) VTK_OVERRIDE;
- void* GetGenericDisplayId() VTK_OVERRIDE;
- void* GetGenericParentId() VTK_OVERRIDE;
- void* GetGenericContext() VTK_OVERRIDE;
- void* GetGenericDrawable() VTK_OVERRIDE;
- void SetWindowInfo(char*) VTK_OVERRIDE;
- void SetParentInfo(char*) VTK_OVERRIDE;
- int* GetScreenSize() VTK_OVERRIDE;
- void Start() VTK_OVERRIDE;
- void HideCursor() VTK_OVERRIDE;
- void ShowCursor() VTK_OVERRIDE;
- void SetFullScreen(int) VTK_OVERRIDE;
- void WindowRemap() VTK_OVERRIDE;
- int GetEventPending() VTK_OVERRIDE;
- void SetNextWindowId(void*) VTK_OVERRIDE;
- void SetNextWindowInfo(char*) VTK_OVERRIDE;
- void CreateAWindow() VTK_OVERRIDE;
- void DestroyWindow() VTK_OVERRIDE;
+ void SetWindowId(void*) override;
+ void* GetGenericWindowId() override;
+ void SetDisplayId(void*) override;
+ void SetParentId(void*) override;
+ void* GetGenericDisplayId() override;
+ void* GetGenericParentId() override;
+ void* GetGenericContext() override;
+ void* GetGenericDrawable() override;
+ void SetWindowInfo(char*) override;
+ void SetParentInfo(char*) override;
+ int* GetScreenSize() override;
+ void Start() override;
+ void HideCursor() override;
+ void ShowCursor() override;
+ void SetFullScreen(int) override;
+ void WindowRemap() override;
+ int GetEventPending() override;
+ void SetNextWindowId(void*) override;
+ void SetNextWindowInfo(char*) override;
+ void CreateAWindow() override;
+ void DestroyWindow() override;
// }@
//@{
diff --git a/Rendering/OpenGL/vtkHardwareSelectionPolyDataPainter.h b/Rendering/OpenGL/vtkHardwareSelectionPolyDataPainter.h
index f15603cafc6c11652d01e3f34e576059e2f0c37d..9845a25dabefe4804085621c02e8b0cc9c9d8f5b 100644
--- a/Rendering/OpenGL/vtkHardwareSelectionPolyDataPainter.h
+++ b/Rendering/OpenGL/vtkHardwareSelectionPolyDataPainter.h
@@ -35,7 +35,7 @@ class VTKRENDERINGOPENGL_EXPORT vtkHardwareSelectionPolyDataPainter :
public:
static vtkHardwareSelectionPolyDataPainter* New();
vtkTypeMacro(vtkHardwareSelectionPolyDataPainter, vtkStandardPolyDataPainter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -86,14 +86,14 @@ public:
protected:
vtkHardwareSelectionPolyDataPainter();
- ~vtkHardwareSelectionPolyDataPainter() VTK_OVERRIDE;
+ ~vtkHardwareSelectionPolyDataPainter() override;
/**
* Generates rendering primitives of appropriate type(s). Multiple types
* of primitives can be requested by or-ring the primitive flags.
*/
void RenderInternal(vtkRenderer* renderer, vtkActor* actor,
- unsigned long typeflags, bool forceCompileOnly) VTK_OVERRIDE;
+ unsigned long typeflags, bool forceCompileOnly) override;
void DrawCells(int mode, vtkCellArray *connectivity,
vtkIdType startCellId, vtkRenderer *renderer);
diff --git a/Rendering/OpenGL/vtkHiddenLineRemovalPass.h b/Rendering/OpenGL/vtkHiddenLineRemovalPass.h
index 3cc32328590f0df74d08a8d5bc28d0477180cc13..291ae2d19bf3fb1789f85237633c731a0133ae4a 100644
--- a/Rendering/OpenGL/vtkHiddenLineRemovalPass.h
+++ b/Rendering/OpenGL/vtkHiddenLineRemovalPass.h
@@ -38,9 +38,9 @@ class VTKRENDERINGOPENGL_EXPORT vtkHiddenLineRemovalPass : public vtkRenderPass
public:
static vtkHiddenLineRemovalPass* New();
vtkTypeMacro(vtkHiddenLineRemovalPass, vtkRenderPass)
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
- void Render(const vtkRenderState *s) VTK_OVERRIDE;
+ void Render(const vtkRenderState *s) override;
/**
* Returns true if any of the nProps in propArray are rendered as wireframe.
@@ -49,7 +49,7 @@ public:
protected:
vtkHiddenLineRemovalPass();
- ~vtkHiddenLineRemovalPass() VTK_OVERRIDE;
+ ~vtkHiddenLineRemovalPass() override;
void SetRepresentation(std::vector<vtkProp*> &props, int repr);
int RenderProps(std::vector<vtkProp*> &props, vtkViewport *vp);
diff --git a/Rendering/OpenGL/vtkImageProcessingPass.h b/Rendering/OpenGL/vtkImageProcessingPass.h
index 902a320fef685c9ceaf91c7a0976ae40196a32f4..53091ee6df78ac79d07b015cc4cfd4a734b29534 100644
--- a/Rendering/OpenGL/vtkImageProcessingPass.h
+++ b/Rendering/OpenGL/vtkImageProcessingPass.h
@@ -41,14 +41,14 @@ class VTKRENDERINGOPENGL_EXPORT vtkImageProcessingPass : public vtkRenderPass
{
public:
vtkTypeMacro(vtkImageProcessingPass,vtkRenderPass);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Release graphics resources and ask components to release their own
* resources.
* \pre w_exists: w!=0
*/
- void ReleaseGraphicsResources(vtkWindow *w) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *w) override;
//@{
/**
@@ -70,7 +70,7 @@ public:
/**
* Destructor.
*/
- ~vtkImageProcessingPass() VTK_OVERRIDE;
+ ~vtkImageProcessingPass() override;
/**
* Render delegate with a image of different dimensions than the
diff --git a/Rendering/OpenGL/vtkLightingHelper.h b/Rendering/OpenGL/vtkLightingHelper.h
index 681b089c8939623a71e66701f956caede04b4ba1..5180959ff172bf40b5baa2944eb44de138eedae3 100644
--- a/Rendering/OpenGL/vtkLightingHelper.h
+++ b/Rendering/OpenGL/vtkLightingHelper.h
@@ -40,7 +40,7 @@ class VTKRENDERINGOPENGL_EXPORT vtkLightingHelper : public vtkObject
public:
static vtkLightingHelper* New();
vtkTypeMacro(vtkLightingHelper, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
enum {
VTK_MAX_LIGHTS=8
@@ -65,7 +65,7 @@ public:
protected:
vtkLightingHelper();
- ~vtkLightingHelper() VTK_OVERRIDE;
+ ~vtkLightingHelper() override;
void SetShader(vtkShaderProgram2 *shader);
vtkShaderProgram2 *Shader;
diff --git a/Rendering/OpenGL/vtkLightingPainter.h b/Rendering/OpenGL/vtkLightingPainter.h
index 3e9fdeab21d42e673d77a66eac80cbe93dfad845..9399aa25ee38a2eedc1fae42d85014e20589a34b 100644
--- a/Rendering/OpenGL/vtkLightingPainter.h
+++ b/Rendering/OpenGL/vtkLightingPainter.h
@@ -29,11 +29,11 @@ class VTKRENDERINGOPENGL_EXPORT vtkLightingPainter : public vtkPolyDataPainter
public:
static vtkLightingPainter* New();
vtkTypeMacro(vtkLightingPainter, vtkPolyDataPainter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkLightingPainter();
- ~vtkLightingPainter() VTK_OVERRIDE;
+ ~vtkLightingPainter() override;
private:
vtkLightingPainter(const vtkLightingPainter&) VTK_DELETE_FUNCTION;
diff --git a/Rendering/OpenGL/vtkLightsPass.h b/Rendering/OpenGL/vtkLightsPass.h
index 4d14f9c10b6ddc952c46cfbc98eced0c685f5b27..d52db7e62b1215c364f9750a3dff494fb89df0e9 100644
--- a/Rendering/OpenGL/vtkLightsPass.h
+++ b/Rendering/OpenGL/vtkLightsPass.h
@@ -39,13 +39,13 @@ class VTKRENDERINGOPENGL_EXPORT vtkLightsPass : public vtkRenderPass
public:
static vtkLightsPass *New();
vtkTypeMacro(vtkLightsPass,vtkRenderPass);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Perform rendering according to a render state \p s.
* \pre s_exists: s!=0
*/
- void Render(const vtkRenderState *s) VTK_OVERRIDE;
+ void Render(const vtkRenderState *s) override;
protected:
/**
@@ -56,7 +56,7 @@ public:
/**
* Destructor.
*/
- ~vtkLightsPass() VTK_OVERRIDE;
+ ~vtkLightsPass() override;
private:
vtkLightsPass(const vtkLightsPass&) VTK_DELETE_FUNCTION;
diff --git a/Rendering/OpenGL/vtkLinesPainter.h b/Rendering/OpenGL/vtkLinesPainter.h
index 1a04af8b2ae7445a414ff0ace2ffc9cac8410afa..ef1ecd46de0fadc4e0ac6b06971a47f46baed160 100644
--- a/Rendering/OpenGL/vtkLinesPainter.h
+++ b/Rendering/OpenGL/vtkLinesPainter.h
@@ -36,11 +36,11 @@ class VTKRENDERINGOPENGL_EXPORT vtkLinesPainter : public vtkPrimitivePainter
public:
static vtkLinesPainter* New();
vtkTypeMacro(vtkLinesPainter, vtkPrimitivePainter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkLinesPainter();
- ~vtkLinesPainter() VTK_OVERRIDE;
+ ~vtkLinesPainter() override;
int RenderPolys; // Flag indicating if the line loops are to be closed.
@@ -49,14 +49,14 @@ protected:
* as line loops.
*/
void RenderInternal(vtkRenderer* renderer, vtkActor* actor,
- unsigned long typeflags, bool forceCompileOnly) VTK_OVERRIDE;
+ unsigned long typeflags, bool forceCompileOnly) override;
/**
* The actual rendering happens here. This method is called only when
* SupportedPrimitive is present in typeflags when Render() is invoked.
*/
int RenderPrimitive(unsigned long flags, vtkDataArray* n,
- vtkUnsignedCharArray* c, vtkDataArray* t, vtkRenderer* ren) VTK_OVERRIDE;
+ vtkUnsignedCharArray* c, vtkDataArray* t, vtkRenderer* ren) override;
private:
vtkLinesPainter(const vtkLinesPainter&) VTK_DELETE_FUNCTION;
diff --git a/Rendering/OpenGL/vtkOpaquePass.h b/Rendering/OpenGL/vtkOpaquePass.h
index b7e0918969658d85eb8fac18af1e66d932cc0620..74eedab4f94aa25fc6f9c3d64cbb737e7e91511b 100644
--- a/Rendering/OpenGL/vtkOpaquePass.h
+++ b/Rendering/OpenGL/vtkOpaquePass.h
@@ -39,13 +39,13 @@ class VTKRENDERINGOPENGL_EXPORT vtkOpaquePass : public vtkDefaultPass
public:
static vtkOpaquePass *New();
vtkTypeMacro(vtkOpaquePass,vtkDefaultPass);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Perform rendering according to a render state \p s.
* \pre s_exists: s!=0
*/
- void Render(const vtkRenderState *s) VTK_OVERRIDE;
+ void Render(const vtkRenderState *s) override;
protected:
/**
@@ -56,7 +56,7 @@ public:
/**
* Destructor.
*/
- ~vtkOpaquePass() VTK_OVERRIDE;
+ ~vtkOpaquePass() override;
private:
vtkOpaquePass(const vtkOpaquePass&) VTK_DELETE_FUNCTION;
diff --git a/Rendering/OpenGL/vtkOpenGLActor.h b/Rendering/OpenGL/vtkOpenGLActor.h
index 40b4064fa99b74c487382c00e3b0f3e0a104baf1..1511402065e2d765f8a17cc09f699d9595c45d79 100644
--- a/Rendering/OpenGL/vtkOpenGLActor.h
+++ b/Rendering/OpenGL/vtkOpenGLActor.h
@@ -33,16 +33,16 @@ class VTKRENDERINGOPENGL_EXPORT vtkOpenGLActor : public vtkActor
public:
static vtkOpenGLActor *New();
vtkTypeMacro(vtkOpenGLActor, vtkActor);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Actual actor render method.
*/
- void Render(vtkRenderer *ren, vtkMapper *mapper) VTK_OVERRIDE;
+ void Render(vtkRenderer *ren, vtkMapper *mapper) override;
protected:
vtkOpenGLActor() {}
- ~vtkOpenGLActor() VTK_OVERRIDE {}
+ ~vtkOpenGLActor() override {}
private:
vtkOpenGLActor(const vtkOpenGLActor&) VTK_DELETE_FUNCTION;
diff --git a/Rendering/OpenGL/vtkOpenGLCamera.h b/Rendering/OpenGL/vtkOpenGLCamera.h
index eabf0e4a85ef4434e537d35f3d1d9b393f53e5d0..49da7a75f710f7bb3cb023ae53953fbdd363db8d 100644
--- a/Rendering/OpenGL/vtkOpenGLCamera.h
+++ b/Rendering/OpenGL/vtkOpenGLCamera.h
@@ -33,18 +33,18 @@ class VTKRENDERINGOPENGL_EXPORT vtkOpenGLCamera : public vtkCamera
public:
static vtkOpenGLCamera *New();
vtkTypeMacro(vtkOpenGLCamera, vtkCamera);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Implement base class method.
*/
- void Render(vtkRenderer *ren) VTK_OVERRIDE;
+ void Render(vtkRenderer *ren) override;
- void UpdateViewport(vtkRenderer *ren) VTK_OVERRIDE;
+ void UpdateViewport(vtkRenderer *ren) override;
protected:
vtkOpenGLCamera() {}
- ~vtkOpenGLCamera() VTK_OVERRIDE {}
+ ~vtkOpenGLCamera() override {}
private:
vtkOpenGLCamera(const vtkOpenGLCamera&) VTK_DELETE_FUNCTION;
void operator=(const vtkOpenGLCamera&) VTK_DELETE_FUNCTION;
diff --git a/Rendering/OpenGL/vtkOpenGLClipPlanesPainter.h b/Rendering/OpenGL/vtkOpenGLClipPlanesPainter.h
index c699e95f2be8c86d7f26ec90aafb06eb09d293ea..c3bdd96a1dfc6d2d910a1d0161597debf5bacfdf 100644
--- a/Rendering/OpenGL/vtkOpenGLClipPlanesPainter.h
+++ b/Rendering/OpenGL/vtkOpenGLClipPlanesPainter.h
@@ -34,11 +34,11 @@ class VTKRENDERINGOPENGL_EXPORT vtkOpenGLClipPlanesPainter : public vtkClipPlane
public:
static vtkOpenGLClipPlanesPainter* New();
vtkTypeMacro(vtkOpenGLClipPlanesPainter, vtkClipPlanesPainter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkOpenGLClipPlanesPainter();
- ~vtkOpenGLClipPlanesPainter() VTK_OVERRIDE;
+ ~vtkOpenGLClipPlanesPainter() override;
/**
* Generates rendering primitives of appropriate type(s).
@@ -46,7 +46,7 @@ protected:
* typeflags are ignored by this painter.
*/
void RenderInternal(vtkRenderer* renderer, vtkActor* actor,
- unsigned long typeflags, bool forceCompileOnly) VTK_OVERRIDE;
+ unsigned long typeflags, bool forceCompileOnly) override;
private:
vtkOpenGLClipPlanesPainter(const vtkOpenGLClipPlanesPainter&) VTK_DELETE_FUNCTION;
diff --git a/Rendering/OpenGL/vtkOpenGLCoincidentTopologyResolutionPainter.h b/Rendering/OpenGL/vtkOpenGLCoincidentTopologyResolutionPainter.h
index dca8f2fe818ed2009fc07234fc8fc38aa31ae415..145fe2a24ba7a4f084c83789423d6ed28a703890 100644
--- a/Rendering/OpenGL/vtkOpenGLCoincidentTopologyResolutionPainter.h
+++ b/Rendering/OpenGL/vtkOpenGLCoincidentTopologyResolutionPainter.h
@@ -31,11 +31,11 @@ public:
static vtkOpenGLCoincidentTopologyResolutionPainter* New();
vtkTypeMacro(vtkOpenGLCoincidentTopologyResolutionPainter,
vtkCoincidentTopologyResolutionPainter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkOpenGLCoincidentTopologyResolutionPainter();
- ~vtkOpenGLCoincidentTopologyResolutionPainter() VTK_OVERRIDE;
+ ~vtkOpenGLCoincidentTopologyResolutionPainter() override;
/**
* Performs the actual rendering. Subclasses may override this method.
@@ -45,7 +45,7 @@ protected:
* has been called.
*/
void RenderInternal(vtkRenderer* renderer, vtkActor* actor,
- unsigned long typeflags, bool forceCompileOnly) VTK_OVERRIDE;
+ unsigned long typeflags, bool forceCompileOnly) override;
void RenderPolygonOffset(vtkRenderer *renderer, vtkActor *actor,
unsigned long typeflags, bool forceCompileOnly);
diff --git a/Rendering/OpenGL/vtkOpenGLCompositePainter.h b/Rendering/OpenGL/vtkOpenGLCompositePainter.h
index 3ae961e77fb05b987515d52852cd3955f67c3ffd..7961c0da20e455ceb3893e5ec66fc18eaa9aa956 100644
--- a/Rendering/OpenGL/vtkOpenGLCompositePainter.h
+++ b/Rendering/OpenGL/vtkOpenGLCompositePainter.h
@@ -29,17 +29,17 @@ class VTKRENDERINGOPENGL_EXPORT vtkOpenGLCompositePainter : public vtkCompositeP
public:
static vtkOpenGLCompositePainter* New();
vtkTypeMacro(vtkOpenGLCompositePainter, vtkCompositePainter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkOpenGLCompositePainter();
- ~vtkOpenGLCompositePainter() VTK_OVERRIDE;
+ ~vtkOpenGLCompositePainter() override;
/**
* Overridden in vtkOpenGLCompositePainter to pass attributes to OpenGL.
*/
void UpdateRenderingState(
- vtkRenderWindow* window, vtkProperty* property, RenderBlockState& state) VTK_OVERRIDE;
+ vtkRenderWindow* window, vtkProperty* property, RenderBlockState& state) override;
private:
vtkOpenGLCompositePainter(const vtkOpenGLCompositePainter&) VTK_DELETE_FUNCTION;
diff --git a/Rendering/OpenGL/vtkOpenGLDisplayListPainter.h b/Rendering/OpenGL/vtkOpenGLDisplayListPainter.h
index f6be303cd1fcf6b7db77a318f75bb4d03110cae6..893fb0c347082eb850707e30193c570decdee5c3 100644
--- a/Rendering/OpenGL/vtkOpenGLDisplayListPainter.h
+++ b/Rendering/OpenGL/vtkOpenGLDisplayListPainter.h
@@ -33,19 +33,19 @@ class VTKRENDERINGOPENGL_EXPORT vtkOpenGLDisplayListPainter : public vtkDisplayL
public:
static vtkOpenGLDisplayListPainter* New();
vtkTypeMacro(vtkOpenGLDisplayListPainter, vtkDisplayListPainter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Release any graphics resources that are being consumed by this mapper.
* The parameter window could be used to determine which graphic
* resources to release. In this case, releases the display lists.
*/
- void ReleaseGraphicsResources(vtkWindow *) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *) override;
protected:
vtkOpenGLDisplayListPainter();
- ~vtkOpenGLDisplayListPainter() VTK_OVERRIDE;
+ ~vtkOpenGLDisplayListPainter() override;
/**
* If not using ImmediateModeRendering, this will build a display list,
@@ -53,7 +53,7 @@ protected:
*/
void RenderInternal(vtkRenderer* renderer, vtkActor* actor,
unsigned long typeflags,
- bool forceCompileOnly) VTK_OVERRIDE;
+ bool forceCompileOnly) override;
private:
vtkOpenGLDisplayListPainter(const vtkOpenGLDisplayListPainter&) VTK_DELETE_FUNCTION;
diff --git a/Rendering/OpenGL/vtkOpenGLExtensionManager.h b/Rendering/OpenGL/vtkOpenGLExtensionManager.h
index 06348ed9188160c5e4ac98e6d43027bdf4bdf353..8ab74c80456c31b8a0cf66ac3a51f2fd795419e5 100644
--- a/Rendering/OpenGL/vtkOpenGLExtensionManager.h
+++ b/Rendering/OpenGL/vtkOpenGLExtensionManager.h
@@ -146,7 +146,7 @@ class VTKRENDERINGOPENGL_EXPORT vtkOpenGLExtensionManager : public vtkObject
public:
vtkTypeMacro(vtkOpenGLExtensionManager, vtkObject);
static vtkOpenGLExtensionManager *New();
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
//@{
/**
@@ -379,7 +379,7 @@ public:
protected:
vtkOpenGLExtensionManager();
- ~vtkOpenGLExtensionManager() VTK_OVERRIDE;
+ ~vtkOpenGLExtensionManager() override;
int OwnRenderWindow;
char *ExtensionsString;
diff --git a/Rendering/OpenGL/vtkOpenGLGlyph3DMapper.h b/Rendering/OpenGL/vtkOpenGLGlyph3DMapper.h
index ca2dfbb9d711d1ee8b99c982298a222fc75acb28..edf80bae77a511208a1aada470f4f4ba0dfee547 100644
--- a/Rendering/OpenGL/vtkOpenGLGlyph3DMapper.h
+++ b/Rendering/OpenGL/vtkOpenGLGlyph3DMapper.h
@@ -42,30 +42,30 @@ class VTKRENDERINGOPENGL_EXPORT vtkOpenGLGlyph3DMapper : public vtkGlyph3DMapper
public:
static vtkOpenGLGlyph3DMapper* New();
vtkTypeMacro(vtkOpenGLGlyph3DMapper, vtkGlyph3DMapper);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Method initiates the mapping process. Generally sent by the actor
* as each frame is rendered.
*/
- void Render(vtkRenderer *ren, vtkActor *a) VTK_OVERRIDE;
+ void Render(vtkRenderer *ren, vtkActor *a) override;
/**
* Release any graphics resources that are being consumed by this mapper.
* The parameter window could be used to determine which graphic
* resources to release.
*/
- void ReleaseGraphicsResources(vtkWindow *window) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *window) override;
protected:
vtkOpenGLGlyph3DMapper();
- ~vtkOpenGLGlyph3DMapper() VTK_OVERRIDE;
+ ~vtkOpenGLGlyph3DMapper() override;
/**
* Take part in garbage collection.
*/
- void ReportReferences(vtkGarbageCollector*) VTK_OVERRIDE;
+ void ReportReferences(vtkGarbageCollector*) override;
/**
* Send mapper ivars to sub-mapper.
diff --git a/Rendering/OpenGL/vtkOpenGLHardwareSelector.h b/Rendering/OpenGL/vtkOpenGLHardwareSelector.h
index 1cff21a3d504c18a4752465dfa09cdab1c0e7fdb..2772e7693f54bc57172388432801874d249a58ce 100644
--- a/Rendering/OpenGL/vtkOpenGLHardwareSelector.h
+++ b/Rendering/OpenGL/vtkOpenGLHardwareSelector.h
@@ -35,26 +35,26 @@ class VTKRENDERINGOPENGL_EXPORT vtkOpenGLHardwareSelector : public vtkHardwareSe
public:
static vtkOpenGLHardwareSelector* New();
vtkTypeMacro(vtkOpenGLHardwareSelector, vtkHardwareSelector);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Called by the mapper (vtkHardwareSelectionPolyDataPainter) before and after
* rendering each prop.
*/
- void BeginRenderProp() VTK_OVERRIDE
+ void BeginRenderProp() override
{ this->vtkHardwareSelector::BeginRenderProp(); }
- void EndRenderProp() VTK_OVERRIDE
+ void EndRenderProp() override
{ this->vtkHardwareSelector::EndRenderProp(); }
protected:
vtkOpenGLHardwareSelector();
- ~vtkOpenGLHardwareSelector() VTK_OVERRIDE;
+ ~vtkOpenGLHardwareSelector() override;
// Called internally before and after each prop is rendered
// for device specific configuration/preparation etc.
- void BeginRenderProp(vtkRenderWindow *) VTK_OVERRIDE;
- void EndRenderProp(vtkRenderWindow *) VTK_OVERRIDE;
+ void BeginRenderProp(vtkRenderWindow *) override;
+ void EndRenderProp(vtkRenderWindow *) override;
// for internal state
class vtkInternals;
diff --git a/Rendering/OpenGL/vtkOpenGLHardwareSupport.h b/Rendering/OpenGL/vtkOpenGLHardwareSupport.h
index eb622677dbdb9a699781ef3a831b9dfc31ddb7d1..afd4e4cb6e82273f0be45901ff668a94fac0e62d 100644
--- a/Rendering/OpenGL/vtkOpenGLHardwareSupport.h
+++ b/Rendering/OpenGL/vtkOpenGLHardwareSupport.h
@@ -36,7 +36,7 @@ class VTKRENDERINGOPENGL_EXPORT vtkOpenGLHardwareSupport :
{
public:
vtkTypeMacro(vtkOpenGLHardwareSupport, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkOpenGLHardwareSupport *New();
@@ -67,7 +67,7 @@ public:
protected:
vtkOpenGLHardwareSupport();
- ~vtkOpenGLHardwareSupport() VTK_OVERRIDE;
+ ~vtkOpenGLHardwareSupport() override;
private:
vtkOpenGLHardwareSupport(const vtkOpenGLHardwareSupport&) VTK_DELETE_FUNCTION;
diff --git a/Rendering/OpenGL/vtkOpenGLImageMapper.h b/Rendering/OpenGL/vtkOpenGLImageMapper.h
index 83c7defd3782df3e52557c1a047b1480f1ce5f1a..d1c59dd7b6645c5f06cb8f35c5a94dd09d8e1aa1 100644
--- a/Rendering/OpenGL/vtkOpenGLImageMapper.h
+++ b/Rendering/OpenGL/vtkOpenGLImageMapper.h
@@ -40,12 +40,12 @@ class VTKRENDERINGOPENGL_EXPORT vtkOpenGLImageMapper : public vtkImageMapper
public:
static vtkOpenGLImageMapper *New();
vtkTypeMacro(vtkOpenGLImageMapper, vtkImageMapper);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Handle the render method.
*/
- void RenderOverlay(vtkViewport* viewport, vtkActor2D* actor) VTK_OVERRIDE
+ void RenderOverlay(vtkViewport* viewport, vtkActor2D* actor) override
{ this->RenderStart(viewport, actor); }
/**
@@ -53,11 +53,11 @@ public:
* the image to the screen.
*/
void RenderData(vtkViewport* viewport, vtkImageData* data,
- vtkActor2D* actor) VTK_OVERRIDE;
+ vtkActor2D* actor) override;
protected:
vtkOpenGLImageMapper();
- ~vtkOpenGLImageMapper() VTK_OVERRIDE;
+ ~vtkOpenGLImageMapper() override;
private:
vtkOpenGLImageMapper(const vtkOpenGLImageMapper&) VTK_DELETE_FUNCTION;
diff --git a/Rendering/OpenGL/vtkOpenGLImageSliceMapper.h b/Rendering/OpenGL/vtkOpenGLImageSliceMapper.h
index 38bfb009824bec25ad05db900fa68c49045e49d0..d6d04b0c6aba97b2e401955b818cf12922258d8b 100644
--- a/Rendering/OpenGL/vtkOpenGLImageSliceMapper.h
+++ b/Rendering/OpenGL/vtkOpenGLImageSliceMapper.h
@@ -43,23 +43,23 @@ class VTKRENDERINGOPENGL_EXPORT vtkOpenGLImageSliceMapper :
public:
static vtkOpenGLImageSliceMapper *New();
vtkTypeMacro(vtkOpenGLImageSliceMapper, vtkImageSliceMapper);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Implement base class method. Perform the render.
*/
- void Render(vtkRenderer *ren, vtkImageSlice *prop) VTK_OVERRIDE;
+ void Render(vtkRenderer *ren, vtkImageSlice *prop) override;
/**
* Release any graphics resources that are being consumed by this
* mapper, the image texture in particular. Using the same texture
* in multiple render windows is NOT currently supported.
*/
- void ReleaseGraphicsResources(vtkWindow *) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *) override;
protected:
vtkOpenGLImageSliceMapper();
- ~vtkOpenGLImageSliceMapper() VTK_OVERRIDE;
+ ~vtkOpenGLImageSliceMapper() override;
/**
* Call the OpenGL code that does color and lighting.
@@ -117,7 +117,7 @@ protected:
*/
void ComputeTextureSize(
const int extent[6], int &xdim, int &ydim,
- int imageSize[2], int textureSize[2]) VTK_OVERRIDE;
+ int imageSize[2], int textureSize[2]) override;
/**
* Test whether a given texture size is supported. This includes a
diff --git a/Rendering/OpenGL/vtkOpenGLLabeledContourMapper.h b/Rendering/OpenGL/vtkOpenGLLabeledContourMapper.h
index e9592cd012fbefe19d610cebad5d6c3ea6e64e1c..f2729dea0418eead0177db681732d7d722ee28ad 100644
--- a/Rendering/OpenGL/vtkOpenGLLabeledContourMapper.h
+++ b/Rendering/OpenGL/vtkOpenGLLabeledContourMapper.h
@@ -34,10 +34,10 @@ public:
protected:
vtkOpenGLLabeledContourMapper();
- ~vtkOpenGLLabeledContourMapper() VTK_OVERRIDE;
+ ~vtkOpenGLLabeledContourMapper() override;
- bool ApplyStencil(vtkRenderer *ren, vtkActor *act) VTK_OVERRIDE;
- bool RemoveStencil() VTK_OVERRIDE;
+ bool ApplyStencil(vtkRenderer *ren, vtkActor *act) override;
+ bool RemoveStencil() override;
private:
vtkOpenGLLabeledContourMapper(const vtkOpenGLLabeledContourMapper&) VTK_DELETE_FUNCTION;
diff --git a/Rendering/OpenGL/vtkOpenGLLight.h b/Rendering/OpenGL/vtkOpenGLLight.h
index b92d828edc91dc42fddda639d82b757bb8c48ae7..1789811e995de66a4ac31057a33e8e0723f58f51 100644
--- a/Rendering/OpenGL/vtkOpenGLLight.h
+++ b/Rendering/OpenGL/vtkOpenGLLight.h
@@ -33,16 +33,16 @@ class VTKRENDERINGOPENGL_EXPORT vtkOpenGLLight : public vtkLight
public:
static vtkOpenGLLight *New();
vtkTypeMacro(vtkOpenGLLight, vtkLight);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Implement base class method.
*/
- void Render(vtkRenderer *ren, int light_index) VTK_OVERRIDE;
+ void Render(vtkRenderer *ren, int light_index) override;
protected:
vtkOpenGLLight() {}
- ~vtkOpenGLLight() VTK_OVERRIDE {}
+ ~vtkOpenGLLight() override {}
private:
vtkOpenGLLight(const vtkOpenGLLight&) VTK_DELETE_FUNCTION;
diff --git a/Rendering/OpenGL/vtkOpenGLLightMonitor.h b/Rendering/OpenGL/vtkOpenGLLightMonitor.h
index 05a4f45b608a72f7b69bc9a6fdf85d692c19b201..80b80d8ffcd067192ed38e3f0988c60d707d4522 100644
--- a/Rendering/OpenGL/vtkOpenGLLightMonitor.h
+++ b/Rendering/OpenGL/vtkOpenGLLightMonitor.h
@@ -39,7 +39,7 @@ public:
static vtkOpenGLLightMonitor* New();
static vtkOpenGLLightMonitor *New(int lightId);
vtkTypeMacro(vtkOpenGLLightMonitor, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -87,7 +87,7 @@ private:
vtkOpenGLLightMonitor() : LightId(0), UpTime(0)
{ this->Initialize(); }
- ~vtkOpenGLLightMonitor() VTK_OVERRIDE{}
+ ~vtkOpenGLLightMonitor() override{}
void Initialize();
diff --git a/Rendering/OpenGL/vtkOpenGLLightingPainter.h b/Rendering/OpenGL/vtkOpenGLLightingPainter.h
index ae081820e23ff17bf959d4da509b54fff7e8529f..3311cd00474fa9cbe6829e9b52c4b9a662b61112 100644
--- a/Rendering/OpenGL/vtkOpenGLLightingPainter.h
+++ b/Rendering/OpenGL/vtkOpenGLLightingPainter.h
@@ -35,7 +35,7 @@ class VTKRENDERINGOPENGL_EXPORT vtkOpenGLLightingPainter : public vtkLightingPai
public:
static vtkOpenGLLightingPainter* New();
vtkTypeMacro(vtkOpenGLLightingPainter, vtkLightingPainter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* This painter overrides GetTimeToDraw() to never pass the request to the
@@ -44,12 +44,12 @@ public:
* responsibility is borne by the painter causing the multiple rendering
* requests i.e. this painter itself.
*/
- double GetTimeToDraw() VTK_OVERRIDE
+ double GetTimeToDraw() override
{ return this->TimeToDraw; }
protected:
vtkOpenGLLightingPainter();
- ~vtkOpenGLLightingPainter() VTK_OVERRIDE;
+ ~vtkOpenGLLightingPainter() override;
/**
* Setups lighting state before calling render on delegate
@@ -58,7 +58,7 @@ protected:
void RenderInternal(vtkRenderer *renderer,
vtkActor *actor,
unsigned long typeflags,
- bool forceCompileOnly) VTK_OVERRIDE;
+ bool forceCompileOnly) override;
private:
vtkOpenGLLightingPainter(const vtkOpenGLLightingPainter&) VTK_DELETE_FUNCTION;
diff --git a/Rendering/OpenGL/vtkOpenGLModelViewProjectionMonitor.h b/Rendering/OpenGL/vtkOpenGLModelViewProjectionMonitor.h
index b39dc10a666f8d767d3392073d74ef2dce18da44..59d6797ac6ff1af89a11ea11562b043663952d68 100644
--- a/Rendering/OpenGL/vtkOpenGLModelViewProjectionMonitor.h
+++ b/Rendering/OpenGL/vtkOpenGLModelViewProjectionMonitor.h
@@ -38,7 +38,7 @@ class VTKRENDERINGOPENGL_EXPORT vtkOpenGLModelViewProjectionMonitor : public vtk
public:
static vtkOpenGLModelViewProjectionMonitor* New();
vtkTypeMacro(vtkOpenGLModelViewProjectionMonitor, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Fetches the current GL state and updates the
@@ -67,7 +67,7 @@ protected:
vtkOpenGLModelViewProjectionMonitor() : UpTime(0)
{ this->Initialize(); }
- ~vtkOpenGLModelViewProjectionMonitor() VTK_OVERRIDE{}
+ ~vtkOpenGLModelViewProjectionMonitor() override{}
void Initialize();
diff --git a/Rendering/OpenGL/vtkOpenGLPainterDeviceAdapter.h b/Rendering/OpenGL/vtkOpenGLPainterDeviceAdapter.h
index 60772235ad2e67ac8679313295c145f70b19553e..8299ff0c67e425206d946a58aa63edb0451dca09 100644
--- a/Rendering/OpenGL/vtkOpenGLPainterDeviceAdapter.h
+++ b/Rendering/OpenGL/vtkOpenGLPainterDeviceAdapter.h
@@ -59,85 +59,85 @@ class VTKRENDERINGOPENGL_EXPORT vtkOpenGLPainterDeviceAdapter :
public:
vtkTypeMacro(vtkOpenGLPainterDeviceAdapter, vtkPainterDeviceAdapter);
static vtkOpenGLPainterDeviceAdapter *New();
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
/**
* Converts mode from VTK_* to GL_* and calls glBegin.
*/
- void BeginPrimitive(int mode) VTK_OVERRIDE;
+ void BeginPrimitive(int mode) override;
/**
* Calls glEnd.
*/
- void EndPrimitive() VTK_OVERRIDE;
+ void EndPrimitive() override;
/**
* Returns if the given attribute type is supported by the device.
* Returns 1 is supported, 0 otherwise.
*/
- int IsAttributesSupported(int attribute) VTK_OVERRIDE;
+ int IsAttributesSupported(int attribute) override;
/**
* Calls one of glVertex*, glNormal*, glColor*, or glTexCoord*.
*/
void SendAttribute(int index, int components, int type,
- const void *attribute, vtkIdType offset=0) VTK_OVERRIDE;
+ const void *attribute, vtkIdType offset=0) override;
/**
* Calls glMultiTex
*/
void SendMultiTextureCoords(int numcomp, int type, const void *attribute,
- int idx, vtkIdType offset) VTK_OVERRIDE;
+ int idx, vtkIdType offset) override;
/**
* Calls one of glVertexPointer, glNormalPointer, glColorPointer, or
* glTexCoordPointer.
*/
void SetAttributePointer(int index, int numcomponents, int type,
- int stride, const void *pointer) VTK_OVERRIDE;
+ int stride, const void *pointer) override;
//@{
/**
* Calls glEnableClientState or glDisableClientState.
*/
- void EnableAttributeArray(int index) VTK_OVERRIDE;
- void DisableAttributeArray(int index) VTK_OVERRIDE;
+ void EnableAttributeArray(int index) override;
+ void DisableAttributeArray(int index) override;
//@}
/**
* Calls glDrawArrays. Mode is converted from VTK_* to GL_*.
*/
- void DrawArrays(int mode, vtkIdType first, vtkIdType count) VTK_OVERRIDE;
+ void DrawArrays(int mode, vtkIdType first, vtkIdType count) override;
/**
* Calls glDrawElements. Mode and type are converted from VTK_* to GL_*.
*/
- void DrawElements(int mode, vtkIdType count, int type, void *indices) VTK_OVERRIDE;
+ void DrawElements(int mode, vtkIdType count, int type, void *indices) override;
/**
* Returns true if renderer is a vtkOpenGLRenderer.
*/
- int Compatible(vtkRenderer *renderer) VTK_OVERRIDE;
+ int Compatible(vtkRenderer *renderer) override;
/**
* Turns emphasis of vertices on or off for vertex selection.
* When emphasized verts are drawn nearer to the camera and are drawn
* larger than normal to make selection of them more reliable.
*/
- void MakeVertexEmphasis(bool mode) VTK_OVERRIDE;
+ void MakeVertexEmphasis(bool mode) override;
//@{
/**
* Control use of the stencil buffer (for vertex selection).
*/
- void Stencil(int on) VTK_OVERRIDE;
- void WriteStencil(vtkIdType value) VTK_OVERRIDE;
- void TestStencil(vtkIdType value) VTK_OVERRIDE;
+ void Stencil(int on) override;
+ void WriteStencil(vtkIdType value) override;
+ void TestStencil(vtkIdType value) override;
//@}
protected:
vtkOpenGLPainterDeviceAdapter();
- ~vtkOpenGLPainterDeviceAdapter() VTK_OVERRIDE;
+ ~vtkOpenGLPainterDeviceAdapter() override;
double PointSize;
double RangeNear;
diff --git a/Rendering/OpenGL/vtkOpenGLPolyDataMapper.h b/Rendering/OpenGL/vtkOpenGLPolyDataMapper.h
index 62a331fa2e545983e9bc66114e6ed4eb3f4f75e0..4d83ced3c75fc0e1a8c8998b6d4dc1e0bcab5f25 100644
--- a/Rendering/OpenGL/vtkOpenGLPolyDataMapper.h
+++ b/Rendering/OpenGL/vtkOpenGLPolyDataMapper.h
@@ -42,19 +42,19 @@ class VTKRENDERINGOPENGL_EXPORT vtkOpenGLPolyDataMapper : public vtkPolyDataMapp
public:
static vtkOpenGLPolyDataMapper *New();
vtkTypeMacro(vtkOpenGLPolyDataMapper,vtkPolyDataMapper);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Implement superclass render method.
*/
- void RenderPiece(vtkRenderer *ren, vtkActor *a) VTK_OVERRIDE;
+ void RenderPiece(vtkRenderer *ren, vtkActor *a) override;
/**
* Release any graphics resources that are being consumed by this mapper.
* The parameter window could be used to determine which graphic
* resources to release.
*/
- void ReleaseGraphicsResources(vtkWindow *) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *) override;
/**
* Draw method for OpenGL.
@@ -63,7 +63,7 @@ public:
protected:
vtkOpenGLPolyDataMapper();
- ~vtkOpenGLPolyDataMapper() VTK_OVERRIDE;
+ ~vtkOpenGLPolyDataMapper() override;
void DrawPoints(int idx,
vtkPoints *p,
diff --git a/Rendering/OpenGL/vtkOpenGLPolyDataMapper2D.h b/Rendering/OpenGL/vtkOpenGLPolyDataMapper2D.h
index a66a58efe1c77e8866b751c9830f10c3136fc9b1..a2e034c7db4b2c6a8c63eb330b5ad437927d2aa4 100644
--- a/Rendering/OpenGL/vtkOpenGLPolyDataMapper2D.h
+++ b/Rendering/OpenGL/vtkOpenGLPolyDataMapper2D.h
@@ -35,16 +35,16 @@ class VTKRENDERINGOPENGL_EXPORT vtkOpenGLPolyDataMapper2D : public vtkPolyDataMa
public:
vtkTypeMacro(vtkOpenGLPolyDataMapper2D, vtkPolyDataMapper2D);
static vtkOpenGLPolyDataMapper2D *New();
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Actually draw the poly data.
*/
- void RenderOverlay(vtkViewport* viewport, vtkActor2D* actor) VTK_OVERRIDE;
+ void RenderOverlay(vtkViewport* viewport, vtkActor2D* actor) override;
protected:
vtkOpenGLPolyDataMapper2D() {}
- ~vtkOpenGLPolyDataMapper2D() VTK_OVERRIDE {}
+ ~vtkOpenGLPolyDataMapper2D() override {}
private:
vtkOpenGLPolyDataMapper2D(const vtkOpenGLPolyDataMapper2D&) VTK_DELETE_FUNCTION;
diff --git a/Rendering/OpenGL/vtkOpenGLProperty.h b/Rendering/OpenGL/vtkOpenGLProperty.h
index 2d3956d457d27c62dcf1e1a64745000cfa60e761..cf16d1b950df777ead242f887c9f98215c9e45bb 100644
--- a/Rendering/OpenGL/vtkOpenGLProperty.h
+++ b/Rendering/OpenGL/vtkOpenGLProperty.h
@@ -39,17 +39,17 @@ class VTKRENDERINGOPENGL_EXPORT vtkOpenGLProperty : public vtkProperty
public:
static vtkOpenGLProperty *New();
vtkTypeMacro(vtkOpenGLProperty, vtkProperty);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Implement base class method.
*/
- void Render(vtkActor *a, vtkRenderer *ren) VTK_OVERRIDE;
+ void Render(vtkActor *a, vtkRenderer *ren) override;
/**
* Implement base class method.
*/
- void BackfaceRender(vtkActor *a, vtkRenderer *ren) VTK_OVERRIDE;
+ void BackfaceRender(vtkActor *a, vtkRenderer *ren) override;
/**
* This method is called after the actor has been rendered.
@@ -57,14 +57,14 @@ public:
* any shaders allocated.
*/
void PostRender(vtkActor *a,
- vtkRenderer *r) VTK_OVERRIDE;
+ vtkRenderer *r) override;
/**
* Release any graphics resources that are being consumed by this
* property. The parameter window could be used to determine which graphic
* resources to release.
*/
- void ReleaseGraphicsResources(vtkWindow *win) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *win) override;
//@{
/**
@@ -78,7 +78,7 @@ public:
/**
* Get the object that can pass vertex attribute to a vtkShaderProgram2.
*/
- vtkShaderDeviceAdapter2* GetShaderDeviceAdapter2() VTK_OVERRIDE;
+ vtkShaderDeviceAdapter2* GetShaderDeviceAdapter2() override;
//@{
/**
@@ -96,9 +96,9 @@ public:
* - \p numVars - number of variables being set
* - \p x - values
*/
- void AddShaderVariable(const char *name, int numVars, int *x) VTK_OVERRIDE;
- void AddShaderVariable(const char *name, int numVars, float *x) VTK_OVERRIDE;
- void AddShaderVariable(const char *name, int numVars, double *x) VTK_OVERRIDE;
+ void AddShaderVariable(const char *name, int numVars, int *x) override;
+ void AddShaderVariable(const char *name, int numVars, float *x) override;
+ void AddShaderVariable(const char *name, int numVars, double *x) override;
//@}
/**
@@ -112,7 +112,7 @@ public:
protected:
vtkOpenGLProperty();
- ~vtkOpenGLProperty() VTK_OVERRIDE;
+ ~vtkOpenGLProperty() override;
/**
* Method called in vtkOpenGLProperty::Render() to render shaders and/or
diff --git a/Rendering/OpenGL/vtkOpenGLRenderWindow.h b/Rendering/OpenGL/vtkOpenGLRenderWindow.h
index da67df40ad58f4d12d4224593e396be630cf556f..9e94b81b763f6b9d184c2a9ced6b7eb95196a2f4 100644
--- a/Rendering/OpenGL/vtkOpenGLRenderWindow.h
+++ b/Rendering/OpenGL/vtkOpenGLRenderWindow.h
@@ -39,7 +39,7 @@ class VTKRENDERINGOPENGL_EXPORT vtkOpenGLRenderWindow : public vtkRenderWindow
{
public:
vtkTypeMacro(vtkOpenGLRenderWindow, vtkRenderWindow);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -52,21 +52,21 @@ public:
/**
* What rendering backend has the user requested
*/
- const char *GetRenderingBackend() VTK_OVERRIDE;
+ const char *GetRenderingBackend() override;
//@{
/**
* Set/Get the pixel data of an image, transmitted as RGBRGB...
*/
unsigned char *GetPixelData(int x,int y,int x2,int y2,int front,int right=0)
- VTK_OVERRIDE;
+ override;
int GetPixelData(int x,int y,int x2,int y2, int front,
- vtkUnsignedCharArray *data, int right=0) VTK_OVERRIDE;
+ vtkUnsignedCharArray *data, int right=0) override;
int SetPixelData(int x,int y,int x2,int y2,unsigned char *data,
- int front, int right=0) VTK_OVERRIDE;
+ int front, int right=0) override;
int SetPixelData(int x,int y,int x2,int y2,
vtkUnsignedCharArray *data, int front, int right=0)
- VTK_OVERRIDE;
+ override;
//@}
//@{
@@ -74,37 +74,37 @@ public:
* Set/Get the pixel data of an image, transmitted as RGBARGBA...
*/
float *GetRGBAPixelData(int x,int y,int x2,int y2,int front,int right=0)
- VTK_OVERRIDE;
+ override;
int GetRGBAPixelData(int x,int y,int x2,int y2, int front,
- vtkFloatArray* data, int right=0) VTK_OVERRIDE;
+ vtkFloatArray* data, int right=0) override;
int SetRGBAPixelData(int x,int y,int x2,int y2, float *data,
- int front, int blend=0, int right=0) VTK_OVERRIDE;
+ int front, int blend=0, int right=0) override;
int SetRGBAPixelData(int x,int y,int x2,int y2, vtkFloatArray *data,
- int front, int blend=0,int right=0) VTK_OVERRIDE;
- void ReleaseRGBAPixelData(float *data) VTK_OVERRIDE;
+ int front, int blend=0,int right=0) override;
+ void ReleaseRGBAPixelData(float *data) override;
unsigned char *GetRGBACharPixelData(int x,int y,int x2,int y2,
- int front, int right=0) VTK_OVERRIDE;
+ int front, int right=0) override;
int GetRGBACharPixelData(int x,int y,int x2,int y2, int front,
- vtkUnsignedCharArray *data,int right=0) VTK_OVERRIDE;
+ vtkUnsignedCharArray *data,int right=0) override;
int SetRGBACharPixelData(int x, int y, int x2, int y2,
unsigned char *data, int front,
- int blend=0,int right=0) VTK_OVERRIDE;
+ int blend=0,int right=0) override;
int SetRGBACharPixelData(int x,int y,int x2,int y2,
vtkUnsignedCharArray *data, int front,
- int blend=0, int right=0) VTK_OVERRIDE;
+ int blend=0, int right=0) override;
//@}
//@{
/**
* Set/Get the zbuffer data from an image
*/
- float *GetZbufferData( int x1, int y1, int x2, int y2 ) VTK_OVERRIDE;
- int GetZbufferData( int x1, int y1, int x2, int y2, float* z ) VTK_OVERRIDE;
+ float *GetZbufferData( int x1, int y1, int x2, int y2 ) override;
+ int GetZbufferData( int x1, int y1, int x2, int y2, float* z ) override;
int GetZbufferData( int x1, int y1, int x2, int y2,
- vtkFloatArray* z ) VTK_OVERRIDE;
- int SetZbufferData( int x1, int y1, int x2, int y2, float *buffer ) VTK_OVERRIDE;
+ vtkFloatArray* z ) override;
+ int SetZbufferData( int x1, int y1, int x2, int y2, float *buffer ) override;
int SetZbufferData( int x1, int y1, int x2, int y2,
- vtkFloatArray *buffer ) VTK_OVERRIDE;
+ vtkFloatArray *buffer ) override;
//@}
/**
@@ -115,20 +115,20 @@ public:
/**
* Get the size of the depth buffer.
*/
- int GetDepthBufferSize() VTK_OVERRIDE;
+ int GetDepthBufferSize() override;
/**
* Get the size of the color buffer.
* Returns 0 if not able to determine otherwise sets R G B and A into buffer.
*/
- int GetColorBufferSizes(int *rgba) VTK_OVERRIDE;
+ int GetColorBufferSizes(int *rgba) override;
//@{
/**
* Set the size of the window in screen coordinates in pixels.
*/
- void SetSize(int a[2]) VTK_OVERRIDE;
- void SetSize(int,int) VTK_OVERRIDE;
+ void SetSize(int a[2]) override;
+ void SetSize(int,int) override;
//@}
/**
@@ -223,7 +223,7 @@ public:
* Block the thread until the actual rendering is finished().
* Useful for measurement only.
*/
- void WaitForCompletion() VTK_OVERRIDE;
+ void WaitForCompletion() override;
//@{
/**
@@ -234,13 +234,13 @@ public:
* Note: This function requires that the device supports OpenGL framebuffer extension.
* The function has no effect if OffScreenRendering is ON.
*/
- int SetUseOffScreenBuffers(bool offScreen) VTK_OVERRIDE;
- bool GetUseOffScreenBuffers() VTK_OVERRIDE;
+ int SetUseOffScreenBuffers(bool offScreen) override;
+ bool GetUseOffScreenBuffers() override;
//@}
protected:
vtkOpenGLRenderWindow();
- ~vtkOpenGLRenderWindow() VTK_OVERRIDE;
+ ~vtkOpenGLRenderWindow() override;
long OldMonitorSetting;
vtkIdList *TextureResourceIds;
diff --git a/Rendering/OpenGL/vtkOpenGLRenderer.h b/Rendering/OpenGL/vtkOpenGLRenderer.h
index 392a311a165e1060bc0ba0429de8eb1d71cb3f22..12d65dbe204006b1737689c8c014b9fc3ed62846 100644
--- a/Rendering/OpenGL/vtkOpenGLRenderer.h
+++ b/Rendering/OpenGL/vtkOpenGLRenderer.h
@@ -35,17 +35,17 @@ class VTKRENDERINGOPENGL_EXPORT vtkOpenGLRenderer : public vtkRenderer
public:
static vtkOpenGLRenderer *New();
vtkTypeMacro(vtkOpenGLRenderer, vtkRenderer);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Concrete open gl render method.
*/
- void DeviceRender(void) VTK_OVERRIDE;
+ void DeviceRender(void) override;
/**
* Overridden to support hidden line removal.
*/
- void DeviceRenderOpaqueGeometry() VTK_OVERRIDE;
+ void DeviceRenderOpaqueGeometry() override;
/**
* Render translucent polygonal geometry. Default implementation just call
@@ -53,20 +53,20 @@ public:
* Subclasses of vtkRenderer that can deal with depth peeling must
* override this method.
*/
- void DeviceRenderTranslucentPolygonalGeometry() VTK_OVERRIDE;
+ void DeviceRenderTranslucentPolygonalGeometry() override;
/**
* Internal method temporarily removes lights before reloading them
* into graphics pipeline.
*/
- void ClearLights(void) VTK_OVERRIDE;
+ void ClearLights(void) override;
- void Clear(void) VTK_OVERRIDE;
+ void Clear(void) override;
/**
* Ask lights to load themselves into graphics pipeline.
*/
- int UpdateLights(void) VTK_OVERRIDE;
+ int UpdateLights(void) override;
/**
* Is rendering at translucent geometry stage using depth peeling and
@@ -86,7 +86,7 @@ public:
protected:
vtkOpenGLRenderer();
- ~vtkOpenGLRenderer() VTK_OVERRIDE;
+ ~vtkOpenGLRenderer() override;
/**
* Check the compilation status of some fragment shader source.
@@ -94,17 +94,17 @@ protected:
void CheckCompilation(unsigned int fragmentShader);
// Internal method to release graphics resources in any derived renderers.
- void ReleaseGraphicsResources(vtkWindow *w) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *w) override;
// Picking functions to be implemented by sub-classes
- void DevicePickRender() VTK_OVERRIDE;
- void StartPick(unsigned int pickFromSize) VTK_OVERRIDE;
- void UpdatePickId() VTK_OVERRIDE;
- void DonePick() VTK_OVERRIDE;
- unsigned int GetPickedId() VTK_OVERRIDE;
- unsigned int GetNumPickedIds() VTK_OVERRIDE;
- int GetPickedIds(unsigned int atMost, unsigned int *callerBuffer) VTK_OVERRIDE;
- double GetPickedZ() VTK_OVERRIDE;
+ void DevicePickRender() override;
+ void StartPick(unsigned int pickFromSize) override;
+ void UpdatePickId() override;
+ void DonePick() override;
+ unsigned int GetPickedId() override;
+ unsigned int GetNumPickedIds() override;
+ int GetPickedIds(unsigned int atMost, unsigned int *callerBuffer) override;
+ double GetPickedZ() override;
// Ivars used in picking
class vtkGLPickInfo* PickInfo;
diff --git a/Rendering/OpenGL/vtkOpenGLRepresentationPainter.h b/Rendering/OpenGL/vtkOpenGLRepresentationPainter.h
index 723abfc56cdeda6d739d8633541f5e25ccca77f9..8fd5d2a98e4316c623df08732421d06918502d09 100644
--- a/Rendering/OpenGL/vtkOpenGLRepresentationPainter.h
+++ b/Rendering/OpenGL/vtkOpenGLRepresentationPainter.h
@@ -34,7 +34,7 @@ class VTKRENDERINGOPENGL_EXPORT vtkOpenGLRepresentationPainter :
public:
static vtkOpenGLRepresentationPainter* New();
vtkTypeMacro(vtkOpenGLRepresentationPainter, vtkRepresentationPainter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* This painter overrides GetTimeToDraw() to never pass the request to the
@@ -43,20 +43,20 @@ public:
* responsibility is borne by the painter causing the multiple rendering
* requests i.e. this painter itself.
*/
- double GetTimeToDraw() VTK_OVERRIDE
+ double GetTimeToDraw() override
{
return this->TimeToDraw;
}
protected:
vtkOpenGLRepresentationPainter();
- ~vtkOpenGLRepresentationPainter() VTK_OVERRIDE;
+ ~vtkOpenGLRepresentationPainter() override;
/**
* Changes the polygon mode according to the representation.
*/
void RenderInternal(vtkRenderer* renderer, vtkActor* actor,
- unsigned long typeflags,bool forceCompileOnly) VTK_OVERRIDE;
+ unsigned long typeflags,bool forceCompileOnly) override;
private:
vtkOpenGLRepresentationPainter(const vtkOpenGLRepresentationPainter&) VTK_DELETE_FUNCTION;
diff --git a/Rendering/OpenGL/vtkOpenGLScalarsToColorsPainter.h b/Rendering/OpenGL/vtkOpenGLScalarsToColorsPainter.h
index 506107b378f2a4b857fe166b25a4ead4eda70a1b..94a201c5977a186f27798cfec43ab3cc1a8d4603 100644
--- a/Rendering/OpenGL/vtkOpenGLScalarsToColorsPainter.h
+++ b/Rendering/OpenGL/vtkOpenGLScalarsToColorsPainter.h
@@ -36,25 +36,25 @@ public:
static vtkOpenGLScalarsToColorsPainter* New();
vtkTypeMacro(vtkOpenGLScalarsToColorsPainter,
vtkScalarsToColorsPainter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Release any graphics resources that are being consumed by this mapper.
* The parameter window could be used to determine which graphic
* resources to release.
*/
- void ReleaseGraphicsResources(vtkWindow *) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *) override;
- int GetPremultiplyColorsWithAlpha(vtkActor* actor) VTK_OVERRIDE;
+ int GetPremultiplyColorsWithAlpha(vtkActor* actor) override;
/**
* Return the texture size limit, i.e. GL_MAX_TEXTURE_SIZE.
*/
- vtkIdType GetTextureSizeLimit() VTK_OVERRIDE;
+ vtkIdType GetTextureSizeLimit() override;
protected:
vtkOpenGLScalarsToColorsPainter();
- ~vtkOpenGLScalarsToColorsPainter() VTK_OVERRIDE;
+ ~vtkOpenGLScalarsToColorsPainter() override;
vtkOpenGLTexture* InternalColorTexture;
int AlphaBitPlanes;
@@ -68,7 +68,7 @@ protected:
* the call to Deletegate Painter, in any.
*/
void RenderInternal(vtkRenderer* renderer, vtkActor* actor,
- unsigned long typeflags, bool forceCompileOnly) VTK_OVERRIDE;
+ unsigned long typeflags, bool forceCompileOnly) override;
private:
vtkOpenGLScalarsToColorsPainter(const vtkOpenGLScalarsToColorsPainter&) VTK_DELETE_FUNCTION;
diff --git a/Rendering/OpenGL/vtkOpenGLTexture.h b/Rendering/OpenGL/vtkOpenGLTexture.h
index a928c4010ed0eaa72cf2c18a1d7fd5d1da8cdfe0..6473c35832d0e7ed2004199d3bedd1a10954aa8b 100644
--- a/Rendering/OpenGL/vtkOpenGLTexture.h
+++ b/Rendering/OpenGL/vtkOpenGLTexture.h
@@ -38,16 +38,16 @@ class VTKRENDERINGOPENGL_EXPORT vtkOpenGLTexture : public vtkTexture
public:
static vtkOpenGLTexture *New();
vtkTypeMacro(vtkOpenGLTexture, vtkTexture);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Implement base class method.
*/
- void Load(vtkRenderer*) VTK_OVERRIDE;
+ void Load(vtkRenderer*) override;
// Descsription:
// Clean up after the rendering is complete.
- void PostRender(vtkRenderer*) VTK_OVERRIDE;
+ void PostRender(vtkRenderer*) override;
/**
* Release any graphics resources that are being consumed by this texture.
@@ -55,7 +55,7 @@ public:
* resources to release. Using the same texture object in multiple
* render windows is NOT currently supported.
*/
- void ReleaseGraphicsResources(vtkWindow*) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow*) override;
//@{
/**
@@ -68,7 +68,7 @@ public:
protected:
vtkOpenGLTexture();
- ~vtkOpenGLTexture() VTK_OVERRIDE;
+ ~vtkOpenGLTexture() override;
unsigned char *ResampleToPowerOfTwo(int &xsize, int &ysize,
unsigned char *dptr, int bpp);
diff --git a/Rendering/OpenGL/vtkOverlayPass.h b/Rendering/OpenGL/vtkOverlayPass.h
index 65f27639917bbced558b14dcb39250f34f11211f..57af504f1bab19e984e640c16277a5a33778d6a8 100644
--- a/Rendering/OpenGL/vtkOverlayPass.h
+++ b/Rendering/OpenGL/vtkOverlayPass.h
@@ -39,13 +39,13 @@ class VTKRENDERINGOPENGL_EXPORT vtkOverlayPass : public vtkDefaultPass
public:
static vtkOverlayPass *New();
vtkTypeMacro(vtkOverlayPass,vtkDefaultPass);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Perform rendering according to a render state \p s.
* \pre s_exists: s!=0
*/
- void Render(const vtkRenderState *s) VTK_OVERRIDE;
+ void Render(const vtkRenderState *s) override;
protected:
/**
@@ -56,7 +56,7 @@ public:
/**
* Destructor.
*/
- ~vtkOverlayPass() VTK_OVERRIDE;
+ ~vtkOverlayPass() override;
private:
vtkOverlayPass(const vtkOverlayPass&) VTK_DELETE_FUNCTION;
diff --git a/Rendering/OpenGL/vtkPainter.cxx b/Rendering/OpenGL/vtkPainter.cxx
index a359cf0e14f62f0a49d227a86124f9aabf27c8da..00f55cd12574214cddfd2ff627653715436e65fa 100644
--- a/Rendering/OpenGL/vtkPainter.cxx
+++ b/Rendering/OpenGL/vtkPainter.cxx
@@ -50,7 +50,7 @@ public:
{ return new vtkPainterObserver; }
void Execute(vtkObject *caller,
- unsigned long event, void* vtkNotUsed(v)) VTK_OVERRIDE
+ unsigned long event, void* vtkNotUsed(v)) override
{
vtkPainter* delegate = vtkPainter::SafeDownCast(caller);
if (delegate && event == vtkCommand::ProgressEvent && this->Self)
diff --git a/Rendering/OpenGL/vtkPainter.h b/Rendering/OpenGL/vtkPainter.h
index 671d301e2707035d21a8770027b07af494f2ff88..5285e6c0c9be971a29ef2a390e7ae8bdb9a49546 100644
--- a/Rendering/OpenGL/vtkPainter.h
+++ b/Rendering/OpenGL/vtkPainter.h
@@ -62,7 +62,7 @@ class VTKRENDERINGOPENGL_EXPORT vtkPainter : public vtkObject
{
public:
vtkTypeMacro(vtkPainter, vtkObject);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
/**
* Keys used to specify control the behaviour of the painter.
@@ -107,8 +107,8 @@ public:
/**
* Take part in garbage collection.
*/
- void Register(vtkObjectBase *o) VTK_OVERRIDE;
- void UnRegister(vtkObjectBase *o) VTK_OVERRIDE;
+ void Register(vtkObjectBase *o) override;
+ void UnRegister(vtkObjectBase *o) override;
//@}
enum {
@@ -176,12 +176,12 @@ public:
protected:
vtkPainter();
- ~vtkPainter() VTK_OVERRIDE;
+ ~vtkPainter() override;
/**
* Take part in garbage collection.
*/
- void ReportReferences(vtkGarbageCollector *collector) VTK_OVERRIDE;
+ void ReportReferences(vtkGarbageCollector *collector) override;
/**
* Updates the delegate painter. This method is called just before
diff --git a/Rendering/OpenGL/vtkPainterPolyDataMapper.cxx b/Rendering/OpenGL/vtkPainterPolyDataMapper.cxx
index 1cfa4c08ff87067a6919fcbabb02e343c5e55239..0e892c30448c3f91b17f8af1e5a561100245e551 100644
--- a/Rendering/OpenGL/vtkPainterPolyDataMapper.cxx
+++ b/Rendering/OpenGL/vtkPainterPolyDataMapper.cxx
@@ -45,7 +45,7 @@ public:
static vtkPainterPolyDataMapperObserver* New()
{ return new vtkPainterPolyDataMapperObserver; }
- void Execute(vtkObject* caller, unsigned long event, void*) VTK_OVERRIDE
+ void Execute(vtkObject* caller, unsigned long event, void*) override
{
vtkPainter* p = vtkPainter::SafeDownCast(caller);
if (this->Target && p && event == vtkCommand::ProgressEvent)
diff --git a/Rendering/OpenGL/vtkPainterPolyDataMapper.h b/Rendering/OpenGL/vtkPainterPolyDataMapper.h
index b32e62ddd4c9f75833a4a68cdd4d7cff7c909647..ee4d299ffc62a92a49e17af72bce5cfe5f85aa63 100644
--- a/Rendering/OpenGL/vtkPainterPolyDataMapper.h
+++ b/Rendering/OpenGL/vtkPainterPolyDataMapper.h
@@ -36,12 +36,12 @@ class VTKRENDERINGOPENGL_EXPORT vtkPainterPolyDataMapper : public vtkPolyDataMap
public:
static vtkPainterPolyDataMapper* New();
vtkTypeMacro(vtkPainterPolyDataMapper, vtkPolyDataMapper);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Implemented by sub classes. Actual rendering is done here.
*/
- void RenderPiece(vtkRenderer *ren, vtkActor *act) VTK_OVERRIDE;
+ void RenderPiece(vtkRenderer *ren, vtkActor *act) override;
//@{
/**
@@ -59,7 +59,7 @@ public:
* The parameter window could be used to determine which graphic
* resources to release. Merely propagates the call to the painter.
*/
- void ReleaseGraphicsResources(vtkWindow *) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *) override;
/**
* Select a data array from the point/cell data
@@ -74,21 +74,21 @@ public:
*/
void MapDataArrayToVertexAttribute(
const char* vertexAttributeName,
- const char* dataArrayName, int fieldAssociation, int componentno=-1) VTK_OVERRIDE;
+ const char* dataArrayName, int fieldAssociation, int componentno=-1) override;
void MapDataArrayToMultiTextureAttribute(
int unit,
- const char* dataArrayName, int fieldAssociation, int componentno=-1) VTK_OVERRIDE;
+ const char* dataArrayName, int fieldAssociation, int componentno=-1) override;
/**
* Remove a vertex attribute mapping.
*/
- void RemoveVertexAttributeMapping(const char* vertexAttributeName) VTK_OVERRIDE;
+ void RemoveVertexAttributeMapping(const char* vertexAttributeName) override;
/**
* Remove all vertex attributes.
*/
- void RemoveAllVertexAttributeMappings() VTK_OVERRIDE;
+ void RemoveAllVertexAttributeMappings() override;
//@{
/**
@@ -104,7 +104,7 @@ public:
* Used by vtkHardwareSelector to determine if the prop supports hardware
* selection.
*/
- bool GetSupportsSelection() VTK_OVERRIDE
+ bool GetSupportsSelection() override
{ return (this->SelectionPainter != 0); }
/**
@@ -117,18 +117,18 @@ public:
* Overridden to use the actual data and ScalarMode to determine if we have
* opaque geometry.
*/
- bool GetIsOpaque() VTK_OVERRIDE;
+ bool GetIsOpaque() override;
protected:
vtkPainterPolyDataMapper();
- ~vtkPainterPolyDataMapper() VTK_OVERRIDE;
+ ~vtkPainterPolyDataMapper() override;
/**
* Called in GetBounds(). When this method is called, the consider the input
* to be updated depending on whether this->Static is set or not. This method
* simply obtains the bounds from the data-object and returns it.
*/
- void ComputeBounds() VTK_OVERRIDE;
+ void ComputeBounds() override;
/**
* Called when the PainterInformation becomes obsolete.
@@ -139,7 +139,7 @@ protected:
/**
* Take part in garbage collection.
*/
- void ReportReferences(vtkGarbageCollector *collector) VTK_OVERRIDE;
+ void ReportReferences(vtkGarbageCollector *collector) override;
vtkInformation* PainterInformation;
vtkTimeStamp PainterUpdateTime;
diff --git a/Rendering/OpenGL/vtkPixelBufferObject.h b/Rendering/OpenGL/vtkPixelBufferObject.h
index 5b8bffb33ad366e4aaeb6598e9bb23aa2d6609e5..b1ebd58edf8d784d44ffc1e819717127bee46b78 100644
--- a/Rendering/OpenGL/vtkPixelBufferObject.h
+++ b/Rendering/OpenGL/vtkPixelBufferObject.h
@@ -61,7 +61,7 @@ public:
static vtkPixelBufferObject* New();
vtkTypeMacro(vtkPixelBufferObject, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -355,7 +355,7 @@ public:
protected:
vtkPixelBufferObject();
- ~vtkPixelBufferObject() VTK_OVERRIDE;
+ ~vtkPixelBufferObject() override;
/**
* Loads all required OpenGL extensions. Must be called every time a new
diff --git a/Rendering/OpenGL/vtkPointsPainter.h b/Rendering/OpenGL/vtkPointsPainter.h
index fd6e16146a844d78b589208ca232c5583526fd06..b2c9fadfa600f973471d5d28ff2d1fd51551db17 100644
--- a/Rendering/OpenGL/vtkPointsPainter.h
+++ b/Rendering/OpenGL/vtkPointsPainter.h
@@ -35,18 +35,18 @@ class VTKRENDERINGOPENGL_EXPORT vtkPointsPainter : public vtkPrimitivePainter
public:
static vtkPointsPainter* New();
vtkTypeMacro(vtkPointsPainter, vtkPrimitivePainter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkPointsPainter();
- ~vtkPointsPainter() VTK_OVERRIDE;
+ ~vtkPointsPainter() override;
/**
* The actual rendering happens here. This method is called only when
* SupportedPrimitive is present in typeflags when Render() is invoked.
*/
int RenderPrimitive(unsigned long flags, vtkDataArray* n,
- vtkUnsignedCharArray* c, vtkDataArray* t, vtkRenderer* ren) VTK_OVERRIDE;
+ vtkUnsignedCharArray* c, vtkDataArray* t, vtkRenderer* ren) override;
private:
vtkPointsPainter(const vtkPointsPainter&) VTK_DELETE_FUNCTION;
diff --git a/Rendering/OpenGL/vtkPolyDataPainter.h b/Rendering/OpenGL/vtkPolyDataPainter.h
index 8806ab9f4f941afc0bfff10d26e9247fd20b1d86..09f1884c1792fb4ebe28fc445bdf5f6e9658419e 100644
--- a/Rendering/OpenGL/vtkPolyDataPainter.h
+++ b/Rendering/OpenGL/vtkPolyDataPainter.h
@@ -55,7 +55,7 @@ class VTKRENDERINGOPENGL_EXPORT vtkPolyDataPainter : public vtkPainter
{
public:
vtkTypeMacro(vtkPolyDataPainter, vtkPainter);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
/**
* Get/set the poly data to render.
@@ -94,11 +94,11 @@ public:
* since PolyDataPainter cannot paint without any polydata input.
*/
void Render(vtkRenderer* renderer, vtkActor* actor,
- unsigned long typeflags, bool forceCompileOnly) VTK_OVERRIDE;
+ unsigned long typeflags, bool forceCompileOnly) override;
protected:
vtkPolyDataPainter();
- ~vtkPolyDataPainter() VTK_OVERRIDE;
+ ~vtkPolyDataPainter() override;
int BuildNormals; // ivar synchornized with this->Information before
// RenderInternal() is called. The ivar are purposefully protected,
@@ -110,7 +110,7 @@ protected:
* Called before RenderInternal() if the Information has been changed
* since the last time this method was called.
*/
- void ProcessInformation(vtkInformation*) VTK_OVERRIDE;
+ void ProcessInformation(vtkInformation*) override;
private:
vtkPolyDataPainter(const vtkPolyDataPainter &) VTK_DELETE_FUNCTION;
diff --git a/Rendering/OpenGL/vtkPolygonsPainter.h b/Rendering/OpenGL/vtkPolygonsPainter.h
index eb7573dd3a26fc79a7c26a0aac59cc4bb52a73d2..282807e5087e7bf2e6abaaf54e7893727dd68257 100644
--- a/Rendering/OpenGL/vtkPolygonsPainter.h
+++ b/Rendering/OpenGL/vtkPolygonsPainter.h
@@ -31,18 +31,18 @@ class VTKRENDERINGOPENGL_EXPORT vtkPolygonsPainter : public vtkPrimitivePainter
public:
static vtkPolygonsPainter* New();
vtkTypeMacro(vtkPolygonsPainter, vtkPrimitivePainter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkPolygonsPainter();
- ~vtkPolygonsPainter() VTK_OVERRIDE;
+ ~vtkPolygonsPainter() override;
/**
* The actual rendering happens here. This method is called only when
* SupportedPrimitive is present in typeflags when Render() is invoked.
*/
int RenderPrimitive(unsigned long flags, vtkDataArray* n,
- vtkUnsignedCharArray* c, vtkDataArray* t, vtkRenderer* ren) VTK_OVERRIDE;
+ vtkUnsignedCharArray* c, vtkDataArray* t, vtkRenderer* ren) override;
private:
vtkPolygonsPainter(const vtkPolygonsPainter&) VTK_DELETE_FUNCTION;
diff --git a/Rendering/OpenGL/vtkPrimitivePainter.h b/Rendering/OpenGL/vtkPrimitivePainter.h
index c7558b1cf73d9e11f343e566702c4eebfdb390a2..8aa38f18e28147810b6e7ca49d3e2d685e78ec4a 100644
--- a/Rendering/OpenGL/vtkPrimitivePainter.h
+++ b/Rendering/OpenGL/vtkPrimitivePainter.h
@@ -40,7 +40,7 @@ class VTKRENDERINGOPENGL_EXPORT vtkPrimitivePainter : public vtkPolyDataPainter
{
public:
vtkTypeMacro(vtkPrimitivePainter, vtkPolyDataPainter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -52,7 +52,7 @@ public:
protected:
vtkPrimitivePainter();
- ~vtkPrimitivePainter() VTK_OVERRIDE;
+ ~vtkPrimitivePainter() override;
enum {
VTK_PDM_NORMALS = 0x001,
@@ -75,18 +75,18 @@ protected:
* This method is overridden to update the output data
* as per the input.
*/
- void PrepareForRendering(vtkRenderer*, vtkActor*) VTK_OVERRIDE;
+ void PrepareForRendering(vtkRenderer*, vtkActor*) override;
/**
* Called before RenderInternal() if the Information has been changed
* since the last time this method was called.
*/
- void ProcessInformation(vtkInformation*) VTK_OVERRIDE;
+ void ProcessInformation(vtkInformation*) override;
/**
* Subclasses need to override this to return the output of the pipeline.
*/
- vtkDataObject* GetOutput() VTK_OVERRIDE;
+ vtkDataObject* GetOutput() override;
/**
* The actual rendering happens here. This method is called only when
@@ -111,12 +111,12 @@ protected:
*/
void RenderInternal(vtkRenderer* renderer, vtkActor* actor,
unsigned long typeflags,
- bool forceCompileOnly) VTK_OVERRIDE;
+ bool forceCompileOnly) override;
/**
* Take part in garbage collection.
*/
- void ReportReferences(vtkGarbageCollector *collector) VTK_OVERRIDE;
+ void ReportReferences(vtkGarbageCollector *collector) override;
int SupportedPrimitive; // must be set by subclasses.
vtkSetMacro(SupportedPrimitive, int);
diff --git a/Rendering/OpenGL/vtkRenderPassCollection.h b/Rendering/OpenGL/vtkRenderPassCollection.h
index 95952068f33eea5345a263918f13e02db950c31f..d7d91931fe9d5c08021c30f880c6e601eef31cdd 100644
--- a/Rendering/OpenGL/vtkRenderPassCollection.h
+++ b/Rendering/OpenGL/vtkRenderPassCollection.h
@@ -37,7 +37,7 @@ class VTKRENDERINGOPENGL_EXPORT vtkRenderPassCollection : public vtkCollection
public:
static vtkRenderPassCollection *New();
vtkTypeMacro(vtkRenderPassCollection,vtkCollection);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Add an RenderPass to the bottom of the list.
@@ -62,7 +62,7 @@ class VTKRENDERINGOPENGL_EXPORT vtkRenderPassCollection : public vtkCollection
protected:
vtkRenderPassCollection();
- ~vtkRenderPassCollection() VTK_OVERRIDE;
+ ~vtkRenderPassCollection() override;
private:
// hide the standard AddItem from the user and the compiler.
diff --git a/Rendering/OpenGL/vtkRenderStepsPass.h b/Rendering/OpenGL/vtkRenderStepsPass.h
index e328da98e4cc39635a87b6912a040e3b2b000af1..165b21c75e83a71e42c4b7cf90f12353b9ad4a3d 100644
--- a/Rendering/OpenGL/vtkRenderStepsPass.h
+++ b/Rendering/OpenGL/vtkRenderStepsPass.h
@@ -44,20 +44,20 @@ class VTKRENDERINGOPENGL_EXPORT vtkRenderStepsPass : public vtkRenderPass
public:
static vtkRenderStepsPass *New();
vtkTypeMacro(vtkRenderStepsPass,vtkRenderPass);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Perform rendering according to a render state \p s.
* \pre s_exists: s!=0
*/
- void Render(const vtkRenderState *s) VTK_OVERRIDE;
+ void Render(const vtkRenderState *s) override;
/**
* Release graphics resources and ask components to release their own
* resources.
* \pre w_exists: w!=0
*/
- void ReleaseGraphicsResources(vtkWindow *w) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *w) override;
//@{
/**
@@ -117,7 +117,7 @@ public:
protected:
vtkRenderStepsPass();
- ~vtkRenderStepsPass() VTK_OVERRIDE;
+ ~vtkRenderStepsPass() override;
vtkCameraPass *CameraPass;
vtkRenderPass *LightsPass;
diff --git a/Rendering/OpenGL/vtkRenderbuffer.h b/Rendering/OpenGL/vtkRenderbuffer.h
index 3362fe3fbb72149e20067cec17cf9607f43027db..7a9af1efbc11e36b86b5de7031f084c0191d5f1b 100644
--- a/Rendering/OpenGL/vtkRenderbuffer.h
+++ b/Rendering/OpenGL/vtkRenderbuffer.h
@@ -34,7 +34,7 @@ class VTKRENDERINGOPENGL_EXPORT vtkRenderbuffer : public vtkObject
public:
static vtkRenderbuffer* New();
vtkTypeMacro(vtkRenderbuffer, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Returns if the context supports the required extensions.
@@ -88,7 +88,7 @@ public:
protected:
vtkRenderbuffer();
- ~vtkRenderbuffer() VTK_OVERRIDE;
+ ~vtkRenderbuffer() override;
bool LoadRequiredExtensions(vtkRenderWindow *renWin);
void Alloc();
diff --git a/Rendering/OpenGL/vtkRepresentationPainter.h b/Rendering/OpenGL/vtkRepresentationPainter.h
index 0f216e98052bb64ebf92a2073e548d561955c46f..52a3b790ffa87d388ddc0c6e7c99130836b63e01 100644
--- a/Rendering/OpenGL/vtkRepresentationPainter.h
+++ b/Rendering/OpenGL/vtkRepresentationPainter.h
@@ -32,11 +32,11 @@ class VTKRENDERINGOPENGL_EXPORT vtkRepresentationPainter : public vtkPolyDataPai
public:
static vtkRepresentationPainter* New();
vtkTypeMacro(vtkRepresentationPainter, vtkPolyDataPainter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkRepresentationPainter();
- ~vtkRepresentationPainter() VTK_OVERRIDE;
+ ~vtkRepresentationPainter() override;
private:
vtkRepresentationPainter(const vtkRepresentationPainter&) VTK_DELETE_FUNCTION;
diff --git a/Rendering/OpenGL/vtkScalarsToColorsPainter.h b/Rendering/OpenGL/vtkScalarsToColorsPainter.h
index e78c9d975e6279d7d1bbf303ca780fb590517419..0dfe8118570a68f4535de3ac7b7c7475d91da778 100644
--- a/Rendering/OpenGL/vtkScalarsToColorsPainter.h
+++ b/Rendering/OpenGL/vtkScalarsToColorsPainter.h
@@ -42,7 +42,7 @@ class VTKRENDERINGOPENGL_EXPORT vtkScalarsToColorsPainter : public vtkPainter
public:
static vtkScalarsToColorsPainter* New();
vtkTypeMacro(vtkScalarsToColorsPainter, vtkPainter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Control whether the mapper sets the lookuptable range based on its
@@ -132,7 +132,7 @@ public:
/**
* Subclasses need to override this to return the output of the pipeline.
*/
- vtkDataObject *GetOutput() VTK_OVERRIDE;
+ vtkDataObject *GetOutput() override;
/**
* Return the texture size limit. Subclasses need to override this
@@ -143,7 +143,7 @@ public:
protected:
vtkScalarsToColorsPainter();
- ~vtkScalarsToColorsPainter() VTK_OVERRIDE;
+ ~vtkScalarsToColorsPainter() override;
/**
* Create a new shallow-copied clone for data with no scalars.
@@ -161,7 +161,7 @@ protected:
/**
* Called just before RenderInternal(). We build the Color array here.
*/
- void PrepareForRendering(vtkRenderer* renderer, vtkActor* actor) VTK_OVERRIDE;
+ void PrepareForRendering(vtkRenderer* renderer, vtkActor* actor) override;
/**
* Generates the colors, if needed.
@@ -176,12 +176,12 @@ protected:
* Called before RenderInternal() if the Information has been changed
* since the last time this method was called.
*/
- void ProcessInformation(vtkInformation*) VTK_OVERRIDE;
+ void ProcessInformation(vtkInformation*) override;
/**
* Take part in garbage collection.
*/
- void ReportReferences(vtkGarbageCollector *collector) VTK_OVERRIDE;
+ void ReportReferences(vtkGarbageCollector *collector) override;
/**
* Returns if we can use texture maps for scalar coloring. Note this doesn't
diff --git a/Rendering/OpenGL/vtkSequencePass.h b/Rendering/OpenGL/vtkSequencePass.h
index 1d906e4c45928d8c5b4433379ed9a34973fd4e37..d2fe35709d8707dcf1b39c3c6daced168e4f4864 100644
--- a/Rendering/OpenGL/vtkSequencePass.h
+++ b/Rendering/OpenGL/vtkSequencePass.h
@@ -40,20 +40,20 @@ class VTKRENDERINGOPENGL_EXPORT vtkSequencePass : public vtkRenderPass
public:
static vtkSequencePass *New();
vtkTypeMacro(vtkSequencePass,vtkRenderPass);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Perform rendering according to a render state \p s.
* \pre s_exists: s!=0
*/
- void Render(const vtkRenderState *s) VTK_OVERRIDE;
+ void Render(const vtkRenderState *s) override;
/**
* Release graphics resources and ask components to release their own
* resources.
* \pre w_exists: w!=0
*/
- void ReleaseGraphicsResources(vtkWindow *w) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *w) override;
//@{
/**
@@ -70,7 +70,7 @@ protected:
vtkRenderPassCollection *Passes;
vtkSequencePass();
- ~vtkSequencePass() VTK_OVERRIDE;
+ ~vtkSequencePass() override;
private:
vtkSequencePass(const vtkSequencePass&) VTK_DELETE_FUNCTION;
diff --git a/Rendering/OpenGL/vtkShader2.h b/Rendering/OpenGL/vtkShader2.h
index 9b5dcc793762d6ad7b61db11594e4b0050074e96..f76edc337df83aa6dfd2c6c25ce81a09e006ac5c 100644
--- a/Rendering/OpenGL/vtkShader2.h
+++ b/Rendering/OpenGL/vtkShader2.h
@@ -61,7 +61,7 @@ class VTKRENDERINGOPENGL_EXPORT vtkShader2 : public vtkObject
public:
static vtkShader2 *New();
vtkTypeMacro(vtkShader2,vtkObject);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
/**
* Returns if the context supports the required extensions.
@@ -170,7 +170,7 @@ protected:
/**
* Destructor. Delete SourceCode and LastCompileLog if any.
*/
- ~vtkShader2() VTK_OVERRIDE;
+ ~vtkShader2() override;
/**
* Load the required OpenGL extensions.
diff --git a/Rendering/OpenGL/vtkShader2Collection.h b/Rendering/OpenGL/vtkShader2Collection.h
index e3ba74e6c3878871ae18aa2ec83c3f65bb2b00f4..7b6cd36cc8db039506f72775f1f3e3223b4c62fa 100644
--- a/Rendering/OpenGL/vtkShader2Collection.h
+++ b/Rendering/OpenGL/vtkShader2Collection.h
@@ -37,13 +37,13 @@ class VTKRENDERINGOPENGL_EXPORT vtkShader2Collection : public vtkCollection
public:
static vtkShader2Collection *New();
vtkTypeMacro(vtkShader2Collection,vtkCollection);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Modified GetMTime because the collection time depends on the
* content of the shaders.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
/**
* Add a shader to the bottom of the list.
@@ -120,7 +120,7 @@ class VTKRENDERINGOPENGL_EXPORT vtkShader2Collection : public vtkCollection
protected:
vtkShader2Collection();
- ~vtkShader2Collection() VTK_OVERRIDE;
+ ~vtkShader2Collection() override;
bool HasShadersOfType(int);
diff --git a/Rendering/OpenGL/vtkShaderProgram2.h b/Rendering/OpenGL/vtkShaderProgram2.h
index 9d6f146744f42951b28e3e24ce64489995541b5f..aee457563a09c5f6a1abe0f0d55df3d12a227824 100644
--- a/Rendering/OpenGL/vtkShaderProgram2.h
+++ b/Rendering/OpenGL/vtkShaderProgram2.h
@@ -67,7 +67,7 @@ class VTKRENDERINGOPENGL_EXPORT vtkShaderProgram2 : public vtkObject
public:
static vtkShaderProgram2* New();
vtkTypeMacro(vtkShaderProgram2, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Returns if the context supports the required extensions.
@@ -419,7 +419,7 @@ public:
protected:
vtkShaderProgram2();
- ~vtkShaderProgram2() VTK_OVERRIDE;
+ ~vtkShaderProgram2() override;
/**
* Load the required OpenGL extensions.
diff --git a/Rendering/OpenGL/vtkShadowMapBakerPass.h b/Rendering/OpenGL/vtkShadowMapBakerPass.h
index c71685f221f22e8b77ce9c7525adfcde194c18bf..4ec5cf2155695f713fa7d695cab4123766a8d0af 100644
--- a/Rendering/OpenGL/vtkShadowMapBakerPass.h
+++ b/Rendering/OpenGL/vtkShadowMapBakerPass.h
@@ -59,7 +59,7 @@ class VTKRENDERINGOPENGL_EXPORT vtkShadowMapBakerPass : public vtkRenderPass
public:
static vtkShadowMapBakerPass *New();
vtkTypeMacro(vtkShadowMapBakerPass,vtkRenderPass);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* If this key exists on the PropertyKeys of a prop, the prop is viewed as a
@@ -77,14 +77,14 @@ public:
* Perform rendering according to a render state \p s.
* \pre s_exists: s!=0
*/
- void Render(const vtkRenderState *s) VTK_OVERRIDE;
+ void Render(const vtkRenderState *s) override;
/**
* Release graphics resources and ask components to release their own
* resources.
* \pre w_exists: w!=0
*/
- void ReleaseGraphicsResources(vtkWindow *w) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *w) override;
//@{
/**
@@ -213,7 +213,7 @@ public:
/**
* Destructor.
*/
- ~vtkShadowMapBakerPass() VTK_OVERRIDE;
+ ~vtkShadowMapBakerPass() override;
/**
* Helper method to compute the mNearest point in a given direction.
diff --git a/Rendering/OpenGL/vtkShadowMapPass.h b/Rendering/OpenGL/vtkShadowMapPass.h
index d87cef05b8e8a883edabfeabf884e74d09332e8f..c0d45d99c9e9bdb4ad560a3b5f42093ffdc2aca1 100644
--- a/Rendering/OpenGL/vtkShadowMapPass.h
+++ b/Rendering/OpenGL/vtkShadowMapPass.h
@@ -63,20 +63,20 @@ class VTKRENDERINGOPENGL_EXPORT vtkShadowMapPass : public vtkRenderPass
public:
static vtkShadowMapPass *New();
vtkTypeMacro(vtkShadowMapPass,vtkRenderPass);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Perform rendering according to a render state \p s.
* \pre s_exists: s!=0
*/
- void Render(const vtkRenderState *s) VTK_OVERRIDE;
+ void Render(const vtkRenderState *s) override;
/**
* Release graphics resources and ask components to release their own
* resources.
* \pre w_exists: w!=0
*/
- void ReleaseGraphicsResources(vtkWindow *w) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *w) override;
//@{
/**
@@ -112,7 +112,7 @@ public:
/**
* Destructor.
*/
- ~vtkShadowMapPass() VTK_OVERRIDE;
+ ~vtkShadowMapPass() override;
/**
* Build the intensity map.
diff --git a/Rendering/OpenGL/vtkSobelGradientMagnitudePass.h b/Rendering/OpenGL/vtkSobelGradientMagnitudePass.h
index 4874c06533aff83e08e3150a6b8000edcad80303..d4b64575513d81efa3e9ca7cfd0c2a99ccb6d11c 100644
--- a/Rendering/OpenGL/vtkSobelGradientMagnitudePass.h
+++ b/Rendering/OpenGL/vtkSobelGradientMagnitudePass.h
@@ -75,20 +75,20 @@ class VTKRENDERINGOPENGL_EXPORT vtkSobelGradientMagnitudePass : public vtkImageP
public:
static vtkSobelGradientMagnitudePass *New();
vtkTypeMacro(vtkSobelGradientMagnitudePass,vtkImageProcessingPass);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Perform rendering according to a render state \p s.
* \pre s_exists: s!=0
*/
- void Render(const vtkRenderState *s) VTK_OVERRIDE;
+ void Render(const vtkRenderState *s) override;
/**
* Release graphics resources and ask components to release their own
* resources.
* \pre w_exists: w!=0
*/
- void ReleaseGraphicsResources(vtkWindow *w) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *w) override;
protected:
/**
@@ -99,7 +99,7 @@ public:
/**
* Destructor.
*/
- ~vtkSobelGradientMagnitudePass() VTK_OVERRIDE;
+ ~vtkSobelGradientMagnitudePass() override;
/**
* Graphics resources.
diff --git a/Rendering/OpenGL/vtkStandardPolyDataPainter.h b/Rendering/OpenGL/vtkStandardPolyDataPainter.h
index e2feaebbfd13ced586cec59441bcc6d5744080af..75dbbe70131b0c8d4fb7a8208693a50951c22317 100644
--- a/Rendering/OpenGL/vtkStandardPolyDataPainter.h
+++ b/Rendering/OpenGL/vtkStandardPolyDataPainter.h
@@ -53,21 +53,21 @@ class VTKRENDERINGOPENGL_EXPORT vtkStandardPolyDataPainter : public vtkPolyDataP
{
public:
vtkTypeMacro(vtkStandardPolyDataPainter, vtkPolyDataPainter);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
static vtkStandardPolyDataPainter *New();
void AddMultiTextureCoordsArray(vtkDataArray * array);
protected:
vtkStandardPolyDataPainter();
- ~vtkStandardPolyDataPainter() VTK_OVERRIDE;
+ ~vtkStandardPolyDataPainter() override;
/**
* Generates rendering primitives of appropriate type(s). Multiple types
* of preimitives can be requested by or-ring the primitive flags.
*/
void RenderInternal(vtkRenderer* renderer, vtkActor* actor,
- unsigned long typeflags, bool forceCompileOnly) VTK_OVERRIDE;
+ unsigned long typeflags, bool forceCompileOnly) override;
void DrawCells(int mode, vtkCellArray *connectivity,
vtkIdType startCellId,
@@ -79,7 +79,7 @@ protected:
* Called before RenderInternal() if the Information has been changed
* since the last time this method was called.
*/
- void ProcessInformation(vtkInformation*) VTK_OVERRIDE;
+ void ProcessInformation(vtkInformation*) override;
void UpdateGenericAttributesCache(vtkShaderDeviceAdapter2 *shaderDevice2);
diff --git a/Rendering/OpenGL/vtkTStripsPainter.h b/Rendering/OpenGL/vtkTStripsPainter.h
index b7867e373622deba044f2cd3441ab2fd1c79c665..52c9d61b42b0109d817c5b6ce106160b2dccafa7 100644
--- a/Rendering/OpenGL/vtkTStripsPainter.h
+++ b/Rendering/OpenGL/vtkTStripsPainter.h
@@ -28,18 +28,18 @@ class VTKRENDERINGOPENGL_EXPORT vtkTStripsPainter : public vtkPrimitivePainter
public:
static vtkTStripsPainter* New();
vtkTypeMacro(vtkTStripsPainter, vtkPrimitivePainter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkTStripsPainter();
- ~vtkTStripsPainter() VTK_OVERRIDE;
+ ~vtkTStripsPainter() override;
/**
* The actual rendering happens here. This method is called only when
* SupportedPrimitive is present in typeflags when Render() is invoked.
*/
int RenderPrimitive(unsigned long flags, vtkDataArray* n,
- vtkUnsignedCharArray* c, vtkDataArray* t, vtkRenderer* ren) VTK_OVERRIDE;
+ vtkUnsignedCharArray* c, vtkDataArray* t, vtkRenderer* ren) override;
private:
vtkTStripsPainter(const vtkTStripsPainter&) VTK_DELETE_FUNCTION;
diff --git a/Rendering/OpenGL/vtkTextureObject.h b/Rendering/OpenGL/vtkTextureObject.h
index 45c0d5029780eb424008edf6dbed5c0d3d8a26a9..25b5711494b23ed5caad4e7236a6e823a4df37ba 100644
--- a/Rendering/OpenGL/vtkTextureObject.h
+++ b/Rendering/OpenGL/vtkTextureObject.h
@@ -100,7 +100,7 @@ public:
static vtkTextureObject* New();
vtkTypeMacro(vtkTextureObject, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -609,7 +609,7 @@ public:
protected:
vtkTextureObject();
- ~vtkTextureObject() VTK_OVERRIDE;
+ ~vtkTextureObject() override;
/**
* Load all necessary extensions.
diff --git a/Rendering/OpenGL/vtkTextureUnitManager.h b/Rendering/OpenGL/vtkTextureUnitManager.h
index 8836a926d1ca5507256fa2b4ca5a9ba22cd9a673..97ab8f12a782a01cda37b12398ee303e133d9655 100644
--- a/Rendering/OpenGL/vtkTextureUnitManager.h
+++ b/Rendering/OpenGL/vtkTextureUnitManager.h
@@ -40,7 +40,7 @@ class VTKRENDERINGOPENGL_EXPORT vtkTextureUnitManager : public vtkObject
public:
vtkTypeMacro(vtkTextureUnitManager,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkTextureUnitManager *New();
@@ -91,7 +91,7 @@ protected:
/**
* Destructor.
*/
- ~vtkTextureUnitManager() VTK_OVERRIDE;
+ ~vtkTextureUnitManager() override;
/**
* Delete the allocation table and check if it is not called before
diff --git a/Rendering/OpenGL/vtkTranslucentPass.h b/Rendering/OpenGL/vtkTranslucentPass.h
index 648d0b7d0d60ef5c3ec982ca3c66aa2d12e2bf71..fd267b60ae18d3ad58b835ee3cb4709f877670cf 100644
--- a/Rendering/OpenGL/vtkTranslucentPass.h
+++ b/Rendering/OpenGL/vtkTranslucentPass.h
@@ -39,13 +39,13 @@ class VTKRENDERINGOPENGL_EXPORT vtkTranslucentPass : public vtkDefaultPass
public:
static vtkTranslucentPass *New();
vtkTypeMacro(vtkTranslucentPass,vtkDefaultPass);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Perform rendering according to a render state \p s.
* \pre s_exists: s!=0
*/
- void Render(const vtkRenderState *s) VTK_OVERRIDE;
+ void Render(const vtkRenderState *s) override;
protected:
/**
@@ -56,7 +56,7 @@ public:
/**
* Destructor.
*/
- ~vtkTranslucentPass() VTK_OVERRIDE;
+ ~vtkTranslucentPass() override;
private:
vtkTranslucentPass(const vtkTranslucentPass&) VTK_DELETE_FUNCTION;
diff --git a/Rendering/OpenGL/vtkUniformVariables.cxx b/Rendering/OpenGL/vtkUniformVariables.cxx
index 027c0cec32a563588d86781c568a0b924ed4d897..996e40f71d81b76f5e578b2a0061d0419fb3375c 100644
--- a/Rendering/OpenGL/vtkUniformVariables.cxx
+++ b/Rendering/OpenGL/vtkUniformVariables.cxx
@@ -119,7 +119,7 @@ public:
++i;
}
}
- ~vtkUniformVectorInt() VTK_OVERRIDE
+ ~vtkUniformVectorInt() override
{
delete[] this->Values;
}
@@ -144,7 +144,7 @@ public:
return this->Values;
}
- void Send(int location) VTK_OVERRIDE
+ void Send(int location) override
{
switch(this->Size)
{
@@ -166,7 +166,7 @@ public:
vtkOpenGLStaticCheckErrorMacro("failed at glUniform*i");
}
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE
+ void PrintSelf(ostream &os, vtkIndent indent) override
{
os << indent << this->Name << " (uniform" << this->Size << "i): ";
int i=0;
@@ -182,7 +182,7 @@ public:
os << endl;
}
- vtkUniform *Clone() const VTK_OVERRIDE
+ vtkUniform *Clone() const override
{
vtkUniformVectorInt *result=new vtkUniformVectorInt(this->Size,
this->Values);
@@ -212,7 +212,7 @@ public:
}
}
- ~vtkUniformVectorFloat() VTK_OVERRIDE
+ ~vtkUniformVectorFloat() override
{
delete[] this->Values;
}
@@ -237,7 +237,7 @@ public:
return this->Values;
}
- void Send(int location) VTK_OVERRIDE
+ void Send(int location) override
{
switch(this->Size)
{
@@ -259,7 +259,7 @@ public:
vtkOpenGLStaticCheckErrorMacro("failed at glUniform*f");
}
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE
+ void PrintSelf(ostream &os, vtkIndent indent) override
{
os << indent << this->Name << " (uniform" << this->Size << "f): ";
int i=0;
@@ -275,7 +275,7 @@ public:
os << endl;
}
- vtkUniform *Clone() const VTK_OVERRIDE
+ vtkUniform *Clone() const override
{
vtkUniformVectorFloat *result=new vtkUniformVectorFloat(this->Size,
this->Values);
@@ -325,7 +325,7 @@ public:
}
}
- ~vtkUniformArrayInt() VTK_OVERRIDE
+ ~vtkUniformArrayInt() override
{
delete[] this->Values;
}
@@ -355,7 +355,7 @@ public:
return this->Values;
}
- void Send(int location) VTK_OVERRIDE
+ void Send(int location) override
{
switch(this->Size)
{
@@ -375,7 +375,7 @@ public:
vtkOpenGLStaticCheckErrorMacro("failed at glUniform*iv");
}
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE
+ void PrintSelf(ostream &os, vtkIndent indent) override
{
os << indent << this->Name << " (uniform" << this->Size << "iv[" << this->ArraySize << "]): ";
int j=0;
@@ -397,7 +397,7 @@ public:
}
}
- vtkUniform *Clone() const VTK_OVERRIDE
+ vtkUniform *Clone() const override
{
vtkUniformArrayInt *result=new vtkUniformArrayInt(this->Size,
this->ArraySize,
@@ -431,7 +431,7 @@ public:
}
}
- ~vtkUniformArrayFloat() VTK_OVERRIDE
+ ~vtkUniformArrayFloat() override
{
delete[] this->Values;
}
@@ -461,7 +461,7 @@ public:
return this->Values;
}
- void Send(int location) VTK_OVERRIDE
+ void Send(int location) override
{
switch(this->Size)
{
@@ -481,7 +481,7 @@ public:
vtkOpenGLStaticCheckErrorMacro("failed at glUniform*fv");
}
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE
+ void PrintSelf(ostream &os, vtkIndent indent) override
{
os << indent << this->Name << " (uniform" << this->Size << "fv[" << this->ArraySize << "]): ";
int j=0;
@@ -503,7 +503,7 @@ public:
}
}
- vtkUniform *Clone() const VTK_OVERRIDE
+ vtkUniform *Clone() const override
{
vtkUniformArrayFloat *result=new vtkUniformArrayFloat(this->Size,
this->ArraySize,
@@ -544,7 +544,7 @@ public:
}
}
- ~vtkUniformMatrix() VTK_OVERRIDE
+ ~vtkUniformMatrix() override
{
delete[] this->Values;
}
@@ -580,7 +580,7 @@ public:
return this->Values;
}
- void Send(int location) VTK_OVERRIDE
+ void Send(int location) override
{
switch(this->Rows)
{
@@ -630,7 +630,7 @@ public:
vtkOpenGLStaticCheckErrorMacro("failed at glUniformMatrix*fv");
}
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE
+ void PrintSelf(ostream &os, vtkIndent indent) override
{
os << indent << this->Name << " (matrix " << this->Rows << "x"
<< this->Columns << "): ";
@@ -652,7 +652,7 @@ public:
}
}
- vtkUniform *Clone() const VTK_OVERRIDE
+ vtkUniform *Clone() const override
{
vtkUniformMatrix *result=new vtkUniformMatrix(this->Rows,this->Columns,
this->Values);
diff --git a/Rendering/OpenGL/vtkUniformVariables.h b/Rendering/OpenGL/vtkUniformVariables.h
index 6ff29b8fdbe74386c33436b210905c8ea083e775..dad0ebfe484c3a2c0c0eb42c555a2714141d5910 100644
--- a/Rendering/OpenGL/vtkUniformVariables.h
+++ b/Rendering/OpenGL/vtkUniformVariables.h
@@ -37,7 +37,7 @@ class VTKRENDERINGOPENGL_EXPORT vtkUniformVariables : public vtkObject
public:
static vtkUniformVariables *New();
vtkTypeMacro(vtkUniformVariables,vtkObject);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
/**
* Set an integer uniform variable.
@@ -177,7 +177,7 @@ public:
protected:
vtkUniformVariables();
- ~vtkUniformVariables() VTK_OVERRIDE;
+ ~vtkUniformVariables() override;
private:
vtkUniformVariables(const vtkUniformVariables&) VTK_DELETE_FUNCTION;
diff --git a/Rendering/OpenGL/vtkValuePainter.h b/Rendering/OpenGL/vtkValuePainter.h
index d2914444860901c683a11c3d30ca562c1ea0be5e..68ca03036f68c672d0e5e3ceaa5a1f9d5217287b 100644
--- a/Rendering/OpenGL/vtkValuePainter.h
+++ b/Rendering/OpenGL/vtkValuePainter.h
@@ -41,7 +41,7 @@ class VTKRENDERINGOPENGL_EXPORT vtkValuePainter :
public:
static vtkValuePainter* New();
vtkTypeMacro(vtkValuePainter, vtkStandardPolyDataPainter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -91,18 +91,18 @@ public:
protected:
vtkValuePainter();
- ~vtkValuePainter() VTK_OVERRIDE;
+ ~vtkValuePainter() override;
/**
* overridden to look for informationkeys that specify what array to draw
*/
- void ProcessInformation(vtkInformation*) VTK_OVERRIDE;
+ void ProcessInformation(vtkInformation*) override;
/**
* overridden to draw the chosen array value directly as color
*/
void RenderInternal(vtkRenderer* renderer, vtkActor* actor,
- unsigned long typeflags, bool forceCompileOnly) VTK_OVERRIDE;
+ unsigned long typeflags, bool forceCompileOnly) override;
/**
* overridden
diff --git a/Rendering/OpenGL/vtkValuePass.h b/Rendering/OpenGL/vtkValuePass.h
index c9807d521d86e5a3e0a8eb80ba2552da38888748..1c2bbf61342566bbc806e703e4add7ccfea5cf63 100644
--- a/Rendering/OpenGL/vtkValuePass.h
+++ b/Rendering/OpenGL/vtkValuePass.h
@@ -33,7 +33,7 @@ class VTKRENDERINGOPENGL_EXPORT vtkValuePass : public vtkOpaquePass
public:
static vtkValuePass *New();
vtkTypeMacro(vtkValuePass,vtkOpaquePass);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -48,7 +48,7 @@ public:
/**
* Render.
*/
- void Render(const vtkRenderState *s) VTK_OVERRIDE;
+ void Render(const vtkRenderState *s) override;
protected:
/**
@@ -59,7 +59,7 @@ public:
/**
* Destructor.
*/
- ~vtkValuePass() VTK_OVERRIDE;
+ ~vtkValuePass() override;
private:
vtkValuePass(const vtkValuePass&) VTK_DELETE_FUNCTION;
diff --git a/Rendering/OpenGL/vtkValuePasses.h b/Rendering/OpenGL/vtkValuePasses.h
index b2c253250446d958c61ef28a955360cfc07f170d..ad6f62f8daf9c47c5046f704b7fbb0c339c0bf54 100644
--- a/Rendering/OpenGL/vtkValuePasses.h
+++ b/Rendering/OpenGL/vtkValuePasses.h
@@ -36,12 +36,12 @@ class VTKRENDERINGOPENGL_EXPORT vtkValuePasses : public vtkRenderPass
public:
static vtkValuePasses *New();
vtkTypeMacro(vtkValuePasses,vtkRenderPass);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* orchestrates inner helpers to perform overall rendering stateT
*/
- void Render(const vtkRenderState *s) VTK_OVERRIDE;
+ void Render(const vtkRenderState *s) override;
//@{
/**
@@ -62,7 +62,7 @@ public:
/**
* Destructor.
*/
- ~vtkValuePasses() VTK_OVERRIDE;
+ ~vtkValuePasses() override;
private:
vtkValuePasses(const vtkValuePasses&) VTK_DELETE_FUNCTION;
diff --git a/Rendering/OpenGL/vtkVolumetricPass.h b/Rendering/OpenGL/vtkVolumetricPass.h
index 171d67754be798f97760955978f8957462c11839..acd17f97397f0f84782bd72de9128111f52cc68f 100644
--- a/Rendering/OpenGL/vtkVolumetricPass.h
+++ b/Rendering/OpenGL/vtkVolumetricPass.h
@@ -39,13 +39,13 @@ class VTKRENDERINGOPENGL_EXPORT vtkVolumetricPass : public vtkDefaultPass
public:
static vtkVolumetricPass *New();
vtkTypeMacro(vtkVolumetricPass,vtkDefaultPass);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Perform rendering according to a render state \p s.
* \pre s_exists: s!=0
*/
- void Render(const vtkRenderState *s) VTK_OVERRIDE;
+ void Render(const vtkRenderState *s) override;
protected:
/**
@@ -56,7 +56,7 @@ public:
/**
* Destructor.
*/
- ~vtkVolumetricPass() VTK_OVERRIDE;
+ ~vtkVolumetricPass() override;
private:
vtkVolumetricPass(const vtkVolumetricPass&) VTK_DELETE_FUNCTION;
diff --git a/Rendering/OpenGL/vtkXGPUInfoList.h b/Rendering/OpenGL/vtkXGPUInfoList.h
index b4a42c9315d64abe60a2268566da4efc4c7b644b..0162735e3b5c0b42e303b3037e1df6a7b8bbeb82 100644
--- a/Rendering/OpenGL/vtkXGPUInfoList.h
+++ b/Rendering/OpenGL/vtkXGPUInfoList.h
@@ -36,13 +36,13 @@ class VTKRENDERINGOPENGL_EXPORT vtkXGPUInfoList : public vtkGPUInfoList
public:
static vtkXGPUInfoList* New();
vtkTypeMacro(vtkXGPUInfoList, vtkGPUInfoList);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Build the list of vtkInfoGPU if not done yet.
* \post probed: IsProbed()
*/
- void Probe() VTK_OVERRIDE;
+ void Probe() override;
protected:
//@{
@@ -50,7 +50,7 @@ protected:
* Default constructor.
*/
vtkXGPUInfoList();
- ~vtkXGPUInfoList() VTK_OVERRIDE;
+ ~vtkXGPUInfoList() override;
//@}
private:
diff --git a/Rendering/OpenGL/vtkXOpenGLRenderWindow.h b/Rendering/OpenGL/vtkXOpenGLRenderWindow.h
index f155058961acfa01d6240664db608b2210d40815..77385dd8d9bb09d7039d602c62eab3c98e8f8a66 100644
--- a/Rendering/OpenGL/vtkXOpenGLRenderWindow.h
+++ b/Rendering/OpenGL/vtkXOpenGLRenderWindow.h
@@ -38,17 +38,17 @@ class VTKRENDERINGOPENGL_EXPORT vtkXOpenGLRenderWindow : public vtkOpenGLRenderW
public:
static vtkXOpenGLRenderWindow *New();
vtkTypeMacro(vtkXOpenGLRenderWindow,vtkOpenGLRenderWindow);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Begin the rendering process.
*/
- void Start() VTK_OVERRIDE;
+ void Start() override;
/**
* End the rendering process and display the image.
*/
- void Frame() VTK_OVERRIDE;
+ void Frame() override;
/**
* Initialize the window for rendering.
@@ -68,17 +68,17 @@ public:
* resources. After having called this, it should be possible to destroy
* a window that was used for a SetWindowId() call without any ill effects.
*/
- void Finalize() VTK_OVERRIDE;
+ void Finalize() override;
/**
* Change the window to fill the entire screen.
*/
- void SetFullScreen(int) VTK_OVERRIDE;
+ void SetFullScreen(int) override;
/**
* Resize the window.
*/
- void WindowRemap() VTK_OVERRIDE;
+ void WindowRemap() override;
/**
* Set the preferred window size to full screen.
@@ -89,8 +89,8 @@ public:
/**
* Specify the size of the rendering window in pixels.
*/
- void SetSize(int,int) VTK_OVERRIDE;
- void SetSize(int a[2]) VTK_OVERRIDE { this->SetSize(a[0], a[1]); }
+ void SetSize(int,int) override;
+ void SetSize(int a[2]) override { this->SetSize(a[0], a[1]); }
//@}
//@{
@@ -109,56 +109,56 @@ public:
* overrides the superclass method since this class can actually check
* whether the window has been realized yet.
*/
- void SetStereoCapableWindow(int capable) VTK_OVERRIDE;
+ void SetStereoCapableWindow(int capable) override;
/**
* Make this window the current OpenGL context.
*/
- void MakeCurrent() VTK_OVERRIDE;
+ void MakeCurrent() override;
/**
* Tells if this window is the current OpenGL context for the calling thread.
*/
- bool IsCurrent() VTK_OVERRIDE;
+ bool IsCurrent() override;
/**
* If called, allow MakeCurrent() to skip cache-check when called.
* MakeCurrent() reverts to original behavior of cache-checking
* on the next render.
*/
- void SetForceMakeCurrent() VTK_OVERRIDE;
+ void SetForceMakeCurrent() override;
/**
* Get report of capabilities for the render window
*/
- const char *ReportCapabilities() VTK_OVERRIDE;
+ const char *ReportCapabilities() override;
/**
* Does this render window support OpenGL? 0-false, 1-true
*/
- int SupportsOpenGL() VTK_OVERRIDE;
+ int SupportsOpenGL() override;
/**
* Is this render window using hardware acceleration? 0-false, 1-true
*/
- int IsDirect() VTK_OVERRIDE;
+ int IsDirect() override;
/**
* Xwindow get set functions
*/
- void *GetGenericDisplayId() VTK_OVERRIDE
+ void *GetGenericDisplayId() override
{
return this->GetDisplayId();
}
- void *GetGenericWindowId() VTK_OVERRIDE;
- void *GetGenericParentId() VTK_OVERRIDE
+ void *GetGenericWindowId() override;
+ void *GetGenericParentId() override
{
return reinterpret_cast<void *>(this->ParentId);
}
- void *GetGenericContext() VTK_OVERRIDE;
- void *GetGenericDrawable() VTK_OVERRIDE
+ void *GetGenericContext() override;
+ void *GetGenericDrawable() override
{
return reinterpret_cast<void *>(this->WindowId);
}
@@ -166,12 +166,12 @@ public:
/**
* Get the current size of the screen in pixels.
*/
- int *GetScreenSize() VTK_OVERRIDE;
+ int *GetScreenSize() override;
/**
* Get the position in screen coordinates (pixels) of the window.
*/
- int *GetPosition() VTK_OVERRIDE;
+ int *GetPosition() override;
/**
* Get this RenderWindow's X display id.
@@ -184,7 +184,7 @@ public:
* X display id.
*/
void SetDisplayId(Display *);
- void SetDisplayId(void *) VTK_OVERRIDE;
+ void SetDisplayId(void *) override;
//@}
/**
@@ -197,7 +197,7 @@ public:
* Sets the parent of the window that WILL BE created.
*/
void SetParentId(Window);
- void SetParentId(void *) VTK_OVERRIDE;
+ void SetParentId(void *) override;
//@}
/**
@@ -210,7 +210,7 @@ public:
* Set this RenderWindow's X window id to a pre-existing window.
*/
void SetWindowId(Window);
- void SetWindowId(void *) VTK_OVERRIDE;
+ void SetWindowId(void *) override;
//@}
/**
@@ -223,25 +223,25 @@ public:
* This is the generic prototype as required by the vtkRenderWindow
* parent.
*/
- void SetNextWindowId(void *) VTK_OVERRIDE;
+ void SetNextWindowId(void *) override;
/**
* Set name of rendering window.
*/
- void SetWindowName(const char *) VTK_OVERRIDE;
+ void SetWindowName(const char *) override;
/**
* Initialize the render window from the information associated
* with the currently activated OpenGL context.
*/
- bool InitializeFromCurrentContext() VTK_OVERRIDE;
+ bool InitializeFromCurrentContext() override;
//@{
/**
* Move the window to a new position on the display.
*/
- void SetPosition(int,int) VTK_OVERRIDE;
- void SetPosition(int a[2]) VTK_OVERRIDE { this->SetPosition(a[0], a[1]); }
+ void SetPosition(int,int) override;
+ void SetPosition(int a[2]) override { this->SetPosition(a[0], a[1]); }
//@}
//@{
@@ -249,51 +249,51 @@ public:
* Hide or Show the mouse cursor, it is nice to be able to hide the
* default cursor if you want VTK to display a 3D cursor instead.
*/
- void HideCursor() VTK_OVERRIDE;
- void ShowCursor() VTK_OVERRIDE;
+ void HideCursor() override;
+ void ShowCursor() override;
//@}
/**
* Change the shape of the cursor
*/
- void SetCurrentCursor(int) VTK_OVERRIDE;
+ void SetCurrentCursor(int) override;
/**
* Check to see if a mouse button has been pressed or mouse wheel activated.
* All other events are ignored by this method.
* This is a useful check to abort a long render.
*/
- int GetEventPending() VTK_OVERRIDE;
+ int GetEventPending() override;
/**
* Set this RenderWindow's X window id to a pre-existing window.
*/
- void SetWindowInfo(char *info) VTK_OVERRIDE;
+ void SetWindowInfo(char *info) override;
/**
* Set the window info that will be used after WindowRemap()
*/
- void SetNextWindowInfo(char *info) VTK_OVERRIDE;
+ void SetNextWindowInfo(char *info) override;
/**
* Sets the X window id of the window that WILL BE created.
*/
- void SetParentInfo(char *info) VTK_OVERRIDE;
+ void SetParentInfo(char *info) override;
/**
* This computes the size of the render window
* before calling the supper classes render
*/
- void Render() VTK_OVERRIDE;
+ void Render() override;
/**
* Render without displaying the window.
*/
- void SetOffScreenRendering(int i) VTK_OVERRIDE;
+ void SetOffScreenRendering(int i) override;
protected:
vtkXOpenGLRenderWindow();
- ~vtkXOpenGLRenderWindow() VTK_OVERRIDE;
+ ~vtkXOpenGLRenderWindow() override;
vtkXOpenGLRenderWindowInternal *Internal;
@@ -323,8 +323,8 @@ protected:
Cursor XCHand;
- void CreateAWindow() VTK_OVERRIDE;
- void DestroyWindow() VTK_OVERRIDE;
+ void CreateAWindow() override;
+ void DestroyWindow() override;
void CreateOffScreenWindow(int width, int height);
void DestroyOffScreenWindow();
void ResizeOffScreenWindow(int width, int height);
diff --git a/Rendering/OpenGL/vtkXRenderWindowInteractor.h b/Rendering/OpenGL/vtkXRenderWindowInteractor.h
index 1f0c9f8922dd920d67ed47fd595da5fc3244a192..081d3b83ad3f0841fe041886c10d427b62c49ea9 100644
--- a/Rendering/OpenGL/vtkXRenderWindowInteractor.h
+++ b/Rendering/OpenGL/vtkXRenderWindowInteractor.h
@@ -53,19 +53,19 @@ class VTKRENDERINGOPENGL_EXPORT vtkXRenderWindowInteractor : public vtkRenderWin
public:
static vtkXRenderWindowInteractor *New();
vtkTypeMacro(vtkXRenderWindowInteractor,vtkRenderWindowInteractor);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Initializes the event handlers without an XtAppContext. This is
* good for when you don't have a user interface, but you still
* want to have mouse interaction.
*/
- void Initialize() VTK_OVERRIDE;
+ void Initialize() override;
/**
* Break the event loop on 'q','e' keypress. Want more ???
*/
- void TerminateApp() VTK_OVERRIDE;
+ void TerminateApp() override;
//@{
/**
@@ -99,15 +99,15 @@ public:
* and all other interactors associated with the widget are disabled
* when their data is not displayed.
*/
- void Enable() VTK_OVERRIDE;
- void Disable() VTK_OVERRIDE;
+ void Enable() override;
+ void Disable() override;
//@}
/**
* Update the Size data member and set the associated RenderWindow's
* size.
*/
- void UpdateSize(int,int) VTK_OVERRIDE;
+ void UpdateSize(int,int) override;
//@{
/**
@@ -167,7 +167,7 @@ public:
/**
* Re-defines virtual function to get mouse position by querying X-server.
*/
- void GetMousePosition(int *x, int *y) VTK_OVERRIDE;
+ void GetMousePosition(int *x, int *y) override;
//@{
/**
@@ -180,7 +180,7 @@ public:
protected:
vtkXRenderWindowInteractor();
- ~vtkXRenderWindowInteractor() VTK_OVERRIDE;
+ ~vtkXRenderWindowInteractor() override;
//Using static here to avoid detroying context when many apps are open:
static XtAppContext App;
@@ -201,15 +201,15 @@ protected:
* call this method it will loop processing X events until the
* application is exited.
*/
- void StartEventLoop() VTK_OVERRIDE;
+ void StartEventLoop() override;
//@{
/**
* X-specific internal timer methods. See the superclass for detailed
* documentation.
*/
- int InternalCreateTimer(int timerId, int timerType, unsigned long duration) VTK_OVERRIDE;
- int InternalDestroyTimer(int platformTimerId) VTK_OVERRIDE;
+ int InternalCreateTimer(int timerId, int timerType, unsigned long duration) override;
+ int InternalDestroyTimer(int platformTimerId) override;
//@}
XtIntervalId AddTimeOut(XtAppContext app_context, unsigned long interval,
diff --git a/Rendering/OpenGL/vtkXRenderWindowTclInteractor.h b/Rendering/OpenGL/vtkXRenderWindowTclInteractor.h
index 8bdaca629c8d60cec7e8e0540d82b37771ce0f69..86c1c957d5cddbd42575597ddbcbce6a10ee0030 100644
--- a/Rendering/OpenGL/vtkXRenderWindowTclInteractor.h
+++ b/Rendering/OpenGL/vtkXRenderWindowTclInteractor.h
@@ -39,18 +39,18 @@ class VTKRENDERINGOPENGL_EXPORT vtkXRenderWindowTclInteractor : public vtkXRende
public:
static vtkXRenderWindowTclInteractor *New();
vtkTypeMacro(vtkXRenderWindowTclInteractor,vtkXRenderWindowInteractor);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Initializes a Tcl/Tk specific event handler.
*/
- void Initialize() VTK_OVERRIDE;
+ void Initialize() override;
/**
* Overridden only to eliminate the "virtual function hidden" warning.
* Implementation delegates directly to the Superclass.
*/
- void Initialize(XtAppContext app) VTK_OVERRIDE;
+ void Initialize(XtAppContext app) override;
//@{
/**
@@ -62,8 +62,8 @@ public:
* and all other interactors associated with the widget are disabled
* when their data is not displayed.
*/
- void Enable() VTK_OVERRIDE;
- void Disable() VTK_OVERRIDE;
+ void Enable() override;
+ void Disable() override;
//@}
/**
@@ -71,7 +71,7 @@ public:
* presses the 'q' or 'e' key or when some other event observer calls
* our ExitCallback method.
*/
- void Start() VTK_OVERRIDE;
+ void Start() override;
protected:
vtkXRenderWindowTclInteractor();
@@ -82,8 +82,8 @@ protected:
* Tcl/Tk specific internal timer methods. See the superclass for detailed
* documentation.
*/
- int InternalCreateTimer(int timerId, int timerType, unsigned long duration) VTK_OVERRIDE;
- int InternalDestroyTimer(int platformTimerId) VTK_OVERRIDE;
+ int InternalCreateTimer(int timerId, int timerType, unsigned long duration) override;
+ int InternalDestroyTimer(int platformTimerId) override;
//@}
private:
diff --git a/Rendering/OpenGL2/Testing/Cxx/TestGlyph3DMapperCellPicking.cxx b/Rendering/OpenGL2/Testing/Cxx/TestGlyph3DMapperCellPicking.cxx
index c0911761056c7d2fb1196b4186341c53faa1a25c..ab6323f3fd3b447cb6ee4944464b3dce970bd296 100644
--- a/Rendering/OpenGL2/Testing/Cxx/TestGlyph3DMapperCellPicking.cxx
+++ b/Rendering/OpenGL2/Testing/Cxx/TestGlyph3DMapperCellPicking.cxx
@@ -57,14 +57,14 @@ public:
this->DataSet=nullptr;
}
- ~MyEndPickCommand() VTK_OVERRIDE
+ ~MyEndPickCommand() override
{
// empty
}
void Execute(vtkObject *vtkNotUsed(caller),
unsigned long vtkNotUsed(eventId),
- void *vtkNotUsed(callData)) VTK_OVERRIDE
+ void *vtkNotUsed(callData)) override
{
assert("pre: renderer_exists" && this->Renderer!=nullptr);
diff --git a/Rendering/OpenGL2/Testing/Cxx/TestPropPicker2Renderers.cxx b/Rendering/OpenGL2/Testing/Cxx/TestPropPicker2Renderers.cxx
index ef8ac66ad574a39868c7f979dadc9c748b590cf6..2978d91542d70c911313503e7727efbbfb216b08 100644
--- a/Rendering/OpenGL2/Testing/Cxx/TestPropPicker2Renderers.cxx
+++ b/Rendering/OpenGL2/Testing/Cxx/TestPropPicker2Renderers.cxx
@@ -50,7 +50,7 @@ public:
vtkTypeMacro(MouseInteractorStyle2, vtkInteractorStyleTrackballCamera);
- virtual void OnLeftButtonDown() VTK_OVERRIDE
+ virtual void OnLeftButtonDown() override
{
int* clickPos = this->GetInteractor()->GetEventPosition();
diff --git a/Rendering/OpenGL2/Testing/Cxx/TestRemoveActorNonCurrentContext.cxx b/Rendering/OpenGL2/Testing/Cxx/TestRemoveActorNonCurrentContext.cxx
index e7a20dc6e0a5ea1d34aeaa9357ee7654300386c6..ba6f165bed161b84e1fa0148e09e550e553bbf56 100644
--- a/Rendering/OpenGL2/Testing/Cxx/TestRemoveActorNonCurrentContext.cxx
+++ b/Rendering/OpenGL2/Testing/Cxx/TestRemoveActorNonCurrentContext.cxx
@@ -40,7 +40,7 @@ public:
void Execute(vtkObject* caller,
unsigned long eventId,
- void* vtkNotUsed(callData)) VTK_OVERRIDE
+ void* vtkNotUsed(callData)) override
{
if (eventId != vtkCommand::KeyPressEvent)
{
diff --git a/Rendering/OpenGL2/Testing/Cxx/TestUserShader2.cxx b/Rendering/OpenGL2/Testing/Cxx/TestUserShader2.cxx
index 87b4daf825fe9e8b835eb3bcee7d0a78d7b2681e..1e85999fce0e3620aabc74ece48acd9c9616e2f4 100644
--- a/Rendering/OpenGL2/Testing/Cxx/TestUserShader2.cxx
+++ b/Rendering/OpenGL2/Testing/Cxx/TestUserShader2.cxx
@@ -42,7 +42,7 @@ public:
static vtkShaderCallback *New()
{ return new vtkShaderCallback; }
vtkRenderer *Renderer;
- void Execute(vtkObject *, unsigned long, void*cbo) VTK_OVERRIDE
+ void Execute(vtkObject *, unsigned long, void*cbo) override
{
vtkOpenGLHelper *cellBO = reinterpret_cast<vtkOpenGLHelper*>(cbo);
diff --git a/Rendering/OpenGL2/vtkCameraPass.h b/Rendering/OpenGL2/vtkCameraPass.h
index 0a085f3c88d4c8b579c3e696ebc2f6056e0a0afb..7db0fa03e9cc31f64d1392c3d62cf6e45d0c2a3e 100644
--- a/Rendering/OpenGL2/vtkCameraPass.h
+++ b/Rendering/OpenGL2/vtkCameraPass.h
@@ -40,20 +40,20 @@ class VTKRENDERINGOPENGL2_EXPORT vtkCameraPass : public vtkRenderPass
public:
static vtkCameraPass *New();
vtkTypeMacro(vtkCameraPass,vtkRenderPass);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Perform rendering according to a render state \p s.
* \pre s_exists: s!=0
*/
- void Render(const vtkRenderState *s) VTK_OVERRIDE;
+ void Render(const vtkRenderState *s) override;
/**
* Release graphics resources and ask components to release their own
* resources.
* \pre w_exists: w!=0
*/
- void ReleaseGraphicsResources(vtkWindow *w) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *w) override;
//@{
/**
@@ -85,7 +85,7 @@ public:
/**
* Destructor.
*/
- ~vtkCameraPass() VTK_OVERRIDE;
+ ~vtkCameraPass() override;
virtual void GetTiledSizeAndOrigin(
const vtkRenderState* render_state,
int* width, int* height, int *originX,
diff --git a/Rendering/OpenGL2/vtkClearRGBPass.h b/Rendering/OpenGL2/vtkClearRGBPass.h
index 45c3987abd5f7b9cc917e1903ee56adceecc0d2c..471e8e8f8c23e3ed9b4e44f64c7686dc6f475533 100644
--- a/Rendering/OpenGL2/vtkClearRGBPass.h
+++ b/Rendering/OpenGL2/vtkClearRGBPass.h
@@ -35,12 +35,12 @@ class VTKRENDERINGOPENGL2_EXPORT vtkClearRGBPass : public vtkRenderPass
public:
static vtkClearRGBPass *New();
vtkTypeMacro(vtkClearRGBPass,vtkRenderPass);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Perform rendering according to a render state s.
*/
- void Render(const vtkRenderState *s) VTK_OVERRIDE;
+ void Render(const vtkRenderState *s) override;
//@{
/**
@@ -60,7 +60,7 @@ public:
/**
* Destructor.
*/
- ~vtkClearRGBPass() VTK_OVERRIDE;
+ ~vtkClearRGBPass() override;
double Background[3];
diff --git a/Rendering/OpenGL2/vtkClearZPass.h b/Rendering/OpenGL2/vtkClearZPass.h
index a2cd9b7f2b2ff02cbb4da5afd906f03f8991c2d6..947dc36615a0c1b10d148d29f6b31b29b457b412 100644
--- a/Rendering/OpenGL2/vtkClearZPass.h
+++ b/Rendering/OpenGL2/vtkClearZPass.h
@@ -35,13 +35,13 @@ class VTKRENDERINGOPENGL2_EXPORT vtkClearZPass : public vtkRenderPass
public:
static vtkClearZPass *New();
vtkTypeMacro(vtkClearZPass,vtkRenderPass);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Perform rendering according to a render state \p s.
* \pre s_exists: s!=0
*/
- void Render(const vtkRenderState *s) VTK_OVERRIDE;
+ void Render(const vtkRenderState *s) override;
//@{
/**
@@ -60,7 +60,7 @@ public:
/**
* Destructor.
*/
- ~vtkClearZPass() VTK_OVERRIDE;
+ ~vtkClearZPass() override;
double Depth;
diff --git a/Rendering/OpenGL2/vtkCocoaRenderWindow.h b/Rendering/OpenGL2/vtkCocoaRenderWindow.h
index 002dcd645cd3a22a6147159b95114ebbb5a0cf2e..de84c47697ac5a2ce9b626b5b3fa76b97ae8a88a 100644
--- a/Rendering/OpenGL2/vtkCocoaRenderWindow.h
+++ b/Rendering/OpenGL2/vtkCocoaRenderWindow.h
@@ -51,17 +51,17 @@ class VTKRENDERINGOPENGL2_EXPORT vtkCocoaRenderWindow : public vtkOpenGLRenderWi
public:
static vtkCocoaRenderWindow *New();
vtkTypeMacro(vtkCocoaRenderWindow,vtkOpenGLRenderWindow);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Begin the rendering process.
*/
- void Start() VTK_OVERRIDE;
+ void Start() override;
/**
* Finish the rendering process.
*/
- void Frame() VTK_OVERRIDE;
+ void Frame() override;
/**
* Specify various window parameters.
@@ -76,7 +76,7 @@ public:
/**
* Initialize the rendering window.
*/
- void Initialize() VTK_OVERRIDE;
+ void Initialize() override;
/**
* Change the window to fill the entire screen. This is only partially
@@ -84,12 +84,12 @@ public:
* before the window has been created, and it might not work on all
* versions of OS X.
*/
- void SetFullScreen(int) VTK_OVERRIDE;
+ void SetFullScreen(int) override;
/**
* Remap the window. This is not implemented for the vtkCocoaRenderWindow.
*/
- void WindowRemap() VTK_OVERRIDE;
+ void WindowRemap() override;
/**
* Set the preferred window size to full screen. This is not implemented
@@ -101,53 +101,53 @@ public:
/**
* Set the size of the window in pixels.
*/
- void SetSize(int a[2]) VTK_OVERRIDE;
- void SetSize(int,int) VTK_OVERRIDE;
+ void SetSize(int a[2]) override;
+ void SetSize(int,int) override;
//@}
/**
* Get the current size of the window in pixels.
*/
- int *GetSize() VTK_OVERRIDE;
+ int *GetSize() override;
//@{
/**
* Set the position of the window.
*/
- void SetPosition(int a[2]) VTK_OVERRIDE;
- void SetPosition(int,int) VTK_OVERRIDE;
+ void SetPosition(int a[2]) override;
+ void SetPosition(int,int) override;
//@}
/**
* Get the current size of the screen in pixels.
*/
- int *GetScreenSize() VTK_OVERRIDE;
+ int *GetScreenSize() override;
/**
* Get the position in screen coordinates of the window.
*/
- int *GetPosition() VTK_OVERRIDE;
+ int *GetPosition() override;
/**
* Set the name of the window. This appears at the top of the window
* normally.
*/
- void SetWindowName(const char *) VTK_OVERRIDE;
+ void SetWindowName(const char *) override;
- void SetNextWindowInfo(char *) VTK_OVERRIDE
+ void SetNextWindowInfo(char *) override
{
vtkWarningMacro("SetNextWindowInfo not implemented (WindowRemap not implemented).");
}
- void* GetGenericDrawable() VTK_OVERRIDE
+ void* GetGenericDrawable() override
{
vtkWarningMacro("Method not implemented.");
return 0;
}
- void SetDisplayId(void*) VTK_OVERRIDE
+ void SetDisplayId(void*) override
{
vtkWarningMacro("Method not implemented.");
}
- void *GetGenericDisplayId() VTK_OVERRIDE
+ void *GetGenericDisplayId() override
{
vtkWarningMacro("Method not implemented.");
return 0;
@@ -158,16 +158,16 @@ public:
* The paramater is an ASCII string of a decimal number representing
* a pointer to the window.
*/
- void SetWindowInfo(char*) VTK_OVERRIDE;
+ void SetWindowInfo(char*) override;
/**
* See the documenation for SetParentId(). This method allows the ParentId
* to be set as an ASCII string of a decimal number that is the memory
* address of the parent NSView.
*/
- void SetParentInfo(char*) VTK_OVERRIDE;
+ void SetParentInfo(char*) override;
- void SetNextWindowId(void*) VTK_OVERRIDE
+ void SetNextWindowId(void*) override
{
vtkWarningMacro("SetNextWindowId not implemented (WindowRemap not implemented).");
}
@@ -176,7 +176,7 @@ public:
* Initialize the render window from the information associated
* with the currently activated OpenGL context.
*/
- bool InitializeFromCurrentContext() VTK_OVERRIDE;
+ bool InitializeFromCurrentContext() override;
/**
* Prescribe that the window be created in a stereo-capable mode. This
@@ -184,17 +184,17 @@ public:
* overrrides the superclass method since this class can actually check
* whether the window has been realized yet.
*/
- void SetStereoCapableWindow(int capable) VTK_OVERRIDE;
+ void SetStereoCapableWindow(int capable) override;
/**
* Make this windows OpenGL context the current context.
*/
- void MakeCurrent() VTK_OVERRIDE;
+ void MakeCurrent() override;
/**
* Tells if this window is the current OpenGL context for the calling thread.
*/
- bool IsCurrent() VTK_OVERRIDE;
+ bool IsCurrent() override;
/**
* Test if the window has a valid drawable. This is
@@ -202,7 +202,7 @@ public:
* to an invalid drawable results in all OpenGL calls to fail
* with "invalid framebuffer operation".
*/
- bool IsDrawable() VTK_OVERRIDE;
+ bool IsDrawable() override;
/**
* Update this window's OpenGL context, e.g. when the window is resized.
@@ -212,25 +212,25 @@ public:
/**
* Get report of capabilities for the render window
*/
- const char *ReportCapabilities() VTK_OVERRIDE;
+ const char *ReportCapabilities() override;
/**
* Is this render window using hardware acceleration? 0-false, 1-true
*/
- int IsDirect() VTK_OVERRIDE;
+ int IsDirect() override;
/**
* If called, allow MakeCurrent() to skip cache-check when called.
* MakeCurrent() reverts to original behavior of cache-checking
* on the next render.
*/
- void SetForceMakeCurrent() VTK_OVERRIDE;
+ void SetForceMakeCurrent() override;
/**
* Check to see if an event is pending for this window.
* This is a useful check to abort a long render.
*/
- int GetEventPending() VTK_OVERRIDE;
+ int GetEventPending() override;
//@{
/**
@@ -244,7 +244,7 @@ public:
/**
* Clean up device contexts, rendering contexts, etc.
*/
- void Finalize() VTK_OVERRIDE;
+ void Finalize() override;
//@{
/**
@@ -253,15 +253,15 @@ public:
* Set cursor position in window (note that (0,0) is the lower left
* corner).
*/
- void HideCursor() VTK_OVERRIDE;
- void ShowCursor() VTK_OVERRIDE;
- void SetCursorPosition(int x, int y) VTK_OVERRIDE;
+ void HideCursor() override;
+ void ShowCursor() override;
+ void SetCursorPosition(int x, int y) override;
//@}
/**
* Change the shape of the cursor.
*/
- void SetCurrentCursor(int) VTK_OVERRIDE;
+ void SetCurrentCursor(int) override;
/**
* Get the ViewCreated flag. It is 1 if this object created an instance
@@ -281,7 +281,7 @@ public:
*/
void SetContextId(void *);
void *GetContextId();
- void *GetGenericContext() VTK_OVERRIDE {return this->GetContextId();}
+ void *GetGenericContext() override {return this->GetContextId();}
//@}
/**
@@ -311,13 +311,13 @@ public:
* and SetWindowId(), respectively, early on (before WindowInitialize()
* is executed). In the case of Java, you should call only SetWindowId().
*/
- void SetWindowId(void *) VTK_OVERRIDE;
+ void SetWindowId(void *) override;
/**
* Returns the NSView* associated with this vtkRenderWindow.
*/
virtual void *GetWindowId();
- void *GetGenericWindowId() VTK_OVERRIDE {return this->GetWindowId();}
+ void *GetGenericWindowId() override {return this->GetWindowId();}
/**
* Set the NSView* for the vtkRenderWindow to be parented within. The
@@ -325,7 +325,7 @@ public:
* NSView that the vtkRenderWindow will create within this parent.
* If you set the WindowId, then this ParentId will be ignored.
*/
- void SetParentId(void *nsview) VTK_OVERRIDE;
+ void SetParentId(void *nsview) override;
/**
* Get the parent NSView* for this vtkRenderWindow. This method will
@@ -333,7 +333,7 @@ public:
* SetParentInfo().
*/
virtual void *GetParentId();
- void *GetGenericParentId() VTK_OVERRIDE { return this->GetParentId(); }
+ void *GetGenericParentId() override { return this->GetParentId(); }
/**
* Set to true if you want to force NSViews created by this object to
@@ -364,20 +364,20 @@ public:
* and when done releasing resources restore
* the prior context
*/
- void PushContext() VTK_OVERRIDE;
- void PopContext() VTK_OVERRIDE;
+ void PushContext() override;
+ void PopContext() override;
//@}
protected:
vtkCocoaRenderWindow();
- ~vtkCocoaRenderWindow() VTK_OVERRIDE;
+ ~vtkCocoaRenderWindow() override;
std::stack<void *> ContextStack;
void CreateGLContext();
- void CreateAWindow() VTK_OVERRIDE;
- void DestroyWindow() VTK_OVERRIDE;
+ void CreateAWindow() override;
+ void DestroyWindow() override;
void DestroyOffScreenWindow();
int OffScreenInitialized;
diff --git a/Rendering/OpenGL2/vtkCocoaRenderWindowInteractor.h b/Rendering/OpenGL2/vtkCocoaRenderWindowInteractor.h
index 7d1480e1c9b4e2129cce8dcffc440f1b7d7f7e3c..e673babc725331b9223495e1e0f8be69b6923e6c 100644
--- a/Rendering/OpenGL2/vtkCocoaRenderWindowInteractor.h
+++ b/Rendering/OpenGL2/vtkCocoaRenderWindowInteractor.h
@@ -49,12 +49,12 @@ public:
static vtkCocoaRenderWindowInteractor *New();
vtkTypeMacro(vtkCocoaRenderWindowInteractor,vtkRenderWindowInteractor);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Initialize the even handler
*/
- void Initialize() VTK_OVERRIDE;
+ void Initialize() override;
//@{
/**
@@ -66,8 +66,8 @@ public:
* and all other interactors associated with the widget are disabled
* when their data is not displayed.
*/
- void Enable() VTK_OVERRIDE;
- void Disable() VTK_OVERRIDE;
+ void Enable() override;
+ void Disable() override;
//@}
/**
@@ -75,7 +75,7 @@ public:
* calls PostQuitMessage(0) to terminate app. An application can Specify
* ExitMethod for alternative behaviour (i.e. suppresion of keyboard exit)
*/
- void TerminateApp() VTK_OVERRIDE;
+ void TerminateApp() override;
//@{
/**
@@ -92,14 +92,14 @@ public:
* These methods correspond to the the Exit, User and Pick
* callbacks. They allow for the Style to invoke them.
*/
- void ExitCallback() VTK_OVERRIDE;
+ void ExitCallback() override;
// int GetButtonDown();
// void SetButtonDown(int button);
protected:
vtkCocoaRenderWindowInteractor();
- ~vtkCocoaRenderWindowInteractor() VTK_OVERRIDE;
+ ~vtkCocoaRenderWindowInteractor() override;
/**
* Accessors for the Cocoa member variables. These should be used at all time, even
@@ -124,8 +124,8 @@ protected:
* Cocoa-specific internal timer methods. See the superclass for detailed
* documentation.
*/
- int InternalCreateTimer(int timerId, int timerType, unsigned long duration) VTK_OVERRIDE;
- int InternalDestroyTimer(int platformTimerId) VTK_OVERRIDE;
+ int InternalCreateTimer(int timerId, int timerType, unsigned long duration) override;
+ int InternalDestroyTimer(int platformTimerId) override;
//@}
/**
@@ -133,7 +133,7 @@ protected:
* call this method it will loop processing events until the
* application is exited.
*/
- void StartEventLoop() VTK_OVERRIDE;
+ void StartEventLoop() override;
//@{
/**
diff --git a/Rendering/OpenGL2/vtkCompositePolyDataMapper2.h b/Rendering/OpenGL2/vtkCompositePolyDataMapper2.h
index 7aeba68bef539e4714931d29b36ae21fd6d9e7f6..03f7895fa77b6d8814d7b9ef11528b9dbd3d135d 100644
--- a/Rendering/OpenGL2/vtkCompositePolyDataMapper2.h
+++ b/Rendering/OpenGL2/vtkCompositePolyDataMapper2.h
@@ -43,7 +43,7 @@ class VTKRENDERINGOPENGL2_EXPORT vtkCompositePolyDataMapper2 : public vtkOpenGLP
public:
static vtkCompositePolyDataMapper2* New();
vtkTypeMacro(vtkCompositePolyDataMapper2, vtkOpenGLPolyDataMapper);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Returns if the mapper does not expect to have translucent geometry. This
@@ -55,7 +55,7 @@ public:
* Overridden to use the actual data and ScalarMode to determine if we have
* opaque geometry.
*/
- bool GetIsOpaque() VTK_OVERRIDE;
+ bool GetIsOpaque() override;
//@{
/**
@@ -118,12 +118,12 @@ public:
* The parameter window could be used to determine which graphic
* resources to release.
*/
- void ReleaseGraphicsResources(vtkWindow *) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *) override;
/**
* This calls RenderPiece (in a for loop if streaming is necessary).
*/
- void Render(vtkRenderer *ren, vtkActor *act) VTK_OVERRIDE;
+ void Render(vtkRenderer *ren, vtkActor *act) override;
/**
* Accessor to the ordered list of PolyData that we end last drew.
@@ -135,24 +135,24 @@ public:
protected:
vtkCompositePolyDataMapper2();
- ~vtkCompositePolyDataMapper2() VTK_OVERRIDE;
+ ~vtkCompositePolyDataMapper2() override;
/**
* We need to override this method because the standard streaming
* demand driven pipeline is not what we want - we are expecting
* hierarchical data as input
*/
- vtkExecutive* CreateDefaultExecutive() VTK_OVERRIDE;
+ vtkExecutive* CreateDefaultExecutive() override;
/**
* Need to define the type of data handled by this mapper.
*/
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
/**
* Need to loop over the hierarchy to compute bounds
*/
- void ComputeBounds() VTK_OVERRIDE;
+ void ComputeBounds() override;
/**
* Time stamp for computation of bounds.
diff --git a/Rendering/OpenGL2/vtkCompositePolyDataMapper2Internal.h b/Rendering/OpenGL2/vtkCompositePolyDataMapper2Internal.h
index 62b07bc33fa42c0776c0558050b2a9ced1c2cacc..ae3b873a6c061d6a747cdb6d619571043d576c2f 100644
--- a/Rendering/OpenGL2/vtkCompositePolyDataMapper2Internal.h
+++ b/Rendering/OpenGL2/vtkCompositePolyDataMapper2Internal.h
@@ -60,7 +60,7 @@ public:
// Description:
// Implemented by sub classes. Actual rendering is done here.
- void RenderPiece(vtkRenderer *ren, vtkActor *act) VTK_OVERRIDE;
+ void RenderPiece(vtkRenderer *ren, vtkActor *act) override;
// keep track of what data is being used as the multiblock
// can change
@@ -84,7 +84,7 @@ protected:
{
this->Parent = nullptr;
};
- ~vtkCompositeMapperHelper2() VTK_OVERRIDE;
+ ~vtkCompositeMapperHelper2() override;
void DrawIBO(
vtkRenderer* ren, vtkActor *actor,
@@ -103,15 +103,15 @@ protected:
// ReplaceShaderValues
void ReplaceShaderColor(
std::map<vtkShader::Type, vtkShader *> shaders,
- vtkRenderer *ren, vtkActor *act) VTK_OVERRIDE;
+ vtkRenderer *ren, vtkActor *act) override;
// Description:
// Determine if the buffer objects need to be rebuilt
- bool GetNeedToRebuildBufferObjects(vtkRenderer *ren, vtkActor *act) VTK_OVERRIDE;
+ bool GetNeedToRebuildBufferObjects(vtkRenderer *ren, vtkActor *act) override;
// Description:
// Build the VBO/IBO, called by UpdateBufferObjects
- void BuildBufferObjects(vtkRenderer *ren, vtkActor *act) VTK_OVERRIDE;
+ void BuildBufferObjects(vtkRenderer *ren, vtkActor *act) override;
virtual void AppendOneBufferObject(vtkRenderer *ren,
vtkActor *act, vtkCompositeMapperHelperData *hdata,
unsigned int &flat_index,
@@ -122,14 +122,14 @@ protected:
// Returns if we can use texture maps for scalar coloring. Note this doesn't
// say we "will" use scalar coloring. It says, if we do use scalar coloring,
// we will use a texture. Always off for this mapper.
- int CanUseTextureMapForColoring(vtkDataObject*) VTK_OVERRIDE;
+ int CanUseTextureMapForColoring(vtkDataObject*) override;
std::vector<unsigned int> VertexOffsets;
// vert line poly strip edge stripedge
std::vector<unsigned int> IndexArray[PrimitiveEnd];
- void RenderPieceDraw(vtkRenderer *ren, vtkActor *act) VTK_OVERRIDE;
+ void RenderPieceDraw(vtkRenderer *ren, vtkActor *act) override;
bool PrimIDUsed;
bool OverideColorUsed;
diff --git a/Rendering/OpenGL2/vtkDataTransferHelper.h b/Rendering/OpenGL2/vtkDataTransferHelper.h
index 9d5f5b24d0cb18a419ba3a929c22d62703c6a855..7f6f601628b0eaedbc756eac39317ae45fe1db40 100644
--- a/Rendering/OpenGL2/vtkDataTransferHelper.h
+++ b/Rendering/OpenGL2/vtkDataTransferHelper.h
@@ -46,7 +46,7 @@ class VTKRENDERINGOPENGL2_EXPORT vtkDataTransferHelper : public vtkObject
public:
static vtkDataTransferHelper* New();
vtkTypeMacro(vtkDataTransferHelper, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -223,7 +223,7 @@ public:
protected:
vtkDataTransferHelper();
- ~vtkDataTransferHelper() VTK_OVERRIDE;
+ ~vtkDataTransferHelper() override;
int CPUExtent[6];
int GPUExtent[6];
diff --git a/Rendering/OpenGL2/vtkDefaultPass.h b/Rendering/OpenGL2/vtkDefaultPass.h
index cf1fc103c4031bef1c832a57524baf2c20bf3fa8..99504218eb94cfd5eb123789b54db3e6d5f12843 100644
--- a/Rendering/OpenGL2/vtkDefaultPass.h
+++ b/Rendering/OpenGL2/vtkDefaultPass.h
@@ -45,7 +45,7 @@ class VTKRENDERINGOPENGL2_EXPORT vtkDefaultPass : public vtkRenderPass
public:
static vtkDefaultPass *New();
vtkTypeMacro(vtkDefaultPass,vtkRenderPass);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Perform rendering according to a render state \p s.
@@ -53,7 +53,7 @@ public:
* RenderVolumetricGeometry(), RenderOverlay()
* \pre s_exists: s!=0
*/
- void Render(const vtkRenderState *s) VTK_OVERRIDE;
+ void Render(const vtkRenderState *s) override;
protected:
/**
@@ -64,7 +64,7 @@ public:
/**
* Destructor.
*/
- ~vtkDefaultPass() VTK_OVERRIDE;
+ ~vtkDefaultPass() override;
/**
* Opaque pass without key checking.
diff --git a/Rendering/OpenGL2/vtkDepthImageProcessingPass.h b/Rendering/OpenGL2/vtkDepthImageProcessingPass.h
index ffb18f019523d2a47910491263102582bd4e54ef..7cc9794ba7072c76b8104cf928a6a2f6a8cfc373 100644
--- a/Rendering/OpenGL2/vtkDepthImageProcessingPass.h
+++ b/Rendering/OpenGL2/vtkDepthImageProcessingPass.h
@@ -63,7 +63,7 @@ class VTKRENDERINGOPENGL2_EXPORT vtkDepthImageProcessingPass : public vtkImagePr
{
public:
vtkTypeMacro(vtkDepthImageProcessingPass, vtkImageProcessingPass);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
/**
@@ -74,7 +74,7 @@ public:
/**
* Destructor.
*/
- ~vtkDepthImageProcessingPass() VTK_OVERRIDE;
+ ~vtkDepthImageProcessingPass() override;
/**
* Render delegate with a image of different dimensions than the
diff --git a/Rendering/OpenGL2/vtkDepthOfFieldPass.h b/Rendering/OpenGL2/vtkDepthOfFieldPass.h
index a400bbbd8a2a4d0fdb148513b82f050c649c698b..e4268a8bb72cafdd010f3706267e7f9b3a6eaadd 100644
--- a/Rendering/OpenGL2/vtkDepthOfFieldPass.h
+++ b/Rendering/OpenGL2/vtkDepthOfFieldPass.h
@@ -51,7 +51,7 @@ class VTKRENDERINGOPENGL2_EXPORT vtkDepthOfFieldPass : public vtkDepthImageProce
public:
static vtkDepthOfFieldPass *New();
vtkTypeMacro(vtkDepthOfFieldPass,vtkDepthImageProcessingPass);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -68,14 +68,14 @@ public:
* Perform rendering according to a render state \p s.
* \pre s_exists: s!=0
*/
- void Render(const vtkRenderState *s) VTK_OVERRIDE;
+ void Render(const vtkRenderState *s) override;
/**
* Release graphics resources and ask components to release their own
* resources.
* \pre w_exists: w!=0
*/
- void ReleaseGraphicsResources(vtkWindow *w) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *w) override;
protected:
/**
@@ -86,7 +86,7 @@ public:
/**
* Destructor.
*/
- ~vtkDepthOfFieldPass() VTK_OVERRIDE;
+ ~vtkDepthOfFieldPass() override;
/**
* Graphics resources.
diff --git a/Rendering/OpenGL2/vtkDepthPeelingPass.h b/Rendering/OpenGL2/vtkDepthPeelingPass.h
index 074c6c7574abf070538ad823fe4c667bba350ef3..dd960a22b9244b9dd80967d559689a08d3d5a5a4 100644
--- a/Rendering/OpenGL2/vtkDepthPeelingPass.h
+++ b/Rendering/OpenGL2/vtkDepthPeelingPass.h
@@ -65,20 +65,20 @@ class VTKRENDERINGOPENGL2_EXPORT vtkDepthPeelingPass
public:
static vtkDepthPeelingPass *New();
vtkTypeMacro(vtkDepthPeelingPass,vtkOpenGLRenderPass);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Perform rendering according to a render state \p s.
* \pre s_exists: s!=0
*/
- void Render(const vtkRenderState *s) VTK_OVERRIDE;
+ void Render(const vtkRenderState *s) override;
/**
* Release graphics resources and ask components to release their own
* resources.
* \pre w_exists: w!=0
*/
- void ReleaseGraphicsResources(vtkWindow *w) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *w) override;
//@{
/**
@@ -120,10 +120,10 @@ public:
std::string &geometryShader,
std::string &fragmentShader,
vtkAbstractMapper *mapper,
- vtkProp *prop) VTK_OVERRIDE;
+ vtkProp *prop) override;
bool SetShaderParameters(vtkShaderProgram *program,
vtkAbstractMapper *mapper, vtkProp *prop,
- vtkOpenGLVertexArrayObject* VAO = nullptr) VTK_OVERRIDE;
+ vtkOpenGLVertexArrayObject* VAO = nullptr) override;
// Set Opaque Z texture, this must be set from the outer FO
void SetOpaqueZTexture(vtkTextureObject *);
@@ -146,7 +146,7 @@ public:
/**
* Destructor.
*/
- ~vtkDepthPeelingPass() VTK_OVERRIDE;
+ ~vtkDepthPeelingPass() override;
vtkRenderPass *TranslucentPass;
vtkTimeStamp CheckTime;
diff --git a/Rendering/OpenGL2/vtkDualDepthPeelingPass.h b/Rendering/OpenGL2/vtkDualDepthPeelingPass.h
index 26a0a5ae7b51fb2e4c836f7e89d18df89d3b4886..5059efb99174d61bb043d03f5496421f30d2a2b4 100644
--- a/Rendering/OpenGL2/vtkDualDepthPeelingPass.h
+++ b/Rendering/OpenGL2/vtkDualDepthPeelingPass.h
@@ -69,10 +69,10 @@ class VTKRENDERINGOPENGL2_EXPORT vtkDualDepthPeelingPass:
public:
static vtkDualDepthPeelingPass* New();
vtkTypeMacro(vtkDualDepthPeelingPass, vtkDepthPeelingPass)
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
- void Render(const vtkRenderState *s) VTK_OVERRIDE;
- void ReleaseGraphicsResources(vtkWindow *w) VTK_OVERRIDE;
+ void Render(const vtkRenderState *s) override;
+ void ReleaseGraphicsResources(vtkWindow *w) override;
//@{
/**
@@ -89,17 +89,17 @@ public:
std::string &geometryShader,
std::string &fragmentShader,
vtkAbstractMapper *mapper,
- vtkProp *prop) VTK_OVERRIDE;
+ vtkProp *prop) override;
bool PostReplaceShaderValues(std::string &vertexShader,
std::string &geometryShader,
std::string &fragmentShader,
vtkAbstractMapper *mapper,
- vtkProp *prop) VTK_OVERRIDE;
+ vtkProp *prop) override;
bool SetShaderParameters(vtkShaderProgram *program,
vtkAbstractMapper *mapper,
vtkProp *prop,
- vtkOpenGLVertexArrayObject *VAO = nullptr) VTK_OVERRIDE;
- vtkMTimeType GetShaderStageMTime() VTK_OVERRIDE;
+ vtkOpenGLVertexArrayObject *VAO = nullptr) override;
+ vtkMTimeType GetShaderStageMTime() override;
protected:
@@ -154,7 +154,7 @@ protected:
};
vtkDualDepthPeelingPass();
- ~vtkDualDepthPeelingPass() VTK_OVERRIDE;
+ ~vtkDualDepthPeelingPass() override;
void SetCurrentStage(ShaderStage stage);
vtkSetMacro(CurrentPeelType, PeelType)
diff --git a/Rendering/OpenGL2/vtkDummyGPUInfoList.h b/Rendering/OpenGL2/vtkDummyGPUInfoList.h
index d985a2dc41aaff4479c34359781e882253f79c29..f4bdb537e4a6c9168c3760afd1babef566752fe5 100644
--- a/Rendering/OpenGL2/vtkDummyGPUInfoList.h
+++ b/Rendering/OpenGL2/vtkDummyGPUInfoList.h
@@ -34,13 +34,13 @@ class VTKRENDERINGOPENGL2_EXPORT vtkDummyGPUInfoList : public vtkGPUInfoList
public:
static vtkDummyGPUInfoList* New();
vtkTypeMacro(vtkDummyGPUInfoList, vtkGPUInfoList);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Build the list of vtkInfoGPU if not done yet.
* \post probed: IsProbed()
*/
- void Probe() VTK_OVERRIDE;
+ void Probe() override;
protected:
//@{
@@ -48,7 +48,7 @@ protected:
* Default constructor.
*/
vtkDummyGPUInfoList();
- ~vtkDummyGPUInfoList() VTK_OVERRIDE;
+ ~vtkDummyGPUInfoList() override;
//@}
private:
diff --git a/Rendering/OpenGL2/vtkEDLShading.h b/Rendering/OpenGL2/vtkEDLShading.h
index d9a3a35cf7e77e861774b13ef11e0c3b08fb9367..7f834cbe299981a222b5e679a1231e8bd357b08e 100644
--- a/Rendering/OpenGL2/vtkEDLShading.h
+++ b/Rendering/OpenGL2/vtkEDLShading.h
@@ -73,20 +73,20 @@ class VTKRENDERINGOPENGL2_EXPORT vtkEDLShading : public vtkDepthImageProcessingP
public:
static vtkEDLShading *New();
vtkTypeMacro(vtkEDLShading,vtkDepthImageProcessingPass);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Perform rendering according to a render state \p s.
* \pre s_exists: s!=0
*/
- void Render(const vtkRenderState *s) VTK_OVERRIDE;
+ void Render(const vtkRenderState *s) override;
/**
* Release graphics resources and ask components to release their own
* resources.
* \pre w_exists: w!=0
*/
- void ReleaseGraphicsResources(vtkWindow *w) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *w) override;
protected:
/**
@@ -97,7 +97,7 @@ public:
/**
* Destructor.
*/
- ~vtkEDLShading() VTK_OVERRIDE;
+ ~vtkEDLShading() override;
/**
* Initialization of required framebuffer objects
diff --git a/Rendering/OpenGL2/vtkFramebufferPass.h b/Rendering/OpenGL2/vtkFramebufferPass.h
index 3e88d60121ad1f111d666d4f831316627c03c853..bbc9f92633e7a97f7ff6cf793377474bb3192759 100644
--- a/Rendering/OpenGL2/vtkFramebufferPass.h
+++ b/Rendering/OpenGL2/vtkFramebufferPass.h
@@ -36,20 +36,20 @@ class VTKRENDERINGOPENGL2_EXPORT vtkFramebufferPass : public vtkDepthImageProces
public:
static vtkFramebufferPass *New();
vtkTypeMacro(vtkFramebufferPass,vtkDepthImageProcessingPass);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Perform rendering according to a render state \p s.
* \pre s_exists: s!=0
*/
- void Render(const vtkRenderState *s) VTK_OVERRIDE;
+ void Render(const vtkRenderState *s) override;
/**
* Release graphics resources and ask components to release their own
* resources.
* \pre w_exists: w!=0
*/
- void ReleaseGraphicsResources(vtkWindow *w) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *w) override;
/**
* Set the format to use for the depth texture
@@ -80,7 +80,7 @@ public:
/**
* Destructor.
*/
- ~vtkFramebufferPass() VTK_OVERRIDE;
+ ~vtkFramebufferPass() override;
/**
* Graphics resources.
diff --git a/Rendering/OpenGL2/vtkGaussianBlurPass.h b/Rendering/OpenGL2/vtkGaussianBlurPass.h
index fde651b7a84c28ceaae9678d37b3a7edca252d3b..857beab48c5e8adec0534b589258b2a2e1642137 100644
--- a/Rendering/OpenGL2/vtkGaussianBlurPass.h
+++ b/Rendering/OpenGL2/vtkGaussianBlurPass.h
@@ -63,20 +63,20 @@ class VTKRENDERINGOPENGL2_EXPORT vtkGaussianBlurPass : public vtkImageProcessing
public:
static vtkGaussianBlurPass *New();
vtkTypeMacro(vtkGaussianBlurPass,vtkImageProcessingPass);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Perform rendering according to a render state \p s.
* \pre s_exists: s!=0
*/
- void Render(const vtkRenderState *s) VTK_OVERRIDE;
+ void Render(const vtkRenderState *s) override;
/**
* Release graphics resources and ask components to release their own
* resources.
* \pre w_exists: w!=0
*/
- void ReleaseGraphicsResources(vtkWindow *w) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *w) override;
protected:
/**
@@ -87,7 +87,7 @@ public:
/**
* Destructor.
*/
- ~vtkGaussianBlurPass() VTK_OVERRIDE;
+ ~vtkGaussianBlurPass() override;
/**
* Graphics resources.
diff --git a/Rendering/OpenGL2/vtkGenericOpenGLRenderWindow.h b/Rendering/OpenGL2/vtkGenericOpenGLRenderWindow.h
index acffec729fb76f742733cbd2096ca9da405bff84..331bc5f782dc34136edce3af557a6dfe6599cb51 100644
--- a/Rendering/OpenGL2/vtkGenericOpenGLRenderWindow.h
+++ b/Rendering/OpenGL2/vtkGenericOpenGLRenderWindow.h
@@ -36,38 +36,38 @@ class VTKRENDERINGOPENGL2_EXPORT vtkGenericOpenGLRenderWindow :
public:
static vtkGenericOpenGLRenderWindow* New();
vtkTypeMacro(vtkGenericOpenGLRenderWindow, vtkOpenGLRenderWindow);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkGenericOpenGLRenderWindow();
- ~vtkGenericOpenGLRenderWindow() VTK_OVERRIDE;
+ ~vtkGenericOpenGLRenderWindow() override;
public:
//! Cleans up graphics resources allocated in the context for this VTK scene.
- void Finalize() VTK_OVERRIDE;
+ void Finalize() override;
//! flush the pending drawing operations
//! Class user may to watch for WindowFrameEvent and act on it
- void Frame() VTK_OVERRIDE;
+ void Frame() override;
//! Makes the context current. It is the class user's
//! responsibility to watch for WindowMakeCurrentEvent and set it current.
- void MakeCurrent() VTK_OVERRIDE;
+ void MakeCurrent() override;
//! Returns if the context is current. It is the class user's
//! responsibility to watch for WindowIsCurrentEvent and set the bool* flag
//! passed through the call data parameter.
- bool IsCurrent() VTK_OVERRIDE;
+ bool IsCurrent() override;
//! Returns if OpenGL is supported. It is the class user's
//! responsibility to watch for WindowSupportsOpenGLEvent and set the int* flag
//! passed through the call data parameter.
- int SupportsOpenGL() VTK_OVERRIDE;
+ int SupportsOpenGL() override;
//! Returns if the context is direct. It is the class user's
//! responsibility to watch for WindowIsDirectEvent and set the int* flag
//! passed through the call data parameter.
- int IsDirect() VTK_OVERRIDE;
+ int IsDirect() override;
// {@
//! set the drawing buffers to use
@@ -86,27 +86,27 @@ public:
// {@
//! does nothing
- void SetWindowId(void*) VTK_OVERRIDE;
- void* GetGenericWindowId() VTK_OVERRIDE;
- void SetDisplayId(void*) VTK_OVERRIDE;
- void SetParentId(void*) VTK_OVERRIDE;
- void* GetGenericDisplayId() VTK_OVERRIDE;
- void* GetGenericParentId() VTK_OVERRIDE;
- void* GetGenericContext() VTK_OVERRIDE;
- void* GetGenericDrawable() VTK_OVERRIDE;
- void SetWindowInfo(char*) VTK_OVERRIDE;
- void SetParentInfo(char*) VTK_OVERRIDE;
- int* GetScreenSize() VTK_OVERRIDE;
- void Start() VTK_OVERRIDE;
- void HideCursor() VTK_OVERRIDE;
- void ShowCursor() VTK_OVERRIDE;
- void SetFullScreen(int) VTK_OVERRIDE;
- void WindowRemap() VTK_OVERRIDE;
- int GetEventPending() VTK_OVERRIDE;
- void SetNextWindowId(void*) VTK_OVERRIDE;
- void SetNextWindowInfo(char*) VTK_OVERRIDE;
- void CreateAWindow() VTK_OVERRIDE;
- void DestroyWindow() VTK_OVERRIDE;
+ void SetWindowId(void*) override;
+ void* GetGenericWindowId() override;
+ void SetDisplayId(void*) override;
+ void SetParentId(void*) override;
+ void* GetGenericDisplayId() override;
+ void* GetGenericParentId() override;
+ void* GetGenericContext() override;
+ void* GetGenericDrawable() override;
+ void SetWindowInfo(char*) override;
+ void SetParentInfo(char*) override;
+ int* GetScreenSize() override;
+ void Start() override;
+ void HideCursor() override;
+ void ShowCursor() override;
+ void SetFullScreen(int) override;
+ void WindowRemap() override;
+ int GetEventPending() override;
+ void SetNextWindowId(void*) override;
+ void SetNextWindowInfo(char*) override;
+ void CreateAWindow() override;
+ void DestroyWindow() override;
// }@
//@{
@@ -126,12 +126,12 @@ public:
* \sa vtkOpenGLRenderWindow::SaveGLState()
* \sa vtkOpenGLRenderWindow::RestoreGLState()
*/
- void Render() VTK_OVERRIDE;
+ void Render() override;
/**
* Overridden to pass explicitly specified MaximumHardwareLineWidth, if any.
*/
- float GetMaximumHardwareLineWidth() VTK_OVERRIDE;
+ float GetMaximumHardwareLineWidth() override;
//@{
/**
@@ -160,7 +160,7 @@ public:
* Overridden to invoke vtkCommand::StartPickEvent and
* vtkCommand::EndPickEvent.
*/
- void SetIsPicking(int isPicking) VTK_OVERRIDE;
+ void SetIsPicking(int isPicking) override;
protected:
int DirectStatus;
diff --git a/Rendering/OpenGL2/vtkHiddenLineRemovalPass.h b/Rendering/OpenGL2/vtkHiddenLineRemovalPass.h
index 851372090cc1562a710fad7c81caaec39e45c9c6..4409942414c0ccd2e32b25fb29e3dc36acb9e3fc 100644
--- a/Rendering/OpenGL2/vtkHiddenLineRemovalPass.h
+++ b/Rendering/OpenGL2/vtkHiddenLineRemovalPass.h
@@ -39,9 +39,9 @@ class VTKRENDERINGOPENGL2_EXPORT vtkHiddenLineRemovalPass :
public:
static vtkHiddenLineRemovalPass* New();
vtkTypeMacro(vtkHiddenLineRemovalPass, vtkOpenGLRenderPass)
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
- void Render(const vtkRenderState *s) VTK_OVERRIDE;
+ void Render(const vtkRenderState *s) override;
/**
* Returns true if any of the nProps in propArray are rendered as wireframe.
@@ -50,7 +50,7 @@ public:
protected:
vtkHiddenLineRemovalPass();
- ~vtkHiddenLineRemovalPass() VTK_OVERRIDE;
+ ~vtkHiddenLineRemovalPass() override;
void SetRepresentation(std::vector<vtkProp*> &props, int repr);
int RenderProps(std::vector<vtkProp*> &props, vtkViewport *vp);
diff --git a/Rendering/OpenGL2/vtkIOSRenderWindow.h b/Rendering/OpenGL2/vtkIOSRenderWindow.h
index 642066d75b886a6f06d57ba9d3508841de254e2c..dff9fd0c49fbc239639b70f647df6b21a542a8f6 100644
--- a/Rendering/OpenGL2/vtkIOSRenderWindow.h
+++ b/Rendering/OpenGL2/vtkIOSRenderWindow.h
@@ -50,17 +50,17 @@ class VTKRENDERINGOPENGL2_EXPORT vtkIOSRenderWindow : public vtkOpenGLRenderWind
public:
static vtkIOSRenderWindow *New();
vtkTypeMacro(vtkIOSRenderWindow,vtkOpenGLRenderWindow);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Begin the rendering process.
*/
- void Start() VTK_OVERRIDE;
+ void Start() override;
/**
* Finish the rendering process.
*/
- void Frame() VTK_OVERRIDE;
+ void Frame() override;
/**
* Specify various window parameters.
@@ -75,7 +75,7 @@ public:
/**
* Initialize the rendering window.
*/
- void Initialize() VTK_OVERRIDE;
+ void Initialize() override;
/**
* Change the window to fill the entire screen. This is only partially
@@ -83,12 +83,12 @@ public:
* before the window has been created, and it might not work on all
* versions of OS X.
*/
- void SetFullScreen(int) VTK_OVERRIDE;
+ void SetFullScreen(int) override;
/**
* Remap the window. This is not implemented for the vtkIOSRenderWindow.
*/
- void WindowRemap() VTK_OVERRIDE;
+ void WindowRemap() override;
/**
* Set the preferred window size to full screen. This is not implemented
@@ -100,53 +100,53 @@ public:
/**
* Set the size of the window in pixels.
*/
- void SetSize(int a[2]) VTK_OVERRIDE;
- void SetSize(int,int) VTK_OVERRIDE;
+ void SetSize(int a[2]) override;
+ void SetSize(int,int) override;
//@}
/**
* Get the current size of the window in pixels.
*/
- int *GetSize() VTK_OVERRIDE;
+ int *GetSize() override;
//@{
/**
* Set the position of the window.
*/
- void SetPosition(int a[2]) VTK_OVERRIDE;
- void SetPosition(int,int) VTK_OVERRIDE;
+ void SetPosition(int a[2]) override;
+ void SetPosition(int,int) override;
//@}
/**
* Get the current size of the screen in pixels.
*/
- int *GetScreenSize() VTK_OVERRIDE;
+ int *GetScreenSize() override;
/**
* Get the position in screen coordinates of the window.
*/
- int *GetPosition() VTK_OVERRIDE;
+ int *GetPosition() override;
/**
* Set the name of the window. This appears at the top of the window
* normally.
*/
- void SetWindowName(const char *) VTK_OVERRIDE;
+ void SetWindowName(const char *) override;
- void SetNextWindowInfo(char *) VTK_OVERRIDE
+ void SetNextWindowInfo(char *) override
{
vtkWarningMacro("SetNextWindowInfo not implemented (WindowRemap not implemented).");
}
- void* GetGenericDrawable() VTK_OVERRIDE
+ void* GetGenericDrawable() override
{
vtkWarningMacro("Method not implemented.");
return 0;
}
- void SetDisplayId(void*) VTK_OVERRIDE
+ void SetDisplayId(void*) override
{
vtkWarningMacro("Method not implemented.");
}
- void *GetGenericDisplayId() VTK_OVERRIDE
+ void *GetGenericDisplayId() override
{
vtkWarningMacro("Method not implemented.");
return 0;
@@ -157,16 +157,16 @@ public:
* The paramater is an ASCII string of a decimal number representing
* a pointer to the window.
*/
- void SetWindowInfo(char*) VTK_OVERRIDE;
+ void SetWindowInfo(char*) override;
/**
* See the documenation for SetParentId(). This method allows the ParentId
* to be set as an ASCII string of a decimal number that is the memory
* address of the parent UIView.
*/
- void SetParentInfo(char*) VTK_OVERRIDE;
+ void SetParentInfo(char*) override;
- void SetNextWindowId(void*) VTK_OVERRIDE
+ void SetNextWindowId(void*) override
{
vtkWarningMacro("SetNextWindowId not implemented (WindowRemap not implemented).");
}
@@ -175,7 +175,7 @@ public:
* Initialize the render window from the information associated
* with the currently activated OpenGL context.
*/
- bool InitializeFromCurrentContext() VTK_OVERRIDE;
+ bool InitializeFromCurrentContext() override;
/**
* Prescribe that the window be created in a stereo-capable mode. This
@@ -183,17 +183,17 @@ public:
* overrrides the superclass method since this class can actually check
* whether the window has been realized yet.
*/
- void SetStereoCapableWindow(int capable) VTK_OVERRIDE;
+ void SetStereoCapableWindow(int capable) override;
/**
* Make this windows OpenGL context the current context.
*/
- void MakeCurrent() VTK_OVERRIDE;
+ void MakeCurrent() override;
/**
* Tells if this window is the current OpenGL context for the calling thread.
*/
- bool IsCurrent() VTK_OVERRIDE;
+ bool IsCurrent() override;
/**
* Test if the window has a valid drawable. This is
@@ -201,7 +201,7 @@ public:
* to an invalid drawable results in all OpenGL calls to fail
* with "invalid framebuffer operation".
*/
- bool IsDrawable() VTK_OVERRIDE;
+ bool IsDrawable() override;
/**
* Update this window's OpenGL context, e.g. when the window is resized.
@@ -211,30 +211,30 @@ public:
/**
* Get report of capabilities for the render window
*/
- const char *ReportCapabilities() VTK_OVERRIDE;
+ const char *ReportCapabilities() override;
/**
* Does this render window support OpenGL? 0-false, 1-true
*/
- int SupportsOpenGL() VTK_OVERRIDE;
+ int SupportsOpenGL() override;
/**
* Is this render window using hardware acceleration? 0-false, 1-true
*/
- int IsDirect() VTK_OVERRIDE;
+ int IsDirect() override;
/**
* If called, allow MakeCurrent() to skip cache-check when called.
* MakeCurrent() reverts to original behavior of cache-checking
* on the next render.
*/
- void SetForceMakeCurrent() VTK_OVERRIDE;
+ void SetForceMakeCurrent() override;
/**
* Check to see if an event is pending for this window.
* This is a useful check to abort a long render.
*/
- int GetEventPending() VTK_OVERRIDE;
+ int GetEventPending() override;
//@{
/**
@@ -248,12 +248,12 @@ public:
/**
* Clean up device contexts, rendering contexts, etc.
*/
- void Finalize() VTK_OVERRIDE;
+ void Finalize() override;
/**
* Get the size of the depth buffer.
*/
- int GetDepthBufferSize() VTK_OVERRIDE;
+ int GetDepthBufferSize() override;
//@{
/**
@@ -262,15 +262,15 @@ public:
* Set cursor position in window (note that (0,0) is the lower left
* corner).
*/
- void HideCursor() VTK_OVERRIDE;
- void ShowCursor() VTK_OVERRIDE;
- void SetCursorPosition(int x, int y) VTK_OVERRIDE;
+ void HideCursor() override;
+ void ShowCursor() override;
+ void SetCursorPosition(int x, int y) override;
//@}
/**
* Change the shape of the cursor.
*/
- void SetCurrentCursor(int) VTK_OVERRIDE;
+ void SetCurrentCursor(int) override;
/**
* Get the WindowCreated flag. It is 1 if this object created an instance
@@ -284,7 +284,7 @@ public:
*/
void SetContextId(void *);
void *GetContextId();
- void *GetGenericContext() VTK_OVERRIDE {return this->GetContextId();}
+ void *GetGenericContext() override {return this->GetContextId();}
//@}
/**
@@ -314,13 +314,13 @@ public:
* and SetWindowId(), respectively, early on (before WindowInitialize()
* is executed). In the case of Java, you should call only SetWindowId().
*/
- void SetWindowId(void *) VTK_OVERRIDE;
+ void SetWindowId(void *) override;
/**
* Returns the UIView* associated with this vtkRenderWindow.
*/
virtual void *GetWindowId();
- void *GetGenericWindowId() VTK_OVERRIDE {return this->GetWindowId();}
+ void *GetGenericWindowId() override {return this->GetWindowId();}
/**
* Set the UIView* for the vtkRenderWindow to be parented within. The
@@ -328,7 +328,7 @@ public:
* UIView that the vtkRenderWindow will create within this parent.
* If you set the WindowId, then this ParentId will be ignored.
*/
- void SetParentId(void *UIView) VTK_OVERRIDE;
+ void SetParentId(void *UIView) override;
/**
* Get the parent UIView* for this vtkRenderWindow. This method will
@@ -336,7 +336,7 @@ public:
* SetParentInfo().
*/
virtual void *GetParentId();
- void *GetGenericParentId() VTK_OVERRIDE { return this->GetParentId(); }
+ void *GetGenericParentId() override { return this->GetParentId(); }
//@{
/**
@@ -348,12 +348,12 @@ public:
protected:
vtkIOSRenderWindow();
- ~vtkIOSRenderWindow() VTK_OVERRIDE;
+ ~vtkIOSRenderWindow() override;
void CreateGLContext();
- void CreateAWindow() VTK_OVERRIDE;
- void DestroyWindow() VTK_OVERRIDE;
+ void CreateAWindow() override;
+ void DestroyWindow() override;
void DestroyOffScreenWindow();
int OffScreenInitialized;
@@ -361,7 +361,7 @@ protected:
// IOS seems to have issues with getting RGB data
int ReadPixels(
- const vtkRecti& rect, int front, int glFormat, int glType, void* data, int right=0) VTK_OVERRIDE;
+ const vtkRecti& rect, int front, int glFormat, int glType, void* data, int right=0) override;
private:
vtkIOSRenderWindow(const vtkIOSRenderWindow&) VTK_DELETE_FUNCTION;
diff --git a/Rendering/OpenGL2/vtkIOSRenderWindowInteractor.h b/Rendering/OpenGL2/vtkIOSRenderWindowInteractor.h
index 64b87eea818d53b2dfaae91ddf29fb1f804fe626..ec59d31fac20d996c92a47cf7b7af860b8353b1f 100644
--- a/Rendering/OpenGL2/vtkIOSRenderWindowInteractor.h
+++ b/Rendering/OpenGL2/vtkIOSRenderWindowInteractor.h
@@ -41,12 +41,12 @@ public:
static vtkIOSRenderWindowInteractor *New();
vtkTypeMacro(vtkIOSRenderWindowInteractor,vtkRenderWindowInteractor);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Initialize the even handler
*/
- void Initialize() VTK_OVERRIDE;
+ void Initialize() override;
//@{
/**
@@ -58,8 +58,8 @@ public:
* and all other interactors associated with the widget are disabled
* when their data is not displayed.
*/
- void Enable() VTK_OVERRIDE;
- void Disable() VTK_OVERRIDE;
+ void Enable() override;
+ void Disable() override;
//@}
/**
@@ -67,7 +67,7 @@ public:
* calls PostQuitMessage(0) to terminate app. An application can Specify
* ExitMethod for alternative behaviour (i.e. suppresion of keyboard exit)
*/
- void TerminateApp() VTK_OVERRIDE;
+ void TerminateApp() override;
//@{
/**
@@ -84,14 +84,14 @@ public:
* These methods correspond to the the Exit, User and Pick
* callbacks. They allow for the Style to invoke them.
*/
- void ExitCallback() VTK_OVERRIDE;
+ void ExitCallback() override;
// int GetButtonDown();
// void SetButtonDown(int button);
protected:
vtkIOSRenderWindowInteractor();
- ~vtkIOSRenderWindowInteractor() VTK_OVERRIDE;
+ ~vtkIOSRenderWindowInteractor() override;
/**
* Accessors for the IOS member variables. These should be used at all time, even
@@ -116,8 +116,8 @@ protected:
* IOS-specific internal timer methods. See the superclass for detailed
* documentation.
*/
- int InternalCreateTimer(int timerId, int timerType, unsigned long duration) VTK_OVERRIDE;
- int InternalDestroyTimer(int platformTimerId) VTK_OVERRIDE;
+ int InternalCreateTimer(int timerId, int timerType, unsigned long duration) override;
+ int InternalDestroyTimer(int platformTimerId) override;
//@}
/**
@@ -125,7 +125,7 @@ protected:
* call this method it will loop processing events until the
* application is exited.
*/
- void StartEventLoop() VTK_OVERRIDE;
+ void StartEventLoop() override;
//@{
/**
diff --git a/Rendering/OpenGL2/vtkImageProcessingPass.h b/Rendering/OpenGL2/vtkImageProcessingPass.h
index 922d181e0682f066563870aa725fc6cdacacad07..39fbcba28be4f17634cc3e55b81f8975093e88aa 100644
--- a/Rendering/OpenGL2/vtkImageProcessingPass.h
+++ b/Rendering/OpenGL2/vtkImageProcessingPass.h
@@ -39,14 +39,14 @@ class VTKRENDERINGOPENGL2_EXPORT vtkImageProcessingPass : public vtkRenderPass
{
public:
vtkTypeMacro(vtkImageProcessingPass,vtkRenderPass);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Release graphics resources and ask components to release their own
* resources.
* \pre w_exists: w!=0
*/
- void ReleaseGraphicsResources(vtkWindow *w) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *w) override;
//@{
/**
@@ -68,7 +68,7 @@ public:
/**
* Destructor.
*/
- ~vtkImageProcessingPass() VTK_OVERRIDE;
+ ~vtkImageProcessingPass() override;
/**
* Render delegate with a image of different dimensions than the
diff --git a/Rendering/OpenGL2/vtkLightingMapPass.h b/Rendering/OpenGL2/vtkLightingMapPass.h
index 4fcbf090ed46a85217fa79f6a81263624c1e078b..679ab37a20735576e5d39b6000df1a7ebb67f5b3 100644
--- a/Rendering/OpenGL2/vtkLightingMapPass.h
+++ b/Rendering/OpenGL2/vtkLightingMapPass.h
@@ -41,7 +41,7 @@ class VTKRENDERINGOPENGL2_EXPORT vtkLightingMapPass : public vtkDefaultPass
public:
static vtkLightingMapPass *New();
vtkTypeMacro(vtkLightingMapPass, vtkDefaultPass);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -70,7 +70,7 @@ public:
* Perform rendering according to a render state \p s.
* \pre s_exists: s!=0
*/
- void Render(const vtkRenderState *s) VTK_OVERRIDE;
+ void Render(const vtkRenderState *s) override;
protected:
/**
@@ -81,13 +81,13 @@ public:
/**
* Destructor.
*/
- ~vtkLightingMapPass() VTK_OVERRIDE;
+ ~vtkLightingMapPass() override;
/**
* Opaque pass with key checking.
* \pre s_exists: s!=0
*/
- void RenderOpaqueGeometry(const vtkRenderState *s) VTK_OVERRIDE;
+ void RenderOpaqueGeometry(const vtkRenderState *s) override;
private:
vtkLightingMapPass(const vtkLightingMapPass&) VTK_DELETE_FUNCTION;
diff --git a/Rendering/OpenGL2/vtkLightsPass.h b/Rendering/OpenGL2/vtkLightsPass.h
index 0cea505ccbb5a99a6dd52d4f9ab182b18b2987af..07977e951aac467c5c73aeeaca06907d5a6279d2 100644
--- a/Rendering/OpenGL2/vtkLightsPass.h
+++ b/Rendering/OpenGL2/vtkLightsPass.h
@@ -39,13 +39,13 @@ class VTKRENDERINGOPENGL2_EXPORT vtkLightsPass : public vtkRenderPass
public:
static vtkLightsPass *New();
vtkTypeMacro(vtkLightsPass,vtkRenderPass);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Perform rendering according to a render state \p s.
* \pre s_exists: s!=0
*/
- void Render(const vtkRenderState *s) VTK_OVERRIDE;
+ void Render(const vtkRenderState *s) override;
protected:
/**
@@ -56,7 +56,7 @@ public:
/**
* Destructor.
*/
- ~vtkLightsPass() VTK_OVERRIDE;
+ ~vtkLightsPass() override;
private:
vtkLightsPass(const vtkLightsPass&) VTK_DELETE_FUNCTION;
diff --git a/Rendering/OpenGL2/vtkOpaquePass.h b/Rendering/OpenGL2/vtkOpaquePass.h
index f453309e9d21bd41d14ce4e1b9f65757f8deb734..4091087f8c5f14f35123932967d85052a7a23ee5 100644
--- a/Rendering/OpenGL2/vtkOpaquePass.h
+++ b/Rendering/OpenGL2/vtkOpaquePass.h
@@ -39,13 +39,13 @@ class VTKRENDERINGOPENGL2_EXPORT vtkOpaquePass : public vtkDefaultPass
public:
static vtkOpaquePass *New();
vtkTypeMacro(vtkOpaquePass,vtkDefaultPass);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Perform rendering according to a render state \p s.
* \pre s_exists: s!=0
*/
- void Render(const vtkRenderState *s) VTK_OVERRIDE;
+ void Render(const vtkRenderState *s) override;
protected:
/**
@@ -56,7 +56,7 @@ public:
/**
* Destructor.
*/
- ~vtkOpaquePass() VTK_OVERRIDE;
+ ~vtkOpaquePass() override;
private:
vtkOpaquePass(const vtkOpaquePass&) VTK_DELETE_FUNCTION;
diff --git a/Rendering/OpenGL2/vtkOpenGLActor.h b/Rendering/OpenGL2/vtkOpenGLActor.h
index a7ada4e7ce9d1a31728993be11904528ca9458c7..44831d39b0741ec3c9a05018827c0ce4c0a8a5b1 100644
--- a/Rendering/OpenGL2/vtkOpenGLActor.h
+++ b/Rendering/OpenGL2/vtkOpenGLActor.h
@@ -36,12 +36,12 @@ class VTKRENDERINGOPENGL2_EXPORT vtkOpenGLActor : public vtkActor
public:
static vtkOpenGLActor *New();
vtkTypeMacro(vtkOpenGLActor, vtkActor);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Actual actor render method.
*/
- void Render(vtkRenderer *ren, vtkMapper *mapper) VTK_OVERRIDE;
+ void Render(vtkRenderer *ren, vtkMapper *mapper) override;
void GetKeyMatrices(vtkMatrix4x4 *&WCVCMatrix, vtkMatrix3x3 *&normalMatrix);
@@ -63,7 +63,7 @@ public:
protected:
vtkOpenGLActor();
- ~vtkOpenGLActor() VTK_OVERRIDE;
+ ~vtkOpenGLActor() override;
vtkMatrix4x4 *MCWCMatrix;
vtkMatrix3x3 *NormalMatrix;
diff --git a/Rendering/OpenGL2/vtkOpenGLBillboardTextActor3D.h b/Rendering/OpenGL2/vtkOpenGLBillboardTextActor3D.h
index be8dc1e503a33fba9093be488f982267404373c1..b48bc0e165f91ce31f0921070432543cddef2be6 100644
--- a/Rendering/OpenGL2/vtkOpenGLBillboardTextActor3D.h
+++ b/Rendering/OpenGL2/vtkOpenGLBillboardTextActor3D.h
@@ -31,13 +31,13 @@ class VTKRENDERINGOPENGL2_EXPORT vtkOpenGLBillboardTextActor3D :
public:
static vtkOpenGLBillboardTextActor3D* New();
vtkTypeMacro(vtkOpenGLBillboardTextActor3D, vtkBillboardTextActor3D)
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
- int RenderTranslucentPolygonalGeometry(vtkViewport *vp) VTK_OVERRIDE;
+ int RenderTranslucentPolygonalGeometry(vtkViewport *vp) override;
protected:
vtkOpenGLBillboardTextActor3D();
- ~vtkOpenGLBillboardTextActor3D() VTK_OVERRIDE;
+ ~vtkOpenGLBillboardTextActor3D() override;
int RenderGL2PS(vtkViewport *viewport, vtkOpenGLGL2PSHelper *gl2ps);
diff --git a/Rendering/OpenGL2/vtkOpenGLBufferObject.h b/Rendering/OpenGL2/vtkOpenGLBufferObject.h
index a4a3e60842d0f22b4d2e3ef8bb15ab7e5c09ccd9..a167963b695bcdd3248385c2f67fcb14c14d8efe 100644
--- a/Rendering/OpenGL2/vtkOpenGLBufferObject.h
+++ b/Rendering/OpenGL2/vtkOpenGLBufferObject.h
@@ -34,7 +34,7 @@ class VTKRENDERINGOPENGL2_EXPORT vtkOpenGLBufferObject : public vtkObject
public:
static vtkOpenGLBufferObject *New();
vtkTypeMacro(vtkOpenGLBufferObject, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
enum ObjectType
{
@@ -98,7 +98,7 @@ public:
protected:
vtkOpenGLBufferObject();
- ~vtkOpenGLBufferObject() VTK_OVERRIDE;
+ ~vtkOpenGLBufferObject() override;
bool Dirty;
std::string Error;
diff --git a/Rendering/OpenGL2/vtkOpenGLCamera.h b/Rendering/OpenGL2/vtkOpenGLCamera.h
index fc8a2fcdf1da42c63b2f6073bd001605c4d5e44d..b48fac68030cb0d643ac96c81b669fbbd56d46d2 100644
--- a/Rendering/OpenGL2/vtkOpenGLCamera.h
+++ b/Rendering/OpenGL2/vtkOpenGLCamera.h
@@ -34,21 +34,21 @@ class VTKRENDERINGOPENGL2_EXPORT vtkOpenGLCamera : public vtkCamera
public:
static vtkOpenGLCamera *New();
vtkTypeMacro(vtkOpenGLCamera, vtkCamera);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Implement base class method.
*/
- void Render(vtkRenderer *ren) VTK_OVERRIDE;
+ void Render(vtkRenderer *ren) override;
- void UpdateViewport(vtkRenderer *ren) VTK_OVERRIDE;
+ void UpdateViewport(vtkRenderer *ren) override;
virtual void GetKeyMatrices(vtkRenderer *ren, vtkMatrix4x4 *&WCVCMatrix,
vtkMatrix3x3 *&normalMatrix, vtkMatrix4x4 *&VCDCMatrix, vtkMatrix4x4 *&WCDCMatrix);
protected:
vtkOpenGLCamera();
- ~vtkOpenGLCamera() VTK_OVERRIDE;
+ ~vtkOpenGLCamera() override;
vtkMatrix4x4 *WCDCMatrix;
vtkMatrix4x4 *WCVCMatrix;
diff --git a/Rendering/OpenGL2/vtkOpenGLFXAAFilter.h b/Rendering/OpenGL2/vtkOpenGLFXAAFilter.h
index 6d4b4db9cdbb67a20222ce3f431034f4321e42c4..83454a0214803c8bb7a062d13e9aaa0adf4ab128 100644
--- a/Rendering/OpenGL2/vtkOpenGLFXAAFilter.h
+++ b/Rendering/OpenGL2/vtkOpenGLFXAAFilter.h
@@ -59,7 +59,7 @@ class VTKRENDERINGOPENGL2_EXPORT vtkOpenGLFXAAFilter: public vtkObject
public:
static vtkOpenGLFXAAFilter* New();
vtkTypeMacro(vtkOpenGLFXAAFilter, vtkObject)
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
/**
* Perform FXAA on the current render buffer in @a ren.
@@ -102,7 +102,7 @@ public:
protected:
vtkOpenGLFXAAFilter();
- ~vtkOpenGLFXAAFilter() VTK_OVERRIDE;
+ ~vtkOpenGLFXAAFilter() override;
void Prepare();
void FreeGLObjects();
diff --git a/Rendering/OpenGL2/vtkOpenGLFramebufferObject.h b/Rendering/OpenGL2/vtkOpenGLFramebufferObject.h
index c20627e57fe141af1ae3e015f547ee716cc92483..a1e590c1a7e9f950b984a14e4c5f7b9a09df799b 100644
--- a/Rendering/OpenGL2/vtkOpenGLFramebufferObject.h
+++ b/Rendering/OpenGL2/vtkOpenGLFramebufferObject.h
@@ -184,7 +184,7 @@ class VTKRENDERINGOPENGL2_EXPORT vtkOpenGLFramebufferObject : public vtkFrameBuf
public:
static vtkOpenGLFramebufferObject* New();
vtkTypeMacro(vtkOpenGLFramebufferObject, vtkFrameBufferObjectBase);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -371,18 +371,18 @@ public:
/**
* Dimensions in pixels of the framebuffer.
*/
- int *GetLastSize() VTK_OVERRIDE
+ int *GetLastSize() override
{
vtkDebugMacro(<< this->GetClassName() << " (" << this << "): returning LastSize pointer " << this->LastSize);
return this->LastSize;
}
- void GetLastSize(int &_arg1, int &_arg2) VTK_OVERRIDE
+ void GetLastSize(int &_arg1, int &_arg2) override
{
_arg1 = this->LastSize[0];
_arg2 = this->LastSize[1];
vtkDebugMacro(<< this->GetClassName() << " (" << this << "): returning LastSize (" << _arg1 << "," << _arg2 << ")");
}
- void GetLastSize (int _arg[2]) VTK_OVERRIDE
+ void GetLastSize (int _arg[2]) override
{
this->GetLastSize (_arg[0], _arg[1]);
}
@@ -577,7 +577,7 @@ protected:
int GetOpenGLType(int vtkType);
vtkOpenGLFramebufferObject();
- ~vtkOpenGLFramebufferObject() VTK_OVERRIDE;
+ ~vtkOpenGLFramebufferObject() override;
vtkWeakPointer<vtkOpenGLRenderWindow> Context;
diff --git a/Rendering/OpenGL2/vtkOpenGLGL2PSHelper.h b/Rendering/OpenGL2/vtkOpenGLGL2PSHelper.h
index d9060e8a4f1f79b533f495877d9835430c59f093..b6cca3466c5a81fe4a4dae84aad9d1e99ebbc0e2 100644
--- a/Rendering/OpenGL2/vtkOpenGLGL2PSHelper.h
+++ b/Rendering/OpenGL2/vtkOpenGLGL2PSHelper.h
@@ -44,7 +44,7 @@ class VTKRENDERINGOPENGL2_EXPORT vtkOpenGLGL2PSHelper: public vtkObject
public:
static vtkOpenGLGL2PSHelper* New();
vtkAbstractTypeMacro(vtkOpenGLGL2PSHelper, vtkObject)
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
//@{
/**
@@ -170,7 +170,7 @@ protected:
friend class vtkOpenGLGL2PSExporter;
vtkOpenGLGL2PSHelper();
- ~vtkOpenGLGL2PSHelper() VTK_OVERRIDE;
+ ~vtkOpenGLGL2PSHelper() override;
vtkSetMacro(ActiveState, State)
vtkSetMacro(TextAsPath, bool)
diff --git a/Rendering/OpenGL2/vtkOpenGLGlyph3DHelper.h b/Rendering/OpenGL2/vtkOpenGLGlyph3DHelper.h
index c3c4951fcb8e980230fa28646bb7410e26d9d334..b4102db76aafefea7169f2a251a61c9eb27cc537 100644
--- a/Rendering/OpenGL2/vtkOpenGLGlyph3DHelper.h
+++ b/Rendering/OpenGL2/vtkOpenGLGlyph3DHelper.h
@@ -31,7 +31,7 @@ class VTKRENDERINGOPENGL2_EXPORT vtkOpenGLGlyph3DHelper : public vtkOpenGLPolyDa
public:
static vtkOpenGLGlyph3DHelper* New();
vtkTypeMacro(vtkOpenGLGlyph3DHelper, vtkOpenGLPolyDataMapper)
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Fast path for rendering glyphs comprised of only one type of primitive
@@ -47,11 +47,11 @@ public:
* The parameter window could be used to determine which graphic
* resources to release.
*/
- void ReleaseGraphicsResources(vtkWindow *window) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *window) override;
protected:
vtkOpenGLGlyph3DHelper();
- ~vtkOpenGLGlyph3DHelper() VTK_OVERRIDE;
+ ~vtkOpenGLGlyph3DHelper() override;
// special opengl 32 version that uses instances
void GlyphRenderInstances(vtkRenderer* ren, vtkActor* actor, vtkIdType numPts,
@@ -64,7 +64,7 @@ protected:
*/
void GetShaderTemplate(
std::map<vtkShader::Type, vtkShader *> shaders,
- vtkRenderer *ren, vtkActor *act) VTK_OVERRIDE;
+ vtkRenderer *ren, vtkActor *act) override;
//@{
/**
@@ -72,26 +72,26 @@ protected:
*/
void ReplaceShaderPicking(
std::map<vtkShader::Type, vtkShader *> shaders,
- vtkRenderer *ren, vtkActor *act) VTK_OVERRIDE;
+ vtkRenderer *ren, vtkActor *act) override;
void ReplaceShaderColor(
std::map<vtkShader::Type, vtkShader *> shaders,
- vtkRenderer *ren, vtkActor *act) VTK_OVERRIDE;
+ vtkRenderer *ren, vtkActor *act) override;
void ReplaceShaderNormal(
std::map<vtkShader::Type, vtkShader *> shaders,
- vtkRenderer *ren, vtkActor *act) VTK_OVERRIDE;
+ vtkRenderer *ren, vtkActor *act) override;
void ReplaceShaderClip(
std::map<vtkShader::Type, vtkShader *> shaders,
- vtkRenderer *ren, vtkActor *act) VTK_OVERRIDE;
+ vtkRenderer *ren, vtkActor *act) override;
void ReplaceShaderPositionVC(
std::map<vtkShader::Type, vtkShader *> shaders,
- vtkRenderer *ren, vtkActor *act) VTK_OVERRIDE;
+ vtkRenderer *ren, vtkActor *act) override;
//@}
/**
* Set the shader parameteres related to the actor/mapper
*/
void SetMapperShaderParameters(
- vtkOpenGLHelper &cellBO, vtkRenderer *ren, vtkActor *act) VTK_OVERRIDE;
+ vtkOpenGLHelper &cellBO, vtkRenderer *ren, vtkActor *act) override;
bool UsingInstancing;
diff --git a/Rendering/OpenGL2/vtkOpenGLGlyph3DMapper.cxx b/Rendering/OpenGL2/vtkOpenGLGlyph3DMapper.cxx
index a0ebc933d276a344b0638978290396e993004cd4..405246acf4fa053d7a4f6c8afc0d911391520b33 100644
--- a/Rendering/OpenGL2/vtkOpenGLGlyph3DMapper.cxx
+++ b/Rendering/OpenGL2/vtkOpenGLGlyph3DMapper.cxx
@@ -77,7 +77,7 @@ class vtkOpenGLGlyph3DMappervtkColorMapper : public vtkMapper
public:
vtkTypeMacro(vtkOpenGLGlyph3DMappervtkColorMapper, vtkMapper);
static vtkOpenGLGlyph3DMappervtkColorMapper* New();
- void Render(vtkRenderer *, vtkActor *) VTK_OVERRIDE {}
+ void Render(vtkRenderer *, vtkActor *) override {}
vtkUnsignedCharArray* GetColors() { return this->Colors; }
};
diff --git a/Rendering/OpenGL2/vtkOpenGLGlyph3DMapper.h b/Rendering/OpenGL2/vtkOpenGLGlyph3DMapper.h
index b2a26402991f4d2af86dd9e334e343bb96165e7c..147d044343a32a0e9cc7dafed4eb69ca17776687 100644
--- a/Rendering/OpenGL2/vtkOpenGLGlyph3DMapper.h
+++ b/Rendering/OpenGL2/vtkOpenGLGlyph3DMapper.h
@@ -41,24 +41,24 @@ class VTKRENDERINGOPENGL2_EXPORT vtkOpenGLGlyph3DMapper
public:
static vtkOpenGLGlyph3DMapper* New();
vtkTypeMacro(vtkOpenGLGlyph3DMapper, vtkGlyph3DMapper);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Method initiates the mapping process. Generally sent by the actor
* as each frame is rendered.
*/
- void Render(vtkRenderer *ren, vtkActor *a) VTK_OVERRIDE;
+ void Render(vtkRenderer *ren, vtkActor *a) override;
/**
* Release any graphics resources that are being consumed by this mapper.
* The parameter window could be used to determine which graphic
* resources to release.
*/
- void ReleaseGraphicsResources(vtkWindow *window) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *window) override;
protected:
vtkOpenGLGlyph3DMapper();
- ~vtkOpenGLGlyph3DMapper() VTK_OVERRIDE;
+ ~vtkOpenGLGlyph3DMapper() override;
/**
* Render setup
diff --git a/Rendering/OpenGL2/vtkOpenGLHardwareSelector.h b/Rendering/OpenGL2/vtkOpenGLHardwareSelector.h
index 072ee966cf783b886fccabb7bd3fad11d4cd18ac..7570c95eceebf77ccdb440266773060edb846cde 100644
--- a/Rendering/OpenGL2/vtkOpenGLHardwareSelector.h
+++ b/Rendering/OpenGL2/vtkOpenGLHardwareSelector.h
@@ -35,49 +35,49 @@ class VTKRENDERINGOPENGL2_EXPORT vtkOpenGLHardwareSelector : public vtkHardwareS
public:
static vtkOpenGLHardwareSelector* New();
vtkTypeMacro(vtkOpenGLHardwareSelector, vtkHardwareSelector);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Called by the mapper before and after
* rendering each prop.
*/
- void BeginRenderProp() VTK_OVERRIDE;
- void EndRenderProp() VTK_OVERRIDE
+ void BeginRenderProp() override;
+ void EndRenderProp() override
{ this->vtkHardwareSelector::EndRenderProp(); }
/**
* Called by any vtkMapper or vtkProp subclass to render a composite-index.
* Currently indices >= 0xffffff are not supported.
*/
- void RenderCompositeIndex(unsigned int index) VTK_OVERRIDE;
+ void RenderCompositeIndex(unsigned int index) override;
/**
* Called by any vtkMapper or vtkProp subclass to render an attribute's id.
*/
- void RenderAttributeId(vtkIdType attribid) VTK_OVERRIDE;
+ void RenderAttributeId(vtkIdType attribid) override;
/**
* Called by any vtkMapper or subclass to render process id. This has any
* effect when this->UseProcessIdFromData is true.
*/
- void RenderProcessId(unsigned int processid) VTK_OVERRIDE;
+ void RenderProcessId(unsigned int processid) override;
// we need to initialze the depth buffer
- void BeginSelection() VTK_OVERRIDE;
+ void BeginSelection() override;
protected:
vtkOpenGLHardwareSelector();
- ~vtkOpenGLHardwareSelector() VTK_OVERRIDE;
+ ~vtkOpenGLHardwareSelector() override;
- void PreCapturePass(int pass) VTK_OVERRIDE;
- void PostCapturePass(int pass) VTK_OVERRIDE;
+ void PreCapturePass(int pass) override;
+ void PostCapturePass(int pass) override;
// Called internally before and after each prop is rendered
// for device specific configuration/preparation etc.
- void BeginRenderProp(vtkRenderWindow *) VTK_OVERRIDE;
- void EndRenderProp(vtkRenderWindow *) VTK_OVERRIDE;
+ void BeginRenderProp(vtkRenderWindow *) override;
+ void EndRenderProp(vtkRenderWindow *) override;
- void SavePixelBuffer(int passNo) VTK_OVERRIDE;
+ void SavePixelBuffer(int passNo) override;
// for internal state
class vtkInternals;
diff --git a/Rendering/OpenGL2/vtkOpenGLImageAlgorithmHelper.h b/Rendering/OpenGL2/vtkOpenGLImageAlgorithmHelper.h
index 6d8a2db9796f06857c8a5cbb45a1f23c028338db..f662207cc9ed3c02e16bf8ef0213db337d433704 100644
--- a/Rendering/OpenGL2/vtkOpenGLImageAlgorithmHelper.h
+++ b/Rendering/OpenGL2/vtkOpenGLImageAlgorithmHelper.h
@@ -51,7 +51,7 @@ class VTKRENDERINGOPENGL2_EXPORT vtkOpenGLImageAlgorithmHelper : public vtkObjec
public:
static vtkOpenGLImageAlgorithmHelper *New();
vtkTypeMacro(vtkOpenGLImageAlgorithmHelper,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
void Execute(
vtkOpenGLImageAlgorithmCallback *cb,
@@ -69,7 +69,7 @@ public:
protected:
vtkOpenGLImageAlgorithmHelper();
- ~vtkOpenGLImageAlgorithmHelper() VTK_OVERRIDE;
+ ~vtkOpenGLImageAlgorithmHelper() override;
vtkSmartPointer<vtkOpenGLRenderWindow> RenderWindow;
vtkOpenGLHelper Quad;
diff --git a/Rendering/OpenGL2/vtkOpenGLImageMapper.h b/Rendering/OpenGL2/vtkOpenGLImageMapper.h
index a88c06c9f01b2c9928ea89dec9c9dd34ca6ebd8d..48663355250ea596235ef4f5187a4e8ab914e862 100644
--- a/Rendering/OpenGL2/vtkOpenGLImageMapper.h
+++ b/Rendering/OpenGL2/vtkOpenGLImageMapper.h
@@ -41,12 +41,12 @@ class VTKRENDERINGOPENGL2_EXPORT vtkOpenGLImageMapper : public vtkImageMapper
public:
static vtkOpenGLImageMapper *New();
vtkTypeMacro(vtkOpenGLImageMapper, vtkImageMapper);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Handle the render method.
*/
- void RenderOverlay(vtkViewport* viewport, vtkActor2D* actor) VTK_OVERRIDE
+ void RenderOverlay(vtkViewport* viewport, vtkActor2D* actor) override
{ this->RenderStart(viewport, actor); }
/**
@@ -54,7 +54,7 @@ public:
* the image to the screen.
*/
void RenderData(vtkViewport* viewport, vtkImageData* data,
- vtkActor2D* actor) VTK_OVERRIDE;
+ vtkActor2D* actor) override;
/**
* draw the data once it has been converted to uchar, windowed leveled
@@ -66,11 +66,11 @@ public:
* Release any graphics resources that are being consumed by this
* mapper, the image texture in particular.
*/
- void ReleaseGraphicsResources(vtkWindow *) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *) override;
protected:
vtkOpenGLImageMapper();
- ~vtkOpenGLImageMapper() VTK_OVERRIDE;
+ ~vtkOpenGLImageMapper() override;
vtkTexturedActor2D *Actor;
diff --git a/Rendering/OpenGL2/vtkOpenGLImageSliceMapper.h b/Rendering/OpenGL2/vtkOpenGLImageSliceMapper.h
index bd14771783f36e9405fdb146b81a4bb4d8ba5311..3566e7bfb22a227d1eeeb492af4b22e0f37d98d5 100644
--- a/Rendering/OpenGL2/vtkOpenGLImageSliceMapper.h
+++ b/Rendering/OpenGL2/vtkOpenGLImageSliceMapper.h
@@ -39,23 +39,23 @@ class VTKRENDERINGOPENGL2_EXPORT vtkOpenGLImageSliceMapper :
public:
static vtkOpenGLImageSliceMapper *New();
vtkTypeMacro(vtkOpenGLImageSliceMapper, vtkImageSliceMapper);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Implement base class method. Perform the render.
*/
- void Render(vtkRenderer *ren, vtkImageSlice *prop) VTK_OVERRIDE;
+ void Render(vtkRenderer *ren, vtkImageSlice *prop) override;
/**
* Release any graphics resources that are being consumed by this
* mapper, the image texture in particular. Using the same texture
* in multiple render windows is NOT currently supported.
*/
- void ReleaseGraphicsResources(vtkWindow *) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *) override;
protected:
vtkOpenGLImageSliceMapper();
- ~vtkOpenGLImageSliceMapper() VTK_OVERRIDE;
+ ~vtkOpenGLImageSliceMapper() override;
/**
* Recursive internal method, will call the non-recursive method
@@ -106,7 +106,7 @@ protected:
*/
void ComputeTextureSize(
const int extent[6], int &xdim, int &ydim,
- int imageSize[2], int textureSize[2]) VTK_OVERRIDE;
+ int imageSize[2], int textureSize[2]) override;
/**
* Test whether a given texture size is supported. This includes a
diff --git a/Rendering/OpenGL2/vtkOpenGLIndexBufferObject.h b/Rendering/OpenGL2/vtkOpenGLIndexBufferObject.h
index 34f6f5afc426ea2080b64763f046c51b68058a9f..34b630731a6ad7b3cb3cfa56c31d04a51554b1be 100644
--- a/Rendering/OpenGL2/vtkOpenGLIndexBufferObject.h
+++ b/Rendering/OpenGL2/vtkOpenGLIndexBufferObject.h
@@ -31,7 +31,7 @@ class VTKRENDERINGOPENGL2_EXPORT vtkOpenGLIndexBufferObject :
public:
static vtkOpenGLIndexBufferObject *New();
vtkTypeMacro(vtkOpenGLIndexBufferObject, vtkOpenGLBufferObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
// Sizes/offsets are all in bytes as OpenGL API expects them.
size_t IndexCount; // Number of indices in the VBO
@@ -129,7 +129,7 @@ public:
protected:
vtkOpenGLIndexBufferObject();
- ~vtkOpenGLIndexBufferObject() VTK_OVERRIDE;
+ ~vtkOpenGLIndexBufferObject() override;
private:
vtkOpenGLIndexBufferObject(const vtkOpenGLIndexBufferObject&) VTK_DELETE_FUNCTION;
diff --git a/Rendering/OpenGL2/vtkOpenGLLabeledContourMapper.h b/Rendering/OpenGL2/vtkOpenGLLabeledContourMapper.h
index 0952e2017812ccf6b1729ab2731de12af94f2972..99ff0a3a32ac8cc6d799457a085286b13d7f5405 100644
--- a/Rendering/OpenGL2/vtkOpenGLLabeledContourMapper.h
+++ b/Rendering/OpenGL2/vtkOpenGLLabeledContourMapper.h
@@ -34,26 +34,26 @@ class VTKRENDERINGOPENGL2_EXPORT vtkOpenGLLabeledContourMapper
public:
static vtkOpenGLLabeledContourMapper *New();
vtkTypeMacro(vtkOpenGLLabeledContourMapper, vtkLabeledContourMapper)
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
/**
* Release graphics resources
*/
- void ReleaseGraphicsResources(vtkWindow *win) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *win) override;
protected:
vtkOpenGLLabeledContourMapper();
- ~vtkOpenGLLabeledContourMapper() VTK_OVERRIDE;
+ ~vtkOpenGLLabeledContourMapper() override;
// We override this for compatibility with the OpenGL backend:
// The old backend pushes actor matrices onto the matrix stack, so the text
// actors already accounted for any transformations on this mapper's actor.
// The new backend passes each actor's matrix to the shader individually, and
// this mapper's actor matrix doesn't affect the label rendering.
- bool CreateLabels(vtkActor *actor) VTK_OVERRIDE;
+ bool CreateLabels(vtkActor *actor) override;
- bool ApplyStencil(vtkRenderer *ren, vtkActor *act) VTK_OVERRIDE;
- bool RemoveStencil() VTK_OVERRIDE;
+ bool ApplyStencil(vtkRenderer *ren, vtkActor *act) override;
+ bool RemoveStencil() override;
vtkOpenGLHelper *StencilBO;
vtkMatrix4x4 *TempMatrix4;
diff --git a/Rendering/OpenGL2/vtkOpenGLLight.h b/Rendering/OpenGL2/vtkOpenGLLight.h
index d37725604f02b3c1a24e8a082e8b3d8642a1206f..d79234d78036b57b6de6e5c87faa5afe38d030a3 100644
--- a/Rendering/OpenGL2/vtkOpenGLLight.h
+++ b/Rendering/OpenGL2/vtkOpenGLLight.h
@@ -32,16 +32,16 @@ class VTKRENDERINGOPENGL2_EXPORT vtkOpenGLLight : public vtkLight
public:
static vtkOpenGLLight *New();
vtkTypeMacro(vtkOpenGLLight, vtkLight);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Implement base class method.
*/
- void Render(vtkRenderer *ren, int light_index) VTK_OVERRIDE;
+ void Render(vtkRenderer *ren, int light_index) override;
protected:
vtkOpenGLLight() {}
- ~vtkOpenGLLight() VTK_OVERRIDE {}
+ ~vtkOpenGLLight() override {}
private:
vtkOpenGLLight(const vtkOpenGLLight&) VTK_DELETE_FUNCTION;
diff --git a/Rendering/OpenGL2/vtkOpenGLPointGaussianMapper.cxx b/Rendering/OpenGL2/vtkOpenGLPointGaussianMapper.cxx
index 98f59f5967e7ffcd9ab4817d10fe9374d8b2d507..6b6b1d43ebd9b415d1b2e10c5bd2fe5029c28cd3 100644
--- a/Rendering/OpenGL2/vtkOpenGLPointGaussianMapper.cxx
+++ b/Rendering/OpenGL2/vtkOpenGLPointGaussianMapper.cxx
@@ -60,40 +60,40 @@ public:
protected:
vtkOpenGLPointGaussianMapperHelper();
- ~vtkOpenGLPointGaussianMapperHelper() VTK_OVERRIDE;
+ ~vtkOpenGLPointGaussianMapperHelper() override;
// Description:
// Create the basic shaders before replacement
void GetShaderTemplate(
std::map<vtkShader::Type, vtkShader *> shaders,
- vtkRenderer *, vtkActor *) VTK_OVERRIDE;
+ vtkRenderer *, vtkActor *) override;
// Description:
// Perform string replacments on the shader templates
void ReplaceShaderColor(
std::map<vtkShader::Type, vtkShader *> shaders,
- vtkRenderer *, vtkActor *) VTK_OVERRIDE;
+ vtkRenderer *, vtkActor *) override;
void ReplaceShaderPositionVC(
std::map<vtkShader::Type, vtkShader *> shaders,
- vtkRenderer *, vtkActor *) VTK_OVERRIDE;
+ vtkRenderer *, vtkActor *) override;
// Description:
// Set the shader parameters related to the Camera
- void SetCameraShaderParameters(vtkOpenGLHelper &cellBO, vtkRenderer *ren, vtkActor *act) VTK_OVERRIDE;
+ void SetCameraShaderParameters(vtkOpenGLHelper &cellBO, vtkRenderer *ren, vtkActor *act) override;
// Description:
// Set the shader parameters related to the actor/mapper
- void SetMapperShaderParameters(vtkOpenGLHelper &cellBO, vtkRenderer *ren, vtkActor *act) VTK_OVERRIDE;
+ void SetMapperShaderParameters(vtkOpenGLHelper &cellBO, vtkRenderer *ren, vtkActor *act) override;
// Description:
// Does the VBO/IBO need to be rebuilt
- bool GetNeedToRebuildBufferObjects(vtkRenderer *ren, vtkActor *act) VTK_OVERRIDE;
+ bool GetNeedToRebuildBufferObjects(vtkRenderer *ren, vtkActor *act) override;
// Description:
// Update the VBO to contain point based values
- void BuildBufferObjects(vtkRenderer *ren, vtkActor *act) VTK_OVERRIDE;
+ void BuildBufferObjects(vtkRenderer *ren, vtkActor *act) override;
- void RenderPieceDraw(vtkRenderer *ren, vtkActor *act) VTK_OVERRIDE;
+ void RenderPieceDraw(vtkRenderer *ren, vtkActor *act) override;
// create the table for opacity values
void BuildOpacityTable();
@@ -104,7 +104,7 @@ protected:
// Description:
// Does the shader source need to be recomputed
bool GetNeedToRebuildShaders(vtkOpenGLHelper &cellBO,
- vtkRenderer *ren, vtkActor *act) VTK_OVERRIDE;
+ vtkRenderer *ren, vtkActor *act) override;
private:
vtkOpenGLPointGaussianMapperHelper(const vtkOpenGLPointGaussianMapperHelper&) VTK_DELETE_FUNCTION;
diff --git a/Rendering/OpenGL2/vtkOpenGLPointGaussianMapper.h b/Rendering/OpenGL2/vtkOpenGLPointGaussianMapper.h
index 0fe770e6111589d26a9afa6ae66c65365f39af7d..03877fb7277882b5d37f872d436b1857393767e1 100644
--- a/Rendering/OpenGL2/vtkOpenGLPointGaussianMapper.h
+++ b/Rendering/OpenGL2/vtkOpenGLPointGaussianMapper.h
@@ -32,25 +32,25 @@ class VTKRENDERINGOPENGL2_EXPORT vtkOpenGLPointGaussianMapper : public vtkPointG
public:
static vtkOpenGLPointGaussianMapper* New();
vtkTypeMacro(vtkOpenGLPointGaussianMapper, vtkPointGaussianMapper)
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Release any graphics resources that are being consumed by this mapper.
* The parameter window could be used to determine which graphic
* resources to release.
*/
- void ReleaseGraphicsResources(vtkWindow *) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *) override;
/**
* Is this mapper opqaue? currently always false.
*/
- bool GetIsOpaque() VTK_OVERRIDE;
+ bool GetIsOpaque() override;
protected:
vtkOpenGLPointGaussianMapper();
- ~vtkOpenGLPointGaussianMapper() VTK_OVERRIDE;
+ ~vtkOpenGLPointGaussianMapper() override;
- void RenderPiece(vtkRenderer *ren, vtkActor *act) VTK_OVERRIDE;
+ void RenderPiece(vtkRenderer *ren, vtkActor *act) override;
vtkOpenGLPointGaussianMapperHelper *Helper;
vtkTimeStamp HelperUpdateTime;
diff --git a/Rendering/OpenGL2/vtkOpenGLPolyDataMapper.h b/Rendering/OpenGL2/vtkOpenGLPolyDataMapper.h
index 7c8b35b5754045b960313ecee645bb81b4172894..5e56c926b7ec33a7318d23bdabcdc02e74227aea 100644
--- a/Rendering/OpenGL2/vtkOpenGLPolyDataMapper.h
+++ b/Rendering/OpenGL2/vtkOpenGLPolyDataMapper.h
@@ -50,12 +50,12 @@ class VTKRENDERINGOPENGL2_EXPORT vtkOpenGLPolyDataMapper : public vtkPolyDataMap
public:
static vtkOpenGLPolyDataMapper* New();
vtkTypeMacro(vtkOpenGLPolyDataMapper, vtkPolyDataMapper)
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Implemented by sub classes. Actual rendering is done here.
*/
- void RenderPiece(vtkRenderer *ren, vtkActor *act) VTK_OVERRIDE;
+ void RenderPiece(vtkRenderer *ren, vtkActor *act) override;
//@{
/**
@@ -71,7 +71,7 @@ public:
* The parameter window could be used to determine which graphic
* resources to release.
*/
- void ReleaseGraphicsResources(vtkWindow *) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *) override;
vtkGetMacro(PopulateSelectionSettings,int);
void SetPopulateSelectionSettings(int v) { this->PopulateSelectionSettings = v; };
@@ -82,7 +82,7 @@ public:
* Used by vtkHardwareSelector to determine if the prop supports hardware
* selection.
*/
- bool GetSupportsSelection() VTK_OVERRIDE { return true; }
+ bool GetSupportsSelection() override { return true; }
/**
* Returns if the mapper does not expect to have translucent geometry. This
@@ -94,7 +94,7 @@ public:
* Overridden to use the actual data and ScalarMode to determine if we have
* opaque geometry.
*/
- bool GetIsOpaque() VTK_OVERRIDE;
+ bool GetIsOpaque() override;
// used by RenderPiece and functions it calls to reduce
// calls to get the input and allow for rendering of
@@ -252,21 +252,21 @@ public:
const char* vertexAttributeName,
const char* dataArrayName,
int fieldAssociation,
- int componentno = -1) VTK_OVERRIDE;
+ int componentno = -1) override;
/**
* Remove a vertex attribute mapping.
*/
- void RemoveVertexAttributeMapping(const char* vertexAttributeName) VTK_OVERRIDE;
+ void RemoveVertexAttributeMapping(const char* vertexAttributeName) override;
/**
* Remove all vertex attributes.
*/
- void RemoveAllVertexAttributeMappings() VTK_OVERRIDE;
+ void RemoveAllVertexAttributeMappings() override;
protected:
vtkOpenGLPolyDataMapper();
- ~vtkOpenGLPolyDataMapper() VTK_OVERRIDE;
+ ~vtkOpenGLPolyDataMapper() override;
vtkGenericOpenGLResourceFreeCallback *ResourceCallback;
@@ -290,7 +290,7 @@ protected:
* to be updated depending on whether this->Static is set or not. This method
* simply obtains the bounds from the data-object and returns it.
*/
- void ComputeBounds() VTK_OVERRIDE;
+ void ComputeBounds() override;
/**
* Make sure appropriate shaders are defined, compiled and bound. This method
diff --git a/Rendering/OpenGL2/vtkOpenGLPolyDataMapper2D.h b/Rendering/OpenGL2/vtkOpenGLPolyDataMapper2D.h
index 3e5350bcf4749582f364cf0dc91ed295b611a29f..8797d7c6715d6751615496e512ce67cd1c642315 100644
--- a/Rendering/OpenGL2/vtkOpenGLPolyDataMapper2D.h
+++ b/Rendering/OpenGL2/vtkOpenGLPolyDataMapper2D.h
@@ -51,23 +51,23 @@ class VTKRENDERINGOPENGL2_EXPORT vtkOpenGLPolyDataMapper2D : public vtkPolyDataM
public:
vtkTypeMacro(vtkOpenGLPolyDataMapper2D, vtkPolyDataMapper2D);
static vtkOpenGLPolyDataMapper2D *New();
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Actually draw the poly data.
*/
- void RenderOverlay(vtkViewport* viewport, vtkActor2D* actor) VTK_OVERRIDE;
+ void RenderOverlay(vtkViewport* viewport, vtkActor2D* actor) override;
/**
* Release any graphics resources that are being consumed by this mapper.
* The parameter window could be used to determine which graphic
* resources to release.
*/
- void ReleaseGraphicsResources(vtkWindow *) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *) override;
protected:
vtkOpenGLPolyDataMapper2D();
- ~vtkOpenGLPolyDataMapper2D() VTK_OVERRIDE;
+ ~vtkOpenGLPolyDataMapper2D() override;
vtkGenericOpenGLResourceFreeCallback *ResourceCallback;
diff --git a/Rendering/OpenGL2/vtkOpenGLProperty.h b/Rendering/OpenGL2/vtkOpenGLProperty.h
index 651cf3ab338e870fb90a952849478ac4a50279c5..65e462dea3081cb1c260c8c23608f5c868f90ac5 100644
--- a/Rendering/OpenGL2/vtkOpenGLProperty.h
+++ b/Rendering/OpenGL2/vtkOpenGLProperty.h
@@ -31,17 +31,17 @@ class VTKRENDERINGOPENGL2_EXPORT vtkOpenGLProperty : public vtkProperty
public:
static vtkOpenGLProperty *New();
vtkTypeMacro(vtkOpenGLProperty, vtkProperty);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Implement base class method.
*/
- void Render(vtkActor *a, vtkRenderer *ren) VTK_OVERRIDE;
+ void Render(vtkActor *a, vtkRenderer *ren) override;
/**
* Implement base class method.
*/
- void BackfaceRender(vtkActor *a, vtkRenderer *ren) VTK_OVERRIDE;
+ void BackfaceRender(vtkActor *a, vtkRenderer *ren) override;
/**
* This method is called after the actor has been rendered.
@@ -49,18 +49,18 @@ public:
* any shaders allocated.
*/
void PostRender(vtkActor *a,
- vtkRenderer *r) VTK_OVERRIDE;
+ vtkRenderer *r) override;
/**
* Release any graphics resources that are being consumed by this
* property. The parameter window could be used to determine which graphic
* resources to release.
*/
- void ReleaseGraphicsResources(vtkWindow *win) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *win) override;
protected:
vtkOpenGLProperty();
- ~vtkOpenGLProperty() VTK_OVERRIDE;
+ ~vtkOpenGLProperty() override;
/**
* Method called in vtkOpenGLProperty::Render() to render textures.
diff --git a/Rendering/OpenGL2/vtkOpenGLRenderPass.h b/Rendering/OpenGL2/vtkOpenGLRenderPass.h
index 981785211ca0cf07b4b5957c55bfea74c9cfde5c..32bf38579f6b50514fa81f27c3c2f4ba90ba9682 100644
--- a/Rendering/OpenGL2/vtkOpenGLRenderPass.h
+++ b/Rendering/OpenGL2/vtkOpenGLRenderPass.h
@@ -39,7 +39,7 @@ class VTKRENDERINGOPENGL2_EXPORT vtkOpenGLRenderPass: public vtkRenderPass
{
public:
vtkTypeMacro(vtkOpenGLRenderPass, vtkRenderPass)
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
/**
* Use vtkShaderProgram::Substitute to replace //VTK::XXX:YYY declarations in
@@ -93,7 +93,7 @@ public:
protected:
vtkOpenGLRenderPass();
- ~vtkOpenGLRenderPass() VTK_OVERRIDE;
+ ~vtkOpenGLRenderPass() override;
/**
* Call before rendering to update the actors' information keys.
diff --git a/Rendering/OpenGL2/vtkOpenGLRenderTimerLog.h b/Rendering/OpenGL2/vtkOpenGLRenderTimerLog.h
index 70265f62bdfbdffc8a2c40dc0948c3e72847a5af..0dd0d8ef932eb321aff1c047254cd3cf8a858efe 100644
--- a/Rendering/OpenGL2/vtkOpenGLRenderTimerLog.h
+++ b/Rendering/OpenGL2/vtkOpenGLRenderTimerLog.h
@@ -50,28 +50,28 @@ public:
static vtkOpenGLRenderTimerLog* New();
vtkTypeMacro(vtkOpenGLRenderTimerLog, vtkRenderTimerLog)
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
- bool IsSupported() VTK_OVERRIDE;
+ bool IsSupported() override;
/**
* Overridden to do support check before returning.
*/
- bool GetLoggingEnabled() VTK_OVERRIDE { return this->DoLogging(); }
+ bool GetLoggingEnabled() override { return this->DoLogging(); }
- void MarkFrame() VTK_OVERRIDE;
+ void MarkFrame() override;
- void MarkStartEvent(const std::string &name) VTK_OVERRIDE;
- void MarkEndEvent() VTK_OVERRIDE;
+ void MarkStartEvent(const std::string &name) override;
+ void MarkEndEvent() override;
- bool FrameReady() VTK_OVERRIDE;
+ bool FrameReady() override;
- Frame PopFirstReadyFrame() VTK_OVERRIDE;
+ Frame PopFirstReadyFrame() override;
/**
* Releases any resources allocated on the graphics device.
*/
- void ReleaseGraphicsResources() VTK_OVERRIDE;
+ void ReleaseGraphicsResources() override;
/**
* This implementations keeps a pool of vtkRenderTimers around, recycling them
diff --git a/Rendering/OpenGL2/vtkOpenGLRenderUtilities.h b/Rendering/OpenGL2/vtkOpenGLRenderUtilities.h
index 7ac25f2fac702e8f18e51f3d0bbce5b160be3cc9..dfdb9d13d70a8779b1decf1597a39d903a2b2ac0 100644
--- a/Rendering/OpenGL2/vtkOpenGLRenderUtilities.h
+++ b/Rendering/OpenGL2/vtkOpenGLRenderUtilities.h
@@ -36,7 +36,7 @@ class VTKRENDERINGOPENGL2_EXPORT vtkOpenGLRenderUtilities : public vtkObject
{
public:
vtkTypeMacro(vtkOpenGLRenderUtilities, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -112,7 +112,7 @@ public:
protected:
vtkOpenGLRenderUtilities();
- ~vtkOpenGLRenderUtilities() VTK_OVERRIDE;
+ ~vtkOpenGLRenderUtilities() override;
private:
vtkOpenGLRenderUtilities(const vtkOpenGLRenderUtilities&) VTK_DELETE_FUNCTION;
diff --git a/Rendering/OpenGL2/vtkOpenGLRenderWindow.h b/Rendering/OpenGL2/vtkOpenGLRenderWindow.h
index 6249f9d4272fa9ed6224cba9b59268064f5bf085..cc124a8b89e46a72394edfcb04539a4436fa9f74 100644
--- a/Rendering/OpenGL2/vtkOpenGLRenderWindow.h
+++ b/Rendering/OpenGL2/vtkOpenGLRenderWindow.h
@@ -49,12 +49,12 @@ class VTKRENDERINGOPENGL2_EXPORT vtkOpenGLRenderWindow : public vtkRenderWindow
{
public:
vtkTypeMacro(vtkOpenGLRenderWindow, vtkRenderWindow);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* What rendering backend has the user requested
*/
- const char *GetRenderingBackend() VTK_OVERRIDE;
+ const char *GetRenderingBackend() override;
//@{
/**
@@ -69,14 +69,14 @@ public:
* Set/Get the pixel data of an image, transmitted as RGBRGB...
*/
unsigned char *GetPixelData(int x,int y,int x2,int y2,int front,int right)
- VTK_OVERRIDE;
+ override;
int GetPixelData(int x,int y,int x2,int y2, int front,
- vtkUnsignedCharArray *data, int right) VTK_OVERRIDE;
+ vtkUnsignedCharArray *data, int right) override;
int SetPixelData(int x,int y,int x2,int y2,unsigned char *data,
- int front, int right) VTK_OVERRIDE;
+ int front, int right) override;
int SetPixelData(int x,int y,int x2,int y2,
vtkUnsignedCharArray *data, int front, int right)
- VTK_OVERRIDE;
+ override;
//@}
//@{
@@ -84,38 +84,38 @@ public:
* Set/Get the pixel data of an image, transmitted as RGBARGBA...
*/
float *GetRGBAPixelData(int x,int y,int x2,int y2,int front,int right=0)
- VTK_OVERRIDE;
+ override;
int GetRGBAPixelData(int x,int y,int x2,int y2, int front,
- vtkFloatArray* data, int right=0) VTK_OVERRIDE;
+ vtkFloatArray* data, int right=0) override;
int SetRGBAPixelData(int x,int y,int x2,int y2, float *data,
- int front, int blend=0, int right=0) VTK_OVERRIDE;
+ int front, int blend=0, int right=0) override;
int SetRGBAPixelData(int x,int y,int x2,int y2, vtkFloatArray *data,
- int front, int blend=0, int right=0) VTK_OVERRIDE;
- void ReleaseRGBAPixelData(float *data) VTK_OVERRIDE;
+ int front, int blend=0, int right=0) override;
+ void ReleaseRGBAPixelData(float *data) override;
unsigned char *GetRGBACharPixelData(int x,int y,int x2,int y2,
- int front, int right=0) VTK_OVERRIDE;
+ int front, int right=0) override;
int GetRGBACharPixelData(int x,int y,int x2,int y2, int front,
vtkUnsignedCharArray *data, int right=0)
- VTK_OVERRIDE;
+ override;
int SetRGBACharPixelData(int x, int y, int x2, int y2,
unsigned char *data, int front,
- int blend=0, int right=0) VTK_OVERRIDE;
+ int blend=0, int right=0) override;
int SetRGBACharPixelData(int x,int y,int x2,int y2,
vtkUnsignedCharArray *data, int front,
- int blend=0,int right=0) VTK_OVERRIDE;
+ int blend=0,int right=0) override;
//@}
//@{
/**
* Set/Get the zbuffer data from an image
*/
- float *GetZbufferData( int x1, int y1, int x2, int y2 ) VTK_OVERRIDE;
- int GetZbufferData( int x1, int y1, int x2, int y2, float* z ) VTK_OVERRIDE;
+ float *GetZbufferData( int x1, int y1, int x2, int y2 ) override;
+ int GetZbufferData( int x1, int y1, int x2, int y2, float* z ) override;
int GetZbufferData( int x1, int y1, int x2, int y2,
- vtkFloatArray* z ) VTK_OVERRIDE;
- int SetZbufferData( int x1, int y1, int x2, int y2, float *buffer ) VTK_OVERRIDE;
+ vtkFloatArray* z ) override;
+ int SetZbufferData( int x1, int y1, int x2, int y2, float *buffer ) override;
int SetZbufferData( int x1, int y1, int x2, int y2,
- vtkFloatArray *buffer ) VTK_OVERRIDE;
+ vtkFloatArray *buffer ) override;
//@}
@@ -137,7 +137,7 @@ public:
/**
* Get the size of the depth buffer.
*/
- int GetDepthBufferSize() VTK_OVERRIDE;
+ int GetDepthBufferSize() override;
/**
* Is this window/fo in sRGB colorspace
@@ -148,14 +148,14 @@ public:
* Get the size of the color buffer.
* Returns 0 if not able to determine otherwise sets R G B and A into buffer.
*/
- int GetColorBufferSizes(int *rgba) VTK_OVERRIDE;
+ int GetColorBufferSizes(int *rgba) override;
//@{
/**
* Set the size of the window in screen coordinates in pixels.
*/
- void SetSize(int a[2]) VTK_OVERRIDE;
- void SetSize(int,int) VTK_OVERRIDE;
+ void SetSize(int a[2]) override;
+ void SetSize(int,int) override;
//@}
/**
@@ -274,7 +274,7 @@ public:
* Block the thread until the actual rendering is finished().
* Useful for measurement only.
*/
- void WaitForCompletion() VTK_OVERRIDE;
+ void WaitForCompletion() override;
/**
* Replacement for the old glDrawPixels function
@@ -340,18 +340,18 @@ public:
// Return if the creation was successful (1) or not (0).
// Note: This function requires that the device supports OpenGL framebuffer extension.
// The function has no effect if OffScreenRendering is ON.
- int SetUseOffScreenBuffers(bool offScreen) VTK_OVERRIDE;
- bool GetUseOffScreenBuffers() VTK_OVERRIDE;
+ int SetUseOffScreenBuffers(bool offScreen) override;
+ bool GetUseOffScreenBuffers() override;
/**
* Does this render window support OpenGL? 0-false, 1-true
*/
- int SupportsOpenGL() VTK_OVERRIDE;
+ int SupportsOpenGL() override;
/**
* Get report of capabilities for the render window
*/
- const char *ReportCapabilities() VTK_OVERRIDE;
+ const char *ReportCapabilities() override;
/**
* Initialize the rendering window. This will setup all system-specific
@@ -397,7 +397,7 @@ public:
* Initialize the render window from the information associated
* with the currently activated OpenGL context.
*/
- bool InitializeFromCurrentContext() VTK_OVERRIDE;
+ bool InitializeFromCurrentContext() override;
/**
* Returns the id for the frame buffer object, if any, used by the render window
@@ -410,7 +410,7 @@ public:
protected:
vtkOpenGLRenderWindow();
- ~vtkOpenGLRenderWindow() VTK_OVERRIDE;
+ ~vtkOpenGLRenderWindow() override;
vtkOpenGLShaderCache *ShaderCache;
vtkOpenGLVertexBufferObjectCache *VBOCache;
diff --git a/Rendering/OpenGL2/vtkOpenGLRenderer.h b/Rendering/OpenGL2/vtkOpenGLRenderer.h
index 8b24d1dd3309963b766ec4a5cc465c8ba48f869d..66962edf5f1e44c4e1b0ae84dbe6c8070c2ffe94 100644
--- a/Rendering/OpenGL2/vtkOpenGLRenderer.h
+++ b/Rendering/OpenGL2/vtkOpenGLRenderer.h
@@ -39,17 +39,17 @@ class VTKRENDERINGOPENGL2_EXPORT vtkOpenGLRenderer : public vtkRenderer
public:
static vtkOpenGLRenderer *New();
vtkTypeMacro(vtkOpenGLRenderer, vtkRenderer);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Concrete open gl render method.
*/
- void DeviceRender(void) VTK_OVERRIDE;
+ void DeviceRender(void) override;
/**
* Overridden to support hidden line removal.
*/
- void DeviceRenderOpaqueGeometry() VTK_OVERRIDE;
+ void DeviceRenderOpaqueGeometry() override;
/**
* Render translucent polygonal geometry. Default implementation just call
@@ -57,14 +57,14 @@ public:
* Subclasses of vtkRenderer that can deal with depth peeling must
* override this method.
*/
- void DeviceRenderTranslucentPolygonalGeometry() VTK_OVERRIDE;
+ void DeviceRenderTranslucentPolygonalGeometry() override;
- void Clear(void) VTK_OVERRIDE;
+ void Clear(void) override;
/**
* Ask lights to load themselves into graphics pipeline.
*/
- int UpdateLights(void) VTK_OVERRIDE;
+ int UpdateLights(void) override;
/**
* Is rendering at translucent geometry stage using depth peeling and
@@ -95,7 +95,7 @@ public:
protected:
vtkOpenGLRenderer();
- ~vtkOpenGLRenderer() VTK_OVERRIDE;
+ ~vtkOpenGLRenderer() override;
/**
* Check the compilation status of some fragment shader source.
@@ -103,24 +103,24 @@ protected:
void CheckCompilation(unsigned int fragmentShader);
// Internal method to release graphics resources in any derived renderers.
- void ReleaseGraphicsResources(vtkWindow *w) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *w) override;
/**
* Ask all props to update and draw any opaque and translucent
* geometry. This includes both vtkActors and vtkVolumes
* Returns the number of props that rendered geometry.
*/
- int UpdateGeometry() VTK_OVERRIDE;
+ int UpdateGeometry() override;
// Picking functions to be implemented by sub-classes
- void DevicePickRender() VTK_OVERRIDE;
- void StartPick(unsigned int pickFromSize) VTK_OVERRIDE;
- void UpdatePickId() VTK_OVERRIDE;
- void DonePick() VTK_OVERRIDE;
- unsigned int GetPickedId() VTK_OVERRIDE;
- unsigned int GetNumPickedIds() VTK_OVERRIDE;
- int GetPickedIds(unsigned int atMost, unsigned int *callerBuffer) VTK_OVERRIDE;
- double GetPickedZ() VTK_OVERRIDE;
+ void DevicePickRender() override;
+ void StartPick(unsigned int pickFromSize) override;
+ void UpdatePickId() override;
+ void DonePick() override;
+ unsigned int GetPickedId() override;
+ unsigned int GetNumPickedIds() override;
+ int GetPickedIds(unsigned int atMost, unsigned int *callerBuffer) override;
+ double GetPickedZ() override;
// Ivars used in picking
class vtkGLPickInfo* PickInfo;
diff --git a/Rendering/OpenGL2/vtkOpenGLResourceFreeCallback.h b/Rendering/OpenGL2/vtkOpenGLResourceFreeCallback.h
index c3b449dc91c8fb2243f326903987c9b2452db0f3..03fb57d155fc6113d18a71b5bdadecf06719e9ac 100644
--- a/Rendering/OpenGL2/vtkOpenGLResourceFreeCallback.h
+++ b/Rendering/OpenGL2/vtkOpenGLResourceFreeCallback.h
@@ -54,9 +54,9 @@ public:
this->Method = method;
}
- ~vtkOpenGLResourceFreeCallback() VTK_OVERRIDE { }
+ ~vtkOpenGLResourceFreeCallback() override { }
- void RegisterGraphicsResources(vtkOpenGLRenderWindow *rw) VTK_OVERRIDE {
+ void RegisterGraphicsResources(vtkOpenGLRenderWindow *rw) override {
if (this->VTKWindow == rw)
{
return;
@@ -73,7 +73,7 @@ public:
}
// Called when the event is invoked
- void Release() VTK_OVERRIDE
+ void Release() override
{
if (this->VTKWindow && this->Handler && !this->Releasing)
{
diff --git a/Rendering/OpenGL2/vtkOpenGLShaderCache.h b/Rendering/OpenGL2/vtkOpenGLShaderCache.h
index 64c3832e624635724fe4a1e6f77a9b9f03b1276e..5dd35ce895ad0f1de74898ee086f913ba3cac289 100644
--- a/Rendering/OpenGL2/vtkOpenGLShaderCache.h
+++ b/Rendering/OpenGL2/vtkOpenGLShaderCache.h
@@ -36,7 +36,7 @@ class VTKRENDERINGOPENGL2_EXPORT vtkOpenGLShaderCache : public vtkObject
public:
static vtkOpenGLShaderCache *New();
vtkTypeMacro(vtkOpenGLShaderCache, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
// make sure the specified shaders are compiled, linked, and bound
virtual vtkShaderProgram *ReadyShaderProgram(
@@ -77,7 +77,7 @@ public:
protected:
vtkOpenGLShaderCache();
- ~vtkOpenGLShaderCache() VTK_OVERRIDE;
+ ~vtkOpenGLShaderCache() override;
// perform System and Output replacments in place. Returns
// the number of outputs
diff --git a/Rendering/OpenGL2/vtkOpenGLSkybox.h b/Rendering/OpenGL2/vtkOpenGLSkybox.h
index b6d26e99eaffb732c4a97b1f40a07f00b646a659..ab15c1b2a5ee047d4f84dc881e085fde4798d8ad 100644
--- a/Rendering/OpenGL2/vtkOpenGLSkybox.h
+++ b/Rendering/OpenGL2/vtkOpenGLSkybox.h
@@ -39,18 +39,18 @@ class VTKRENDERINGOPENGL2_EXPORT vtkOpenGLSkybox : public vtkSkybox
public:
static vtkOpenGLSkybox *New();
vtkTypeMacro(vtkOpenGLSkybox, vtkSkybox);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Actual Skybox render method.
*/
- void Render(vtkRenderer *ren, vtkMapper *mapper) VTK_OVERRIDE;
+ void Render(vtkRenderer *ren, vtkMapper *mapper) override;
void GetKeyMatrices(vtkMatrix4x4 *&WCVCMatrix, vtkMatrix3x3 *&normalMatrix);
protected:
vtkOpenGLSkybox();
- ~vtkOpenGLSkybox() VTK_OVERRIDE;
+ ~vtkOpenGLSkybox() override;
vtkMatrix4x4 *MCWCMatrix;
vtkMatrix3x3 *NormalMatrix;
diff --git a/Rendering/OpenGL2/vtkOpenGLSphereMapper.h b/Rendering/OpenGL2/vtkOpenGLSphereMapper.h
index 80077264b2f389a0a37f818f80c09e7345f2d5f9..787dc6d076dc9d2ac08feca888aa14435519a3fb 100644
--- a/Rendering/OpenGL2/vtkOpenGLSphereMapper.h
+++ b/Rendering/OpenGL2/vtkOpenGLSphereMapper.h
@@ -30,7 +30,7 @@ class VTKRENDERINGOPENGL2_EXPORT vtkOpenGLSphereMapper : public vtkOpenGLPolyDat
public:
static vtkOpenGLSphereMapper* New();
vtkTypeMacro(vtkOpenGLSphereMapper, vtkOpenGLPolyDataMapper)
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -50,49 +50,49 @@ public:
/**
* This calls RenderPiece (twice when transparent)
*/
- void Render(vtkRenderer *ren, vtkActor *act) VTK_OVERRIDE;
+ void Render(vtkRenderer *ren, vtkActor *act) override;
protected:
vtkOpenGLSphereMapper();
- ~vtkOpenGLSphereMapper() VTK_OVERRIDE;
+ ~vtkOpenGLSphereMapper() override;
/**
* Create the basic shaders before replacement
*/
void GetShaderTemplate(
std::map<vtkShader::Type, vtkShader *> shaders,
- vtkRenderer *ren, vtkActor *act) VTK_OVERRIDE;
+ vtkRenderer *ren, vtkActor *act) override;
/**
* Perform string replacments on the shader templates
*/
void ReplaceShaderValues(
std::map<vtkShader::Type, vtkShader *> shaders,
- vtkRenderer *ren, vtkActor *act) VTK_OVERRIDE;
+ vtkRenderer *ren, vtkActor *act) override;
/**
* Set the shader parameters related to the Camera
*/
- void SetCameraShaderParameters(vtkOpenGLHelper &cellBO, vtkRenderer *ren, vtkActor *act) VTK_OVERRIDE;
+ void SetCameraShaderParameters(vtkOpenGLHelper &cellBO, vtkRenderer *ren, vtkActor *act) override;
/**
* Set the shader parameters related to the actor/mapper
*/
- void SetMapperShaderParameters(vtkOpenGLHelper &cellBO, vtkRenderer *ren, vtkActor *act) VTK_OVERRIDE;
+ void SetMapperShaderParameters(vtkOpenGLHelper &cellBO, vtkRenderer *ren, vtkActor *act) override;
const char *ScaleArray;
/**
* Does the VBO/IBO need to be rebuilt
*/
- bool GetNeedToRebuildBufferObjects(vtkRenderer *ren, vtkActor *act) VTK_OVERRIDE;
+ bool GetNeedToRebuildBufferObjects(vtkRenderer *ren, vtkActor *act) override;
/**
* Update the VBO to contain point based values
*/
- void BuildBufferObjects(vtkRenderer *ren, vtkActor *act) VTK_OVERRIDE;
+ void BuildBufferObjects(vtkRenderer *ren, vtkActor *act) override;
- void RenderPieceDraw(vtkRenderer *ren, vtkActor *act) VTK_OVERRIDE;
+ void RenderPieceDraw(vtkRenderer *ren, vtkActor *act) override;
virtual void CreateVBO(
float * points, vtkIdType numPts,
diff --git a/Rendering/OpenGL2/vtkOpenGLStickMapper.h b/Rendering/OpenGL2/vtkOpenGLStickMapper.h
index 42cc5936232fa0c8455adcf5261d9a546ee31b5f..2c6a348f12e894bee3bce6bfa8257ff3e13e257f 100644
--- a/Rendering/OpenGL2/vtkOpenGLStickMapper.h
+++ b/Rendering/OpenGL2/vtkOpenGLStickMapper.h
@@ -30,7 +30,7 @@ class VTKRENDERINGOPENGL2_EXPORT vtkOpenGLStickMapper : public vtkOpenGLPolyData
public:
static vtkOpenGLStickMapper* New();
vtkTypeMacro(vtkOpenGLStickMapper, vtkOpenGLPolyDataMapper)
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -55,31 +55,31 @@ public:
protected:
vtkOpenGLStickMapper();
- ~vtkOpenGLStickMapper() VTK_OVERRIDE;
+ ~vtkOpenGLStickMapper() override;
/**
* Create the basic shaders before replacement
*/
void GetShaderTemplate(
std::map<vtkShader::Type, vtkShader *> shaders,
- vtkRenderer *ren, vtkActor *act) VTK_OVERRIDE;
+ vtkRenderer *ren, vtkActor *act) override;
/**
* Perform string replacments on the shader templates
*/
void ReplaceShaderValues(
std::map<vtkShader::Type, vtkShader *> shaders,
- vtkRenderer *ren, vtkActor *act) VTK_OVERRIDE;
+ vtkRenderer *ren, vtkActor *act) override;
/**
* Set the shader parameters related to the Camera
*/
- void SetCameraShaderParameters(vtkOpenGLHelper &cellBO, vtkRenderer *ren, vtkActor *act) VTK_OVERRIDE;
+ void SetCameraShaderParameters(vtkOpenGLHelper &cellBO, vtkRenderer *ren, vtkActor *act) override;
/**
* Set the shader parameters related to the actor/mapper
*/
- void SetMapperShaderParameters(vtkOpenGLHelper &cellBO, vtkRenderer *ren, vtkActor *act) VTK_OVERRIDE;
+ void SetMapperShaderParameters(vtkOpenGLHelper &cellBO, vtkRenderer *ren, vtkActor *act) override;
const char *ScaleArray;
const char *OrientationArray;
@@ -88,14 +88,14 @@ protected:
/**
* Does the VBO/IBO need to be rebuilt
*/
- bool GetNeedToRebuildBufferObjects(vtkRenderer *ren, vtkActor *act) VTK_OVERRIDE;
+ bool GetNeedToRebuildBufferObjects(vtkRenderer *ren, vtkActor *act) override;
/**
* Update the VBO to contain point based values
*/
- void BuildBufferObjects(vtkRenderer *ren, vtkActor *act) VTK_OVERRIDE;
+ void BuildBufferObjects(vtkRenderer *ren, vtkActor *act) override;
- void RenderPieceDraw(vtkRenderer *ren, vtkActor *act) VTK_OVERRIDE;
+ void RenderPieceDraw(vtkRenderer *ren, vtkActor *act) override;
private:
vtkOpenGLStickMapper(const vtkOpenGLStickMapper&) VTK_DELETE_FUNCTION;
diff --git a/Rendering/OpenGL2/vtkOpenGLTextActor.h b/Rendering/OpenGL2/vtkOpenGLTextActor.h
index 44c06552647b4d2083cdef15121ff72531684991..7611db83cde6f18ba9f4fb3a6ceb6bb07e6704b2 100644
--- a/Rendering/OpenGL2/vtkOpenGLTextActor.h
+++ b/Rendering/OpenGL2/vtkOpenGLTextActor.h
@@ -31,13 +31,13 @@ class VTKRENDERINGOPENGL2_EXPORT vtkOpenGLTextActor: public vtkTextActor
public:
static vtkOpenGLTextActor* New();
vtkTypeMacro(vtkOpenGLTextActor, vtkTextActor)
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
- int RenderOverlay(vtkViewport* viewport) VTK_OVERRIDE;
+ int RenderOverlay(vtkViewport* viewport) override;
protected:
vtkOpenGLTextActor();
- ~vtkOpenGLTextActor() VTK_OVERRIDE;
+ ~vtkOpenGLTextActor() override;
int RenderGL2PS(vtkViewport *viewport, vtkOpenGLGL2PSHelper *gl2ps);
diff --git a/Rendering/OpenGL2/vtkOpenGLTextActor3D.h b/Rendering/OpenGL2/vtkOpenGLTextActor3D.h
index 1e6a842f8138ca9c50ab0829e3c4bcbb3426ea29..24bb8ac544a2c1806e74d994f4447750f67b7645 100644
--- a/Rendering/OpenGL2/vtkOpenGLTextActor3D.h
+++ b/Rendering/OpenGL2/vtkOpenGLTextActor3D.h
@@ -31,13 +31,13 @@ class VTKRENDERINGOPENGL2_EXPORT vtkOpenGLTextActor3D: public vtkTextActor3D
public:
static vtkOpenGLTextActor3D* New();
vtkTypeMacro(vtkOpenGLTextActor3D, vtkTextActor3D)
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
- int RenderTranslucentPolygonalGeometry(vtkViewport* viewport) VTK_OVERRIDE;
+ int RenderTranslucentPolygonalGeometry(vtkViewport* viewport) override;
protected:
vtkOpenGLTextActor3D();
- ~vtkOpenGLTextActor3D() VTK_OVERRIDE;
+ ~vtkOpenGLTextActor3D() override;
int RenderGL2PS(vtkViewport *vp, vtkOpenGLGL2PSHelper *gl2ps);
diff --git a/Rendering/OpenGL2/vtkOpenGLTextMapper.h b/Rendering/OpenGL2/vtkOpenGLTextMapper.h
index ad693f2db771fbcbf5aadb31dd792263a42595b3..054cfd2c3bfd797cec3489e336801ee9a2b652ba 100644
--- a/Rendering/OpenGL2/vtkOpenGLTextMapper.h
+++ b/Rendering/OpenGL2/vtkOpenGLTextMapper.h
@@ -31,13 +31,13 @@ class VTKRENDERINGOPENGL2_EXPORT vtkOpenGLTextMapper: public vtkTextMapper
public:
static vtkOpenGLTextMapper* New();
vtkTypeMacro(vtkOpenGLTextMapper, vtkTextMapper)
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
- void RenderOverlay(vtkViewport *vp, vtkActor2D *act) VTK_OVERRIDE;
+ void RenderOverlay(vtkViewport *vp, vtkActor2D *act) override;
protected:
vtkOpenGLTextMapper();
- ~vtkOpenGLTextMapper() VTK_OVERRIDE;
+ ~vtkOpenGLTextMapper() override;
void RenderGL2PS(vtkViewport *vp, vtkActor2D *act,
vtkOpenGLGL2PSHelper *gl2ps);
diff --git a/Rendering/OpenGL2/vtkOpenGLTexture.h b/Rendering/OpenGL2/vtkOpenGLTexture.h
index 991e6524f34adef515f1d877651affb290039aaf..2740df6f46ac29a1692e72f904554991f56587c3 100644
--- a/Rendering/OpenGL2/vtkOpenGLTexture.h
+++ b/Rendering/OpenGL2/vtkOpenGLTexture.h
@@ -35,23 +35,23 @@ class VTKRENDERINGOPENGL2_EXPORT vtkOpenGLTexture : public vtkTexture
public:
static vtkOpenGLTexture *New();
vtkTypeMacro(vtkOpenGLTexture, vtkTexture);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Renders a texture map. It first checks the object's modified time
* to make sure the texture maps Input is valid, then it invokes the
* Load() method.
*/
- void Render(vtkRenderer* ren) VTK_OVERRIDE;
+ void Render(vtkRenderer* ren) override;
/**
* Implement base class method.
*/
- void Load(vtkRenderer*) VTK_OVERRIDE;
+ void Load(vtkRenderer*) override;
// Descsription:
// Clean up after the rendering is complete.
- void PostRender(vtkRenderer*) VTK_OVERRIDE;
+ void PostRender(vtkRenderer*) override;
/**
* Release any graphics resources that are being consumed by this texture.
@@ -59,7 +59,7 @@ public:
* resources to release. Using the same texture object in multiple
* render windows is NOT currently supported.
*/
- void ReleaseGraphicsResources(vtkWindow*) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow*) override;
/**
* copy the renderers read buffer into this texture
@@ -88,7 +88,7 @@ public:
/**
* Return the texture unit used for this texture
*/
- int GetTextureUnit() VTK_OVERRIDE;
+ int GetTextureUnit() override;
/**
* Is this Texture Translucent?
@@ -96,11 +96,11 @@ public:
* only fully transparent pixels and fully opaque pixels and the
* Interpolate flag is turn off.
*/
- int IsTranslucent() VTK_OVERRIDE;
+ int IsTranslucent() override;
protected:
vtkOpenGLTexture();
- ~vtkOpenGLTexture() VTK_OVERRIDE;
+ ~vtkOpenGLTexture() override;
vtkTimeStamp LoadTime;
vtkWeakPointer<vtkRenderWindow> RenderWindow; // RenderWindow used for previous render
diff --git a/Rendering/OpenGL2/vtkOpenGLVertexArrayObject.h b/Rendering/OpenGL2/vtkOpenGLVertexArrayObject.h
index 32b0911f638cd15045190a3123b3696ca5ddda43..84ee93f2ba5fd4a14ca88ff5bc4681ea8356a94a 100644
--- a/Rendering/OpenGL2/vtkOpenGLVertexArrayObject.h
+++ b/Rendering/OpenGL2/vtkOpenGLVertexArrayObject.h
@@ -38,7 +38,7 @@ class VTKRENDERINGOPENGL2_EXPORT vtkOpenGLVertexArrayObject : public vtkObject
public:
static vtkOpenGLVertexArrayObject* New();
vtkTypeMacro(vtkOpenGLVertexArrayObject, vtkObject)
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
void Bind();
@@ -82,7 +82,7 @@ public:
protected:
vtkOpenGLVertexArrayObject();
- ~vtkOpenGLVertexArrayObject() VTK_OVERRIDE;
+ ~vtkOpenGLVertexArrayObject() override;
private:
vtkOpenGLVertexArrayObject(
diff --git a/Rendering/OpenGL2/vtkOpenGLVertexBufferObject.h b/Rendering/OpenGL2/vtkOpenGLVertexBufferObject.h
index 421a7e3a0eb3bf4f3a97bb9f43b09ac2374d79e9..e28039e337aa62555c8bedfe91484cb3102d7328 100644
--- a/Rendering/OpenGL2/vtkOpenGLVertexBufferObject.h
+++ b/Rendering/OpenGL2/vtkOpenGLVertexBufferObject.h
@@ -41,7 +41,7 @@ class VTKRENDERINGOPENGL2_EXPORT vtkOpenGLVertexBufferObject :
public:
static vtkOpenGLVertexBufferObject *New();
vtkTypeMacro(vtkOpenGLVertexBufferObject, vtkOpenGLBufferObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
// set the VBOs data to the provided data array and upload
// this can use a fast path of just passing the
@@ -148,7 +148,7 @@ public:
protected:
vtkOpenGLVertexBufferObject();
- ~vtkOpenGLVertexBufferObject() VTK_OVERRIDE;
+ ~vtkOpenGLVertexBufferObject() override;
std::vector<float> PackedVBO; // the data
diff --git a/Rendering/OpenGL2/vtkOpenGLVertexBufferObjectCache.h b/Rendering/OpenGL2/vtkOpenGLVertexBufferObjectCache.h
index 0340d5c18e5b5446b07b79faa167423ecd38a1a0..f398c41363af330ea1316e9a4fcf34471763fd03 100644
--- a/Rendering/OpenGL2/vtkOpenGLVertexBufferObjectCache.h
+++ b/Rendering/OpenGL2/vtkOpenGLVertexBufferObjectCache.h
@@ -40,7 +40,7 @@ class VTKRENDERINGOPENGL2_EXPORT vtkOpenGLVertexBufferObjectCache : public vtkOb
public:
static vtkOpenGLVertexBufferObjectCache *New();
vtkTypeMacro(vtkOpenGLVertexBufferObjectCache, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Returns the vertex buffer object which holds the
diff --git a/Rendering/OpenGL2/vtkOpenGLVertexBufferObjectGroup.h b/Rendering/OpenGL2/vtkOpenGLVertexBufferObjectGroup.h
index 8f0426d781ba3076887ae866088bcdbcdf82bd5e..6985edb6d2cd67391f5816bc609a9ea1f55b5173 100644
--- a/Rendering/OpenGL2/vtkOpenGLVertexBufferObjectGroup.h
+++ b/Rendering/OpenGL2/vtkOpenGLVertexBufferObjectGroup.h
@@ -78,7 +78,7 @@ class VTKRENDERINGOPENGL2_EXPORT vtkOpenGLVertexBufferObjectGroup : public vtkOb
public:
static vtkOpenGLVertexBufferObjectGroup *New();
vtkTypeMacro(vtkOpenGLVertexBufferObjectGroup, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Returns the number of components for this attribute
@@ -163,7 +163,7 @@ public:
/**
* Get the mtime of this groups VBOs
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
protected:
vtkOpenGLVertexBufferObjectGroup();
diff --git a/Rendering/OpenGL2/vtkOverlayPass.h b/Rendering/OpenGL2/vtkOverlayPass.h
index c4f267f9b121b1a25afd0e01298be53d88aa2aea..89697f918b84b0f6a2971a86c3ebec5cea0299dd 100644
--- a/Rendering/OpenGL2/vtkOverlayPass.h
+++ b/Rendering/OpenGL2/vtkOverlayPass.h
@@ -39,13 +39,13 @@ class VTKRENDERINGOPENGL2_EXPORT vtkOverlayPass : public vtkDefaultPass
public:
static vtkOverlayPass *New();
vtkTypeMacro(vtkOverlayPass,vtkDefaultPass);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Perform rendering according to a render state \p s.
* \pre s_exists: s!=0
*/
- void Render(const vtkRenderState *s) VTK_OVERRIDE;
+ void Render(const vtkRenderState *s) override;
protected:
/**
@@ -56,7 +56,7 @@ public:
/**
* Destructor.
*/
- ~vtkOverlayPass() VTK_OVERRIDE;
+ ~vtkOverlayPass() override;
private:
vtkOverlayPass(const vtkOverlayPass&) VTK_DELETE_FUNCTION;
diff --git a/Rendering/OpenGL2/vtkPixelBufferObject.h b/Rendering/OpenGL2/vtkPixelBufferObject.h
index 31006d07aa53cc74745bad48f91accf12451dbf4..27488c2fae09231ca0c8c8d3da691fc35c49948c 100644
--- a/Rendering/OpenGL2/vtkPixelBufferObject.h
+++ b/Rendering/OpenGL2/vtkPixelBufferObject.h
@@ -61,7 +61,7 @@ public:
static vtkPixelBufferObject* New();
vtkTypeMacro(vtkPixelBufferObject, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -355,7 +355,7 @@ public:
protected:
vtkPixelBufferObject();
- ~vtkPixelBufferObject() VTK_OVERRIDE;
+ ~vtkPixelBufferObject() override;
/**
* Loads all required OpenGL extensions. Must be called every time a new
diff --git a/Rendering/OpenGL2/vtkPointFillPass.h b/Rendering/OpenGL2/vtkPointFillPass.h
index c2c7cc74eac659678c437769804c9a8f2ca79d3c..734d9007166f186f11d6b4be582eff69ffe2b681 100644
--- a/Rendering/OpenGL2/vtkPointFillPass.h
+++ b/Rendering/OpenGL2/vtkPointFillPass.h
@@ -42,20 +42,20 @@ class VTKRENDERINGOPENGL2_EXPORT vtkPointFillPass : public vtkDepthImageProcessi
public:
static vtkPointFillPass *New();
vtkTypeMacro(vtkPointFillPass,vtkDepthImageProcessingPass);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Perform rendering according to a render state \p s.
* \pre s_exists: s!=0
*/
- void Render(const vtkRenderState *s) VTK_OVERRIDE;
+ void Render(const vtkRenderState *s) override;
/**
* Release graphics resources and ask components to release their own
* resources.
* \pre w_exists: w!=0
*/
- void ReleaseGraphicsResources(vtkWindow *w) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *w) override;
//@{
/**
@@ -88,7 +88,7 @@ public:
/**
* Destructor.
*/
- ~vtkPointFillPass() VTK_OVERRIDE;
+ ~vtkPointFillPass() override;
/**
* Graphics resources.
diff --git a/Rendering/OpenGL2/vtkRenderPassCollection.h b/Rendering/OpenGL2/vtkRenderPassCollection.h
index 1c8c06eefbe33963d4ce77ef60fed51474d8af4c..9d432e07118a5661a7029f60482eb5fd7a0a28d9 100644
--- a/Rendering/OpenGL2/vtkRenderPassCollection.h
+++ b/Rendering/OpenGL2/vtkRenderPassCollection.h
@@ -37,7 +37,7 @@ class VTKRENDERINGOPENGL2_EXPORT vtkRenderPassCollection : public vtkCollection
public:
static vtkRenderPassCollection *New();
vtkTypeMacro(vtkRenderPassCollection,vtkCollection);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Add an RenderPass to the bottom of the list.
@@ -62,7 +62,7 @@ class VTKRENDERINGOPENGL2_EXPORT vtkRenderPassCollection : public vtkCollection
protected:
vtkRenderPassCollection();
- ~vtkRenderPassCollection() VTK_OVERRIDE;
+ ~vtkRenderPassCollection() override;
private:
// hide the standard AddItem from the user and the compiler.
diff --git a/Rendering/OpenGL2/vtkRenderStepsPass.h b/Rendering/OpenGL2/vtkRenderStepsPass.h
index 4aebe1f68a2350e83bf2e7d7c9f8b8ab39d92db6..e682f6d4f3333456a306000fb3b1729e8533647d 100644
--- a/Rendering/OpenGL2/vtkRenderStepsPass.h
+++ b/Rendering/OpenGL2/vtkRenderStepsPass.h
@@ -44,20 +44,20 @@ class VTKRENDERINGOPENGL2_EXPORT vtkRenderStepsPass : public vtkRenderPass
public:
static vtkRenderStepsPass *New();
vtkTypeMacro(vtkRenderStepsPass,vtkRenderPass);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Perform rendering according to a render state \p s.
* \pre s_exists: s!=0
*/
- void Render(const vtkRenderState *s) VTK_OVERRIDE;
+ void Render(const vtkRenderState *s) override;
/**
* Release graphics resources and ask components to release their own
* resources.
* \pre w_exists: w!=0
*/
- void ReleaseGraphicsResources(vtkWindow *w) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *w) override;
//@{
/**
@@ -117,7 +117,7 @@ public:
protected:
vtkRenderStepsPass();
- ~vtkRenderStepsPass() VTK_OVERRIDE;
+ ~vtkRenderStepsPass() override;
vtkCameraPass *CameraPass;
vtkRenderPass *LightsPass;
diff --git a/Rendering/OpenGL2/vtkRenderbuffer.h b/Rendering/OpenGL2/vtkRenderbuffer.h
index 2b865ff35e2e0b03b98052e3f343aed11942b4df..0cb40ba039315166b15281fb6ac52f4519bfc046 100644
--- a/Rendering/OpenGL2/vtkRenderbuffer.h
+++ b/Rendering/OpenGL2/vtkRenderbuffer.h
@@ -34,7 +34,7 @@ class VTKRENDERINGOPENGL2_EXPORT vtkRenderbuffer : public vtkObject
public:
static vtkRenderbuffer* New();
vtkTypeMacro(vtkRenderbuffer, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Returns if the context supports the required extensions.
@@ -108,7 +108,7 @@ public:
protected:
vtkRenderbuffer();
- ~vtkRenderbuffer() VTK_OVERRIDE;
+ ~vtkRenderbuffer() override;
bool LoadRequiredExtensions(vtkRenderWindow *renWin);
void Alloc();
diff --git a/Rendering/OpenGL2/vtkSSAAPass.h b/Rendering/OpenGL2/vtkSSAAPass.h
index fb22ed2bc54fda59ea9c186c8f3419113de7a38a..25bbf20c8b62f6878f2406db1b767cd0aa59e39a 100644
--- a/Rendering/OpenGL2/vtkSSAAPass.h
+++ b/Rendering/OpenGL2/vtkSSAAPass.h
@@ -49,20 +49,20 @@ class VTKRENDERINGOPENGL2_EXPORT vtkSSAAPass : public vtkRenderPass
public:
static vtkSSAAPass *New();
vtkTypeMacro(vtkSSAAPass,vtkRenderPass);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Perform rendering according to a render state \p s.
* \pre s_exists: s!=0
*/
- void Render(const vtkRenderState *s) VTK_OVERRIDE;
+ void Render(const vtkRenderState *s) override;
/**
* Release graphics resources and ask components to release their own
* resources.
* \pre w_exists: w!=0
*/
- void ReleaseGraphicsResources(vtkWindow *w) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *w) override;
//@{
/**
@@ -84,7 +84,7 @@ public:
/**
* Destructor.
*/
- ~vtkSSAAPass() VTK_OVERRIDE;
+ ~vtkSSAAPass() override;
/**
* Graphics resources.
diff --git a/Rendering/OpenGL2/vtkSequencePass.h b/Rendering/OpenGL2/vtkSequencePass.h
index 263a0b1cf0fa5d1706408996ca600ed912adbebd..1749dc3b0b271d617d780976651a395b55c19680 100644
--- a/Rendering/OpenGL2/vtkSequencePass.h
+++ b/Rendering/OpenGL2/vtkSequencePass.h
@@ -40,20 +40,20 @@ class VTKRENDERINGOPENGL2_EXPORT vtkSequencePass : public vtkRenderPass
public:
static vtkSequencePass *New();
vtkTypeMacro(vtkSequencePass,vtkRenderPass);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Perform rendering according to a render state \p s.
* \pre s_exists: s!=0
*/
- void Render(const vtkRenderState *s) VTK_OVERRIDE;
+ void Render(const vtkRenderState *s) override;
/**
* Release graphics resources and ask components to release their own
* resources.
* \pre w_exists: w!=0
*/
- void ReleaseGraphicsResources(vtkWindow *w) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *w) override;
//@{
/**
@@ -70,7 +70,7 @@ protected:
vtkRenderPassCollection *Passes;
vtkSequencePass();
- ~vtkSequencePass() VTK_OVERRIDE;
+ ~vtkSequencePass() override;
private:
vtkSequencePass(const vtkSequencePass&) VTK_DELETE_FUNCTION;
diff --git a/Rendering/OpenGL2/vtkShader.h b/Rendering/OpenGL2/vtkShader.h
index 2cd6ef59e3890a8a5242b96158d36f2d42418daa..047d1672542734218e27d298f615a193f14c97d2 100644
--- a/Rendering/OpenGL2/vtkShader.h
+++ b/Rendering/OpenGL2/vtkShader.h
@@ -39,7 +39,7 @@ class VTKRENDERINGOPENGL2_EXPORT vtkShader : public vtkObject
public:
static vtkShader *New();
vtkTypeMacro(vtkShader, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/** Available shader types. */
@@ -81,7 +81,7 @@ public:
protected:
vtkShader();
- ~vtkShader() VTK_OVERRIDE;
+ ~vtkShader() override;
Type ShaderType;
int Handle;
diff --git a/Rendering/OpenGL2/vtkShaderProgram.h b/Rendering/OpenGL2/vtkShaderProgram.h
index 935bbad648bc8a5c5165524edcaa011f7c4bf056..b7b5ffcc8a973b3f37772fe56aa4889dadc4b911 100644
--- a/Rendering/OpenGL2/vtkShaderProgram.h
+++ b/Rendering/OpenGL2/vtkShaderProgram.h
@@ -46,7 +46,7 @@ class VTKRENDERINGOPENGL2_EXPORT vtkShaderProgram : public vtkObject
public:
static vtkShaderProgram *New();
vtkTypeMacro(vtkShaderProgram, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -270,7 +270,7 @@ public:
protected:
vtkShaderProgram();
- ~vtkShaderProgram() VTK_OVERRIDE;
+ ~vtkShaderProgram() override;
/***************************************************************
* The following functions are only for use by the shader cache
diff --git a/Rendering/OpenGL2/vtkShadowMapBakerPass.h b/Rendering/OpenGL2/vtkShadowMapBakerPass.h
index c976f688e326b7c805701eddbfb634640359a7a0..00c4b4b40a362da897eb37e16a1418d712af8e17 100644
--- a/Rendering/OpenGL2/vtkShadowMapBakerPass.h
+++ b/Rendering/OpenGL2/vtkShadowMapBakerPass.h
@@ -58,20 +58,20 @@ class VTKRENDERINGOPENGL2_EXPORT vtkShadowMapBakerPass : public vtkRenderPass
public:
static vtkShadowMapBakerPass *New();
vtkTypeMacro(vtkShadowMapBakerPass,vtkRenderPass);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Perform rendering according to a render state \p s.
* \pre s_exists: s!=0
*/
- void Render(const vtkRenderState *s) VTK_OVERRIDE;
+ void Render(const vtkRenderState *s) override;
/**
* Release graphics resources and ask components to release their own
* resources.
* \pre w_exists: w!=0
*/
- void ReleaseGraphicsResources(vtkWindow *w) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *w) override;
//@{
/**
@@ -167,7 +167,7 @@ public:
/**
* Destructor.
*/
- ~vtkShadowMapBakerPass() VTK_OVERRIDE;
+ ~vtkShadowMapBakerPass() override;
/**
* Helper method to compute the mNearest point in a given direction.
diff --git a/Rendering/OpenGL2/vtkShadowMapPass.h b/Rendering/OpenGL2/vtkShadowMapPass.h
index 375bb2d7ccd6ad390a20d487fa7975d9a9361d06..7a0b33589b442238c7709b13cc55018aa1fbf640 100644
--- a/Rendering/OpenGL2/vtkShadowMapPass.h
+++ b/Rendering/OpenGL2/vtkShadowMapPass.h
@@ -62,20 +62,20 @@ class VTKRENDERINGOPENGL2_EXPORT vtkShadowMapPass : public vtkOpenGLRenderPass
public:
static vtkShadowMapPass *New();
vtkTypeMacro(vtkShadowMapPass,vtkOpenGLRenderPass);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Perform rendering according to a render state \p s.
* \pre s_exists: s!=0
*/
- void Render(const vtkRenderState *s) VTK_OVERRIDE;
+ void Render(const vtkRenderState *s) override;
/**
* Release graphics resources and ask components to release their own
* resources.
* \pre w_exists: w!=0
*/
- void ReleaseGraphicsResources(vtkWindow *w) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *w) override;
//@{
/**
@@ -132,15 +132,15 @@ public:
std::string &geometryShader,
std::string &fragmentShader,
vtkAbstractMapper *mapper,
- vtkProp *prop) VTK_OVERRIDE;
+ vtkProp *prop) override;
bool PostReplaceShaderValues(std::string &vertexShader,
std::string &geometryShader,
std::string &fragmentShader,
vtkAbstractMapper *mapper,
- vtkProp *prop) VTK_OVERRIDE;
+ vtkProp *prop) override;
bool SetShaderParameters(vtkShaderProgram *program,
vtkAbstractMapper *mapper, vtkProp *prop,
- vtkOpenGLVertexArrayObject* VAO = nullptr) VTK_OVERRIDE;
+ vtkOpenGLVertexArrayObject* VAO = nullptr) override;
protected:
/**
@@ -151,7 +151,7 @@ public:
/**
* Destructor.
*/
- ~vtkShadowMapPass() VTK_OVERRIDE;
+ ~vtkShadowMapPass() override;
/**
* Check if shadow mapping is supported by the current OpenGL context.
diff --git a/Rendering/OpenGL2/vtkSobelGradientMagnitudePass.h b/Rendering/OpenGL2/vtkSobelGradientMagnitudePass.h
index 0914769d4506bb093d41a95f87d0929f48606832..535b83cae66c92dee6b0e6eecc71055376deb8a2 100644
--- a/Rendering/OpenGL2/vtkSobelGradientMagnitudePass.h
+++ b/Rendering/OpenGL2/vtkSobelGradientMagnitudePass.h
@@ -75,20 +75,20 @@ class VTKRENDERINGOPENGL2_EXPORT vtkSobelGradientMagnitudePass : public vtkImage
public:
static vtkSobelGradientMagnitudePass *New();
vtkTypeMacro(vtkSobelGradientMagnitudePass,vtkImageProcessingPass);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Perform rendering according to a render state \p s.
* \pre s_exists: s!=0
*/
- void Render(const vtkRenderState *s) VTK_OVERRIDE;
+ void Render(const vtkRenderState *s) override;
/**
* Release graphics resources and ask components to release their own
* resources.
* \pre w_exists: w!=0
*/
- void ReleaseGraphicsResources(vtkWindow *w) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *w) override;
protected:
/**
@@ -99,7 +99,7 @@ public:
/**
* Destructor.
*/
- ~vtkSobelGradientMagnitudePass() VTK_OVERRIDE;
+ ~vtkSobelGradientMagnitudePass() override;
/**
* Graphics resources.
diff --git a/Rendering/OpenGL2/vtkTextureObject.h b/Rendering/OpenGL2/vtkTextureObject.h
index 6624fdfc4dee9999bb2a19fa7ee360ce7ff931cd..5069039301dbb5098f9d13e1ad3d2f2ab2546b71 100644
--- a/Rendering/OpenGL2/vtkTextureObject.h
+++ b/Rendering/OpenGL2/vtkTextureObject.h
@@ -104,7 +104,7 @@ public:
static vtkTextureObject* New();
vtkTypeMacro(vtkTextureObject, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -745,7 +745,7 @@ public:
protected:
vtkTextureObject();
- ~vtkTextureObject() VTK_OVERRIDE;
+ ~vtkTextureObject() override;
vtkGenericOpenGLResourceFreeCallback *ResourceCallback;
diff --git a/Rendering/OpenGL2/vtkTextureUnitManager.h b/Rendering/OpenGL2/vtkTextureUnitManager.h
index ce389d521d8fab4897914167a642e6043a2282d7..9a3e5ca2f98d86507b8adef6b833bb8da9cc3bf5 100644
--- a/Rendering/OpenGL2/vtkTextureUnitManager.h
+++ b/Rendering/OpenGL2/vtkTextureUnitManager.h
@@ -40,7 +40,7 @@ class VTKRENDERINGOPENGL2_EXPORT vtkTextureUnitManager : public vtkObject
public:
vtkTypeMacro(vtkTextureUnitManager,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkTextureUnitManager *New();
@@ -104,7 +104,7 @@ protected:
/**
* Destructor.
*/
- ~vtkTextureUnitManager() VTK_OVERRIDE;
+ ~vtkTextureUnitManager() override;
/**
* Delete the allocation table and check if it is not called before
diff --git a/Rendering/OpenGL2/vtkTransformFeedback.h b/Rendering/OpenGL2/vtkTransformFeedback.h
index eb905a442463436bb3521a18380c0cab067c0195..d88496e87ef6b6ac8767bdafec9818a1db33b77e 100644
--- a/Rendering/OpenGL2/vtkTransformFeedback.h
+++ b/Rendering/OpenGL2/vtkTransformFeedback.h
@@ -41,7 +41,7 @@ class VTKRENDERINGOPENGL2_EXPORT vtkTransformFeedback : public vtkObject
public:
static vtkTransformFeedback *New();
vtkTypeMacro(vtkTransformFeedback, vtkObject)
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
/**
* The role a captured varying fills. Useful for parsing later.
@@ -179,7 +179,7 @@ public:
protected:
vtkTransformFeedback();
- ~vtkTransformFeedback() VTK_OVERRIDE;
+ ~vtkTransformFeedback() override;
private:
vtkTransformFeedback(const vtkTransformFeedback &) VTK_DELETE_FUNCTION;
diff --git a/Rendering/OpenGL2/vtkTranslucentPass.h b/Rendering/OpenGL2/vtkTranslucentPass.h
index 585077199a031180853dad3575cd05b067e8138a..233a16031e3d2893f8be590f1310501c5a1120e4 100644
--- a/Rendering/OpenGL2/vtkTranslucentPass.h
+++ b/Rendering/OpenGL2/vtkTranslucentPass.h
@@ -39,13 +39,13 @@ class VTKRENDERINGOPENGL2_EXPORT vtkTranslucentPass : public vtkDefaultPass
public:
static vtkTranslucentPass *New();
vtkTypeMacro(vtkTranslucentPass,vtkDefaultPass);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Perform rendering according to a render state \p s.
* \pre s_exists: s!=0
*/
- void Render(const vtkRenderState *s) VTK_OVERRIDE;
+ void Render(const vtkRenderState *s) override;
protected:
/**
@@ -56,7 +56,7 @@ public:
/**
* Destructor.
*/
- ~vtkTranslucentPass() VTK_OVERRIDE;
+ ~vtkTranslucentPass() override;
private:
vtkTranslucentPass(const vtkTranslucentPass&) VTK_DELETE_FUNCTION;
diff --git a/Rendering/OpenGL2/vtkValuePass.h b/Rendering/OpenGL2/vtkValuePass.h
index fd4cf349b5878ad6742f25d400ad9c2638d23a79..61e24f8ab3a5608bfc7b3b04f7bda29ab6fc4476 100644
--- a/Rendering/OpenGL2/vtkValuePass.h
+++ b/Rendering/OpenGL2/vtkValuePass.h
@@ -68,7 +68,7 @@ public:
static vtkValuePass *New();
vtkTypeMacro(vtkValuePass, vtkOpenGLRenderPass);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
vtkSetMacro(RenderingMode, int);
vtkGetMacro(RenderingMode, int);
@@ -81,7 +81,7 @@ public:
* Perform rendering according to a render state \p s.
* \pre s_exists: s!=0
*/
- void Render(const vtkRenderState *s) VTK_OVERRIDE;
+ void Render(const vtkRenderState *s) override;
/**
* Interface to get the rendered image in FLOATING_POINT mode. Returns a
@@ -109,7 +109,7 @@ public:
*/
bool IsFloatingPointModeSupported();
- void ReleaseGraphicsResources(vtkWindow *win) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *win) override;
/**
* Convert an RGB triplet to a floating point value. This method is exposed
@@ -120,7 +120,7 @@ public:
protected:
vtkValuePass();
- ~vtkValuePass() VTK_OVERRIDE;
+ ~vtkValuePass() override;
///@{
/**
@@ -136,14 +136,14 @@ public:
std::string &geometryShader,
std::string &fragmentShader,
vtkAbstractMapper *mapper,
- vtkProp *prop) VTK_OVERRIDE;
+ vtkProp *prop) override;
/**
* Update the uniforms of the shader program.
* Return false on error.
*/
bool SetShaderParameters(vtkShaderProgram* program,
vtkAbstractMapper* mapper, vtkProp* prop,
- vtkOpenGLVertexArrayObject* VAO = nullptr) VTK_OVERRIDE;
+ vtkOpenGLVertexArrayObject* VAO = nullptr) override;
/**
* For multi-stage render passes that need to change shader code during a
* single pass, use this method to notify a mapper that the shader needs to be
@@ -151,7 +151,7 @@ public:
* return the last time that the shader stage changed, or 0 if the shader
* is single-stage.
*/
- vtkMTimeType GetShaderStageMTime() VTK_OVERRIDE;
+ vtkMTimeType GetShaderStageMTime() override;
///@}
/**
diff --git a/Rendering/OpenGL2/vtkVolumetricPass.h b/Rendering/OpenGL2/vtkVolumetricPass.h
index 13aadb22609ebc229394b907413c2d04d79a7db4..04963fbb65adc9052143740fc7b9d3b7e591d431 100644
--- a/Rendering/OpenGL2/vtkVolumetricPass.h
+++ b/Rendering/OpenGL2/vtkVolumetricPass.h
@@ -39,13 +39,13 @@ class VTKRENDERINGOPENGL2_EXPORT vtkVolumetricPass : public vtkDefaultPass
public:
static vtkVolumetricPass *New();
vtkTypeMacro(vtkVolumetricPass,vtkDefaultPass);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Perform rendering according to a render state \p s.
* \pre s_exists: s!=0
*/
- void Render(const vtkRenderState *s) VTK_OVERRIDE;
+ void Render(const vtkRenderState *s) override;
protected:
/**
@@ -56,7 +56,7 @@ public:
/**
* Destructor.
*/
- ~vtkVolumetricPass() VTK_OVERRIDE;
+ ~vtkVolumetricPass() override;
private:
vtkVolumetricPass(const vtkVolumetricPass&) VTK_DELETE_FUNCTION;
diff --git a/Rendering/OpenGL2/vtkXOpenGLRenderWindow.h b/Rendering/OpenGL2/vtkXOpenGLRenderWindow.h
index 644d7285f871cfd4eb72e332aceb608ce5b090ac..082372f6ad1ff545e7b04766db68dcc150f54d07 100644
--- a/Rendering/OpenGL2/vtkXOpenGLRenderWindow.h
+++ b/Rendering/OpenGL2/vtkXOpenGLRenderWindow.h
@@ -39,17 +39,17 @@ class VTKRENDERINGOPENGL2_EXPORT vtkXOpenGLRenderWindow : public vtkOpenGLRender
public:
static vtkXOpenGLRenderWindow *New();
vtkTypeMacro(vtkXOpenGLRenderWindow, vtkOpenGLRenderWindow);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Begin the rendering process.
*/
- void Start() VTK_OVERRIDE;
+ void Start() override;
/**
* End the rendering process and display the image.
*/
- void Frame() VTK_OVERRIDE;
+ void Frame() override;
/**
* Initialize the window for rendering.
@@ -62,24 +62,24 @@ public:
* should be possible to call them multiple times, even changing WindowId
* in-between. This is what WindowRemap does.
*/
- void Initialize() VTK_OVERRIDE;
+ void Initialize() override;
/**
* "Deinitialize" the rendering window. This will shutdown all system-specific
* resources. After having called this, it should be possible to destroy
* a window that was used for a SetWindowId() call without any ill effects.
*/
- void Finalize() VTK_OVERRIDE;
+ void Finalize() override;
/**
* Change the window to fill the entire screen.
*/
- void SetFullScreen(int) VTK_OVERRIDE;
+ void SetFullScreen(int) override;
/**
* Resize the window.
*/
- void WindowRemap() VTK_OVERRIDE;
+ void WindowRemap() override;
/**
* Set the preferred window size to full screen.
@@ -89,8 +89,8 @@ public:
/**
* Specify the size of the rendering window in pixels.
*/
- void SetSize(int,int) VTK_OVERRIDE;
- void SetSize(int a[2]) VTK_OVERRIDE { this->SetSize(a[0], a[1]); }
+ void SetSize(int,int) override;
+ void SetSize(int a[2]) override { this->SetSize(a[0], a[1]); }
//@{
/**
@@ -108,51 +108,51 @@ public:
* overrides the superclass method since this class can actually check
* whether the window has been realized yet.
*/
- void SetStereoCapableWindow(int capable) VTK_OVERRIDE;
+ void SetStereoCapableWindow(int capable) override;
/**
* Make this window the current OpenGL context.
*/
- void MakeCurrent() VTK_OVERRIDE;
+ void MakeCurrent() override;
/**
* Tells if this window is the current OpenGL context for the calling thread.
*/
- bool IsCurrent() VTK_OVERRIDE;
+ bool IsCurrent() override;
/**
* If called, allow MakeCurrent() to skip cache-check when called.
* MakeCurrent() reverts to original behavior of cache-checking
* on the next render.
*/
- void SetForceMakeCurrent() VTK_OVERRIDE;
+ void SetForceMakeCurrent() override;
/**
* Get report of capabilities for the render window
*/
- const char *ReportCapabilities() VTK_OVERRIDE;
+ const char *ReportCapabilities() override;
/**
* Is this render window using hardware acceleration? 0-false, 1-true
*/
- int IsDirect() VTK_OVERRIDE;
+ int IsDirect() override;
/**
* Xwindow get set functions
*/
- void *GetGenericDisplayId() VTK_OVERRIDE
+ void *GetGenericDisplayId() override
{
return this->GetDisplayId();
}
- void *GetGenericWindowId() VTK_OVERRIDE;
- void *GetGenericParentId() VTK_OVERRIDE
+ void *GetGenericWindowId() override;
+ void *GetGenericParentId() override
{
return reinterpret_cast<void *>(this->ParentId);
}
- void *GetGenericContext() VTK_OVERRIDE;
- void *GetGenericDrawable() VTK_OVERRIDE
+ void *GetGenericContext() override;
+ void *GetGenericDrawable() override
{
return reinterpret_cast<void *>(this->WindowId);
}
@@ -160,12 +160,12 @@ public:
/**
* Get the current size of the screen in pixels.
*/
- int *GetScreenSize() VTK_OVERRIDE;
+ int *GetScreenSize() override;
/**
* Get the position in screen coordinates (pixels) of the window.
*/
- int *GetPosition() VTK_OVERRIDE;
+ int *GetPosition() override;
/**
* Get this RenderWindow's X display id.
@@ -178,7 +178,7 @@ public:
* X display id.
*/
void SetDisplayId(Display *);
- void SetDisplayId(void *) VTK_OVERRIDE;
+ void SetDisplayId(void *) override;
//@}
/**
@@ -191,7 +191,7 @@ public:
* Sets the parent of the window that WILL BE created.
*/
void SetParentId(Window);
- void SetParentId(void *) VTK_OVERRIDE;
+ void SetParentId(void *) override;
//@}
/**
@@ -204,7 +204,7 @@ public:
* Set this RenderWindow's X window id to a pre-existing window.
*/
void SetWindowId(Window);
- void SetWindowId(void *) VTK_OVERRIDE;
+ void SetWindowId(void *) override;
//@}
/**
@@ -217,25 +217,25 @@ public:
* This is the generic prototype as required by the vtkRenderWindow
* parent.
*/
- void SetNextWindowId(void *) VTK_OVERRIDE;
+ void SetNextWindowId(void *) override;
/**
* Set name of rendering window.
*/
- void SetWindowName(const char *) VTK_OVERRIDE;
+ void SetWindowName(const char *) override;
/**
* Initialize the render window from the information associated
* with the currently activated OpenGL context.
*/
- bool InitializeFromCurrentContext() VTK_OVERRIDE;
+ bool InitializeFromCurrentContext() override;
//@{
/**
* Move the window to a new position on the display.
*/
- void SetPosition(int,int) VTK_OVERRIDE;
- void SetPosition(int a[2]) VTK_OVERRIDE { this->SetPosition(a[0], a[1]); }
+ void SetPosition(int,int) override;
+ void SetPosition(int a[2]) override { this->SetPosition(a[0], a[1]); }
//@}
//@{
@@ -243,47 +243,47 @@ public:
* Hide or Show the mouse cursor, it is nice to be able to hide the
* default cursor if you want VTK to display a 3D cursor instead.
*/
- void HideCursor() VTK_OVERRIDE;
- void ShowCursor() VTK_OVERRIDE;
+ void HideCursor() override;
+ void ShowCursor() override;
//@}
/**
* Change the shape of the cursor
*/
- void SetCurrentCursor(int) VTK_OVERRIDE;
+ void SetCurrentCursor(int) override;
/**
* Check to see if a mouse button has been pressed or mouse wheel activated.
* All other events are ignored by this method.
* This is a useful check to abort a long render.
*/
- int GetEventPending() VTK_OVERRIDE;
+ int GetEventPending() override;
/**
* Set this RenderWindow's X window id to a pre-existing window.
*/
- void SetWindowInfo(char *info) VTK_OVERRIDE;
+ void SetWindowInfo(char *info) override;
/**
* Set the window info that will be used after WindowRemap()
*/
- void SetNextWindowInfo(char *info) VTK_OVERRIDE;
+ void SetNextWindowInfo(char *info) override;
/**
* Sets the X window id of the window that WILL BE created.
*/
- void SetParentInfo(char *info) VTK_OVERRIDE;
+ void SetParentInfo(char *info) override;
/**
* This computes the size of the render window
* before calling the supper classes render
*/
- void Render() VTK_OVERRIDE;
+ void Render() override;
/**
* Render without displaying the window.
*/
- void SetOffScreenRendering(int i) VTK_OVERRIDE;
+ void SetOffScreenRendering(int i) override;
//@{
/**
@@ -293,13 +293,13 @@ public:
* and when done releasing resources restore
* the prior context
*/
- void PushContext() VTK_OVERRIDE;
- void PopContext() VTK_OVERRIDE;
+ void PushContext() override;
+ void PopContext() override;
//@}
protected:
vtkXOpenGLRenderWindow();
- ~vtkXOpenGLRenderWindow() VTK_OVERRIDE;
+ ~vtkXOpenGLRenderWindow() override;
vtkXOpenGLRenderWindowInternal *Internal;
@@ -332,8 +332,8 @@ protected:
Cursor XCHand;
- void CreateAWindow() VTK_OVERRIDE;
- void DestroyWindow() VTK_OVERRIDE;
+ void CreateAWindow() override;
+ void DestroyWindow() override;
void CreateOffScreenWindow(int width, int height);
void DestroyOffScreenWindow();
void ResizeOffScreenWindow(int width, int height);
diff --git a/Rendering/OpenGL2/vtkXRenderWindowInteractor.h b/Rendering/OpenGL2/vtkXRenderWindowInteractor.h
index c8069d13a718a3f391b0129f25185b46475a546e..c8c34b743a8bb844f163daea76c32157f95fd042 100644
--- a/Rendering/OpenGL2/vtkXRenderWindowInteractor.h
+++ b/Rendering/OpenGL2/vtkXRenderWindowInteractor.h
@@ -53,19 +53,19 @@ class VTKRENDERINGOPENGL2_EXPORT vtkXRenderWindowInteractor : public vtkRenderWi
public:
static vtkXRenderWindowInteractor *New();
vtkTypeMacro(vtkXRenderWindowInteractor,vtkRenderWindowInteractor);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Initializes the event handlers without an XtAppContext. This is
* good for when you don't have a user interface, but you still
* want to have mouse interaction.
*/
- void Initialize() VTK_OVERRIDE;
+ void Initialize() override;
/**
* Break the event loop on 'q','e' keypress. Want more ???
*/
- void TerminateApp() VTK_OVERRIDE;
+ void TerminateApp() override;
//@{
/**
@@ -99,15 +99,15 @@ public:
* and all other interactors associated with the widget are disabled
* when their data is not displayed.
*/
- void Enable() VTK_OVERRIDE;
- void Disable() VTK_OVERRIDE;
+ void Enable() override;
+ void Disable() override;
//@}
/**
* Update the Size data member and set the associated RenderWindow's
* size.
*/
- void UpdateSize(int,int) VTK_OVERRIDE;
+ void UpdateSize(int,int) override;
//@{
/**
@@ -167,7 +167,7 @@ public:
/**
* Re-defines virtual function to get mouse position by querying X-server.
*/
- void GetMousePosition(int *x, int *y) VTK_OVERRIDE;
+ void GetMousePosition(int *x, int *y) override;
//@{
/**
@@ -180,7 +180,7 @@ public:
protected:
vtkXRenderWindowInteractor();
- ~vtkXRenderWindowInteractor() VTK_OVERRIDE;
+ ~vtkXRenderWindowInteractor() override;
//Using static here to avoid detroying context when many apps are open:
static XtAppContext App;
@@ -201,8 +201,8 @@ protected:
* X-specific internal timer methods. See the superclass for detailed
* documentation.
*/
- int InternalCreateTimer(int timerId, int timerType, unsigned long duration) VTK_OVERRIDE;
- int InternalDestroyTimer(int platformTimerId) VTK_OVERRIDE;
+ int InternalCreateTimer(int timerId, int timerType, unsigned long duration) override;
+ int InternalDestroyTimer(int platformTimerId) override;
//@}
XtIntervalId AddTimeOut(XtAppContext app_context, unsigned long interval,
@@ -217,7 +217,7 @@ protected:
* call this method it will loop processing X events until the
* application is exited.
*/
- void StartEventLoop() VTK_OVERRIDE;
+ void StartEventLoop() override;
private:
vtkXRenderWindowInteractor(const vtkXRenderWindowInteractor&) VTK_DELETE_FUNCTION;
diff --git a/Rendering/OpenVR/vtkOpenVRCamera.h b/Rendering/OpenVR/vtkOpenVRCamera.h
index 2a21c652efa24e1e368bb2c1118eb72f01cd2edf..cb1e8c76a773d73baaa6059a53439490702c71b9 100644
--- a/Rendering/OpenVR/vtkOpenVRCamera.h
+++ b/Rendering/OpenVR/vtkOpenVRCamera.h
@@ -37,7 +37,7 @@ class VTKRENDERINGOPENVR_EXPORT vtkOpenVRCamera : public vtkOpenGLCamera
public:
static vtkOpenVRCamera *New();
vtkTypeMacro(vtkOpenVRCamera, vtkOpenGLCamera);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Implement base class method.
diff --git a/Rendering/OpenVR/vtkOpenVRControlsHelper.h b/Rendering/OpenVR/vtkOpenVRControlsHelper.h
index 4a5ae29f98f5e91022f810b57d708e2e02f44286..482746b377ce3810447ec876ec0b5ee90d8c9e7e 100644
--- a/Rendering/OpenVR/vtkOpenVRControlsHelper.h
+++ b/Rendering/OpenVR/vtkOpenVRControlsHelper.h
@@ -57,7 +57,7 @@ public:
* Standard methods for the class.
*/
vtkTypeMacro(vtkOpenVRControlsHelper, vtkProp);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
enum ButtonSides {
@@ -82,10 +82,10 @@ public:
/**
* Methods supporting the rendering process.
*/
- void ReleaseGraphicsResources(vtkWindow*) VTK_OVERRIDE;
- int RenderOpaqueGeometry(vtkViewport*) VTK_OVERRIDE;
- int RenderTranslucentPolygonalGeometry(vtkViewport*) VTK_OVERRIDE;
- int HasTranslucentPolygonalGeometry() VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow*) override;
+ int RenderOpaqueGeometry(vtkViewport*) override;
+ int RenderTranslucentPolygonalGeometry(vtkViewport*) override;
+ int HasTranslucentPolygonalGeometry() override;
//@}
//@{
@@ -118,7 +118,7 @@ public:
protected:
vtkOpenVRControlsHelper();
- ~vtkOpenVRControlsHelper() VTK_OVERRIDE;
+ ~vtkOpenVRControlsHelper() override;
double FrameSize[2];
diff --git a/Rendering/OpenVR/vtkOpenVRDefaultOverlay.h b/Rendering/OpenVR/vtkOpenVRDefaultOverlay.h
index 1b35f95e6bfe3c0510a486aaf1cf11cf8d461a6c..cc715ca32a45f64bdc04f554293cb0596e5f051f 100644
--- a/Rendering/OpenVR/vtkOpenVRDefaultOverlay.h
+++ b/Rendering/OpenVR/vtkOpenVRDefaultOverlay.h
@@ -29,7 +29,7 @@ class VTKRENDERINGOPENVR_EXPORT vtkOpenVRDefaultOverlay : public vtkOpenVROverla
public:
static vtkOpenVRDefaultOverlay *New();
vtkTypeMacro(vtkOpenVRDefaultOverlay, vtkOpenVROverlay);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Render the overlay, we set some opf the spots based on current settings
diff --git a/Rendering/OpenVR/vtkOpenVRFollower.h b/Rendering/OpenVR/vtkOpenVRFollower.h
index a5aa53b029b523d71191a875d4dd98924fb84691..a804b9b51010fe95d406fec98bde01a8b0850438 100644
--- a/Rendering/OpenVR/vtkOpenVRFollower.h
+++ b/Rendering/OpenVR/vtkOpenVRFollower.h
@@ -29,15 +29,15 @@ class VTKRENDERINGOPENVR_EXPORT vtkOpenVRFollower : public vtkFollower
public:
static vtkOpenVRFollower *New();
vtkTypeMacro(vtkOpenVRFollower, vtkFollower);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
- virtual void Render(vtkRenderer *ren) VTK_OVERRIDE;
+ virtual void Render(vtkRenderer *ren) override;
/**
* Generate the matrix based on ivars. This method overloads its superclasses
* ComputeMatrix() method due to the special vtkFollower matrix operations.
*/
- void ComputeMatrix() VTK_OVERRIDE;
+ void ComputeMatrix() override;
protected:
vtkOpenVRFollower();
diff --git a/Rendering/OpenVR/vtkOpenVRHardwarePicker.h b/Rendering/OpenVR/vtkOpenVRHardwarePicker.h
index 610ba44e57497c87c1d1ad0711d342509e4caab6..55161a75eae52c0c70a82f35f188ed5578fa47d5 100644
--- a/Rendering/OpenVR/vtkOpenVRHardwarePicker.h
+++ b/Rendering/OpenVR/vtkOpenVRHardwarePicker.h
@@ -38,7 +38,7 @@ public:
vtkTypeMacro(vtkOpenVRHardwarePicker, vtkOpenVRPropPicker);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Perform a pick from the user-provided list of vtkProps.
@@ -51,9 +51,9 @@ public:
protected:
vtkOpenVRHardwarePicker();
- ~vtkOpenVRHardwarePicker() VTK_OVERRIDE;
+ ~vtkOpenVRHardwarePicker() override;
- void Initialize() VTK_OVERRIDE;
+ void Initialize() override;
vtkSelection *Selection;
private:
diff --git a/Rendering/OpenVR/vtkOpenVRInteractorStyle.h b/Rendering/OpenVR/vtkOpenVRInteractorStyle.h
index 25a6b00a2f19ff4940612dc7e5484c540b629f9d..8f1ae33b9dc9199229a2b78bba7947d9da754acd 100644
--- a/Rendering/OpenVR/vtkOpenVRInteractorStyle.h
+++ b/Rendering/OpenVR/vtkOpenVRInteractorStyle.h
@@ -42,14 +42,14 @@ class VTKRENDERINGOPENVR_EXPORT vtkOpenVRInteractorStyle : public vtkInteractorS
public:
static vtkOpenVRInteractorStyle *New();
vtkTypeMacro(vtkOpenVRInteractorStyle, vtkInteractorStyle3D);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
* Override generic event bindings to call the corresponding action.
*/
- void OnButton3D(vtkEventData *edata) VTK_OVERRIDE;
- void OnMove3D(vtkEventData *edata) VTK_OVERRIDE;
+ void OnButton3D(vtkEventData *edata) override;
+ void OnMove3D(vtkEventData *edata) override;
//@}
//@{
@@ -72,9 +72,9 @@ public:
/**
* Multitouch events binding.
*/
- void OnPan() VTK_OVERRIDE;
- void OnPinch() VTK_OVERRIDE;
- void OnRotate() VTK_OVERRIDE;
+ void OnPan() override;
+ void OnPinch() override;
+ void OnRotate() override;
//@}
//@{
@@ -124,7 +124,7 @@ public:
void ToggleDrawControls();
- void SetInteractor(vtkRenderWindowInteractor* iren) VTK_OVERRIDE;
+ void SetInteractor(vtkRenderWindowInteractor* iren) override;
// allow the user to add options to the menu
vtkOpenVRMenuWidget *GetMenu() {
@@ -132,7 +132,7 @@ public:
protected:
vtkOpenVRInteractorStyle();
- ~vtkOpenVRInteractorStyle() VTK_OVERRIDE;
+ ~vtkOpenVRInteractorStyle() override;
void EndPickCallback(vtkSelection *sel);
diff --git a/Rendering/OpenVR/vtkOpenVRMenuRepresentation.h b/Rendering/OpenVR/vtkOpenVRMenuRepresentation.h
index a61d88588053fa7dfab786d81b821697085cf077..1046978db7018d7a29709daea68dc1d6a4de67d2 100644
--- a/Rendering/OpenVR/vtkOpenVRMenuRepresentation.h
+++ b/Rendering/OpenVR/vtkOpenVRMenuRepresentation.h
@@ -53,36 +53,36 @@ public:
* Standard methods for the class.
*/
vtkTypeMacro(vtkOpenVRMenuRepresentation, vtkWidgetRepresentation);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
//@{
/**
* Methods to interface with the vtkOpenVRPanelWidget.
*/
- void BuildRepresentation() VTK_OVERRIDE;
+ void BuildRepresentation() override;
void StartComplexInteraction(
vtkRenderWindowInteractor *iren,
vtkAbstractWidget *widget,
- unsigned long event, void *calldata) VTK_OVERRIDE;
+ unsigned long event, void *calldata) override;
void ComplexInteraction(
vtkRenderWindowInteractor *iren,
vtkAbstractWidget *widget,
- unsigned long event, void *calldata) VTK_OVERRIDE;
+ unsigned long event, void *calldata) override;
void EndComplexInteraction(
vtkRenderWindowInteractor *iren,
vtkAbstractWidget *widget,
- unsigned long event, void *calldata) VTK_OVERRIDE;
+ unsigned long event, void *calldata) override;
//@}
//@{
/**
* Methods supporting the rendering process.
*/
- void ReleaseGraphicsResources(vtkWindow*) VTK_OVERRIDE;
- int HasTranslucentPolygonalGeometry() VTK_OVERRIDE;
- int RenderOverlay(vtkViewport*) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow*) override;
+ int HasTranslucentPolygonalGeometry() override;
+ int RenderOverlay(vtkViewport*) override;
//@}
@@ -95,7 +95,7 @@ public:
protected:
vtkOpenVRMenuRepresentation();
- ~vtkOpenVRMenuRepresentation() VTK_OVERRIDE;
+ ~vtkOpenVRMenuRepresentation() override;
class InternalElement;
std::deque<InternalElement *> Menus;
diff --git a/Rendering/OpenVR/vtkOpenVRMenuWidget.h b/Rendering/OpenVR/vtkOpenVRMenuWidget.h
index 7c04300438e0e6af88bbaca3982bed62a74adf03..53c38309c0064637963b0c69a055aaf4bdc6a5fa 100644
--- a/Rendering/OpenVR/vtkOpenVRMenuWidget.h
+++ b/Rendering/OpenVR/vtkOpenVRMenuWidget.h
@@ -44,7 +44,7 @@ public:
* Standard vtkObject methods
*/
vtkTypeMacro(vtkOpenVRMenuWidget, vtkAbstractWidget);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
@@ -57,7 +57,7 @@ public:
/**
* Create the default widget representation if one is not set.
*/
- void CreateDefaultRepresentation() VTK_OVERRIDE;
+ void CreateDefaultRepresentation() override;
//@{
/**
@@ -84,7 +84,7 @@ public:
protected:
vtkOpenVRMenuWidget();
- ~vtkOpenVRMenuWidget() VTK_OVERRIDE;
+ ~vtkOpenVRMenuWidget() override;
int WidgetState;
diff --git a/Rendering/OpenVR/vtkOpenVRModel.h b/Rendering/OpenVR/vtkOpenVRModel.h
index 2919b4b20f3c523dca21cd7c0f1019a89d712a3b..c1ee294ba69dd64fb751e2f77f01015317698b63 100644
--- a/Rendering/OpenVR/vtkOpenVRModel.h
+++ b/Rendering/OpenVR/vtkOpenVRModel.h
@@ -41,7 +41,7 @@ class VTKRENDERINGOPENVR_EXPORT vtkOpenVRModel : public vtkObject
public:
static vtkOpenVRModel *New();
vtkTypeMacro(vtkOpenVRModel, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
bool Build(vtkOpenVRRenderWindow *win);
void Render(vtkOpenVRRenderWindow *win,
@@ -75,7 +75,7 @@ public:
protected:
vtkOpenVRModel();
- ~vtkOpenVRModel() VTK_OVERRIDE;
+ ~vtkOpenVRModel() override;
std::string ModelName;
diff --git a/Rendering/OpenVR/vtkOpenVROverlay.h b/Rendering/OpenVR/vtkOpenVROverlay.h
index 08c5badda4e3598d3e06cc37f0c5c0c3448a6c25..b3e008f86e673d63fa5ea1401797353f3f72d155 100644
--- a/Rendering/OpenVR/vtkOpenVROverlay.h
+++ b/Rendering/OpenVR/vtkOpenVROverlay.h
@@ -39,7 +39,7 @@ class VTKRENDERINGOPENVR_EXPORT vtkOpenVROverlay : public vtkObject
public:
static vtkOpenVROverlay *New();
vtkTypeMacro(vtkOpenVROverlay, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Render the overlay
diff --git a/Rendering/OpenVR/vtkOpenVRPanelRepresentation.h b/Rendering/OpenVR/vtkOpenVRPanelRepresentation.h
index 52113a8f4609902fd7c601b46c042f67dba65a45..2ecbad7d7958de0ebfdb7c36ea87dca8cd68e4ff 100644
--- a/Rendering/OpenVR/vtkOpenVRPanelRepresentation.h
+++ b/Rendering/OpenVR/vtkOpenVRPanelRepresentation.h
@@ -48,7 +48,7 @@ public:
* Standard methods for the class.
*/
vtkTypeMacro(vtkOpenVRPanelRepresentation, vtkWidgetRepresentation);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
// Enums define the state of the representation relative to the mouse pointer
@@ -61,24 +61,24 @@ public:
/**
* Methods to interface with the vtkOpenVRPanelWidget.
*/
- void BuildRepresentation() VTK_OVERRIDE;
- void PlaceWidget(double bounds[6]) VTK_OVERRIDE;
+ void BuildRepresentation() override;
+ void PlaceWidget(double bounds[6]) override;
void StartComplexInteraction(
vtkRenderWindowInteractor *iren,
vtkAbstractWidget *widget,
- unsigned long event, void *calldata) VTK_OVERRIDE;
+ unsigned long event, void *calldata) override;
void ComplexInteraction(
vtkRenderWindowInteractor *iren,
vtkAbstractWidget *widget,
- unsigned long event, void *calldata) VTK_OVERRIDE;
+ unsigned long event, void *calldata) override;
int ComputeComplexInteractionState(
vtkRenderWindowInteractor *iren,
vtkAbstractWidget *widget,
- unsigned long event, void *calldata, int modify = 0) VTK_OVERRIDE;
+ unsigned long event, void *calldata, int modify = 0) override;
void EndComplexInteraction(
vtkRenderWindowInteractor *iren,
vtkAbstractWidget *widget,
- unsigned long event, void *calldata) VTK_OVERRIDE;
+ unsigned long event, void *calldata) override;
//@}
// Place the widget with a few more options
@@ -110,10 +110,10 @@ public:
/**
* Methods supporting the rendering process.
*/
- void ReleaseGraphicsResources(vtkWindow*) VTK_OVERRIDE;
- int RenderOpaqueGeometry(vtkViewport*) VTK_OVERRIDE;
- int RenderTranslucentPolygonalGeometry(vtkViewport*) VTK_OVERRIDE;
- int HasTranslucentPolygonalGeometry() VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow*) override;
+ int RenderOpaqueGeometry(vtkViewport*) override;
+ int RenderTranslucentPolygonalGeometry(vtkViewport*) override;
+ int HasTranslucentPolygonalGeometry() override;
//@}
//@{
@@ -144,7 +144,7 @@ public:
protected:
vtkOpenVRPanelRepresentation();
- ~vtkOpenVRPanelRepresentation() VTK_OVERRIDE;
+ ~vtkOpenVRPanelRepresentation() override;
// Keep track of event positions
double LastEventPosition[3];
diff --git a/Rendering/OpenVR/vtkOpenVRPanelWidget.h b/Rendering/OpenVR/vtkOpenVRPanelWidget.h
index dff24dfa34d34f8f33fc41e73c7d84a5553685cb..3629d7c33d1c8a63c6f695b1581299e677692130 100644
--- a/Rendering/OpenVR/vtkOpenVRPanelWidget.h
+++ b/Rendering/OpenVR/vtkOpenVRPanelWidget.h
@@ -48,7 +48,7 @@ public:
* Standard vtkObject methods
*/
vtkTypeMacro(vtkOpenVRPanelWidget, vtkAbstractWidget);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
@@ -61,7 +61,7 @@ public:
/**
* Create the default widget representation if one is not set.
*/
- void CreateDefaultRepresentation() VTK_OVERRIDE;
+ void CreateDefaultRepresentation() override;
//@{
/**
@@ -75,7 +75,7 @@ public:
protected:
vtkOpenVRPanelWidget();
- ~vtkOpenVRPanelWidget() VTK_OVERRIDE;
+ ~vtkOpenVRPanelWidget() override;
// Manage the state of the widget
int WidgetState;
diff --git a/Rendering/OpenVR/vtkOpenVRPropPicker.h b/Rendering/OpenVR/vtkOpenVRPropPicker.h
index e8d3c4aa25461e2a52ea3002ff43f8157a918832..54ebe6f88832aaafdb96128fe349cfe0cf8f457d 100644
--- a/Rendering/OpenVR/vtkOpenVRPropPicker.h
+++ b/Rendering/OpenVR/vtkOpenVRPropPicker.h
@@ -42,7 +42,7 @@ public:
vtkTypeMacro(vtkOpenVRPropPicker, vtkPropPicker);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Perform a pick from the user-provided list of vtkProps.
@@ -55,13 +55,13 @@ public:
* selectionPt is in world coordinates.
* Return non-zero if something was successfully picked.
*/
- int Pick3DRay(double selectionPt[3], double orient[4], vtkRenderer *ren) VTK_OVERRIDE;
+ int Pick3DRay(double selectionPt[3], double orient[4], vtkRenderer *ren) override;
protected:
vtkOpenVRPropPicker();
- ~vtkOpenVRPropPicker() VTK_OVERRIDE;
+ ~vtkOpenVRPropPicker() override;
- void Initialize() VTK_OVERRIDE;
+ void Initialize() override;
private:
diff --git a/Rendering/OpenVR/vtkOpenVRRenderer.h b/Rendering/OpenVR/vtkOpenVRRenderer.h
index 3a766633f72b40b18bffbc0e7add765b9dafc9e2..5ef3cdad2c824b4ad97215c0d555fe3d66794b6f 100644
--- a/Rendering/OpenVR/vtkOpenVRRenderer.h
+++ b/Rendering/OpenVR/vtkOpenVRRenderer.h
@@ -32,7 +32,7 @@ class VTKRENDERINGOPENVR_EXPORT vtkOpenVRRenderer : public vtkOpenGLRenderer
public:
static vtkOpenVRRenderer *New();
vtkTypeMacro(vtkOpenVRRenderer,vtkOpenGLRenderer);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Automatically set up the camera based on the visible actors.
@@ -40,7 +40,7 @@ public:
* and move along its initial view plane normal (i.e., vector defined from
* camera position to focal point) so that all of the actors can be seen.
*/
- void ResetCamera() VTK_OVERRIDE;
+ void ResetCamera() override;
/**
* Automatically set up the camera based on a specified bounding box
@@ -51,13 +51,13 @@ public:
* the view plane is parallel to the view up axis, the view up axis will
* be reset to one of the three coordinate axes.
*/
- void ResetCamera(double bounds[6]) VTK_OVERRIDE;
+ void ResetCamera(double bounds[6]) override;
/**
* Alternative version of ResetCamera(bounds[6]);
*/
void ResetCamera(double xmin, double xmax, double ymin, double ymax,
- double zmin, double zmax) VTK_OVERRIDE;
+ double zmin, double zmax) override;
using vtkRenderer::ResetCameraClippingRange;
@@ -68,7 +68,7 @@ public:
* If Deering frustrum is used then the bounds get expanded
* by the camera's modelview matrix.
*/
- void ResetCameraClippingRange( double bounds[6] ) VTK_OVERRIDE;
+ void ResetCameraClippingRange( double bounds[6] ) override;
//@}
/**
diff --git a/Rendering/Parallel/Testing/Cxx/PrmMagnify.cxx b/Rendering/Parallel/Testing/Cxx/PrmMagnify.cxx
index ee48bf56def46686802fb65e570559e698ec6e62..dc19e12fe897185ab5e5f034f5f2820bcf1baef8 100644
--- a/Rendering/Parallel/Testing/Cxx/PrmMagnify.cxx
+++ b/Rendering/Parallel/Testing/Cxx/PrmMagnify.cxx
@@ -58,10 +58,10 @@ protected:
vtkTestMagnifyRenderManager();
~vtkTestMagnifyRenderManager();
- virtual void PreRenderProcessing() VTK_OVERRIDE;
- virtual void PostRenderProcessing() VTK_OVERRIDE;
+ virtual void PreRenderProcessing() override;
+ virtual void PostRenderProcessing() override;
- virtual void ReadReducedImage() VTK_OVERRIDE;
+ virtual void ReadReducedImage() override;
vtkImageMandelbrotSource *Mandelbrot;
diff --git a/Rendering/Parallel/vtkClientServerCompositePass.h b/Rendering/Parallel/vtkClientServerCompositePass.h
index f6fde513ee90d9a719932320bcfb92f82f951bae..9e6612c9b77e51108f04cc95916ee91407804d90 100644
--- a/Rendering/Parallel/vtkClientServerCompositePass.h
+++ b/Rendering/Parallel/vtkClientServerCompositePass.h
@@ -33,20 +33,20 @@ class VTKRENDERINGPARALLEL_EXPORT vtkClientServerCompositePass : public vtkRende
public:
static vtkClientServerCompositePass* New();
vtkTypeMacro(vtkClientServerCompositePass, vtkRenderPass);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Perform rendering according to a render state \p s.
* \pre s_exists: s!=0
*/
- void Render(const vtkRenderState *s) VTK_OVERRIDE;
+ void Render(const vtkRenderState *s) override;
/**
* Release graphics resources and ask components to release their own
* resources.
* \pre w_exists: w!=0
*/
- void ReleaseGraphicsResources(vtkWindow *w) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *w) override;
//@{
/**
@@ -107,7 +107,7 @@ public:
protected:
vtkClientServerCompositePass();
- ~vtkClientServerCompositePass() VTK_OVERRIDE;
+ ~vtkClientServerCompositePass() override;
vtkRenderPass* RenderPass;
vtkRenderPass* PostProcessingRenderPass;
diff --git a/Rendering/Parallel/vtkClientServerSynchronizedRenderers.h b/Rendering/Parallel/vtkClientServerSynchronizedRenderers.h
index 8d98d2ad556fa2d129cd039d224c26dc41683f52..d0ce497eff351cddd472f36e82126855b3280c1c 100644
--- a/Rendering/Parallel/vtkClientServerSynchronizedRenderers.h
+++ b/Rendering/Parallel/vtkClientServerSynchronizedRenderers.h
@@ -31,14 +31,14 @@ class VTKRENDERINGPARALLEL_EXPORT vtkClientServerSynchronizedRenderers :
public:
static vtkClientServerSynchronizedRenderers* New();
vtkTypeMacro(vtkClientServerSynchronizedRenderers, vtkSynchronizedRenderers);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkClientServerSynchronizedRenderers();
- ~vtkClientServerSynchronizedRenderers() VTK_OVERRIDE;
+ ~vtkClientServerSynchronizedRenderers() override;
- void MasterEndRender() VTK_OVERRIDE;
- void SlaveEndRender() VTK_OVERRIDE;
+ void MasterEndRender() override;
+ void SlaveEndRender() override;
private:
vtkClientServerSynchronizedRenderers(const vtkClientServerSynchronizedRenderers&) VTK_DELETE_FUNCTION;
diff --git a/Rendering/Parallel/vtkCompositeRGBAPass.h b/Rendering/Parallel/vtkCompositeRGBAPass.h
index 1547c176a82ba4293d8dbee7a164da18c58e3282..aace39ef9be6f813ae55f1f052e8c8dd94220627 100644
--- a/Rendering/Parallel/vtkCompositeRGBAPass.h
+++ b/Rendering/Parallel/vtkCompositeRGBAPass.h
@@ -46,20 +46,20 @@ class VTKRENDERINGPARALLEL_EXPORT vtkCompositeRGBAPass : public vtkRenderPass
public:
static vtkCompositeRGBAPass *New();
vtkTypeMacro(vtkCompositeRGBAPass,vtkRenderPass);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Perform rendering according to a render state \p s.
* \pre s_exists: s!=0
*/
- void Render(const vtkRenderState *s) VTK_OVERRIDE;
+ void Render(const vtkRenderState *s) override;
/**
* Release graphics resources and ask components to release their own
* resources.
* \pre w_exists: w!=0
*/
- void ReleaseGraphicsResources(vtkWindow *w) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *w) override;
//@{
/**
@@ -93,7 +93,7 @@ public:
/**
* Destructor.
*/
- ~vtkCompositeRGBAPass() VTK_OVERRIDE;
+ ~vtkCompositeRGBAPass() override;
vtkMultiProcessController *Controller;
vtkPKdTree *Kdtree;
diff --git a/Rendering/Parallel/vtkCompositeRenderManager.h b/Rendering/Parallel/vtkCompositeRenderManager.h
index 6d2d26999a27c208351a0d083003f5458763fa6e..2930a4ef47313951ad1b1061626aba84ed6622d1 100644
--- a/Rendering/Parallel/vtkCompositeRenderManager.h
+++ b/Rendering/Parallel/vtkCompositeRenderManager.h
@@ -37,7 +37,7 @@ class VTKRENDERINGPARALLEL_EXPORT vtkCompositeRenderManager : public vtkParallel
public:
vtkTypeMacro(vtkCompositeRenderManager, vtkParallelRenderManager);
static vtkCompositeRenderManager *New();
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
//@{
/**
@@ -49,12 +49,12 @@ public:
protected:
vtkCompositeRenderManager();
- ~vtkCompositeRenderManager() VTK_OVERRIDE;
+ ~vtkCompositeRenderManager() override;
vtkCompositer *Compositer;
- void PreRenderProcessing() VTK_OVERRIDE;
- void PostRenderProcessing() VTK_OVERRIDE;
+ void PreRenderProcessing() override;
+ void PostRenderProcessing() override;
vtkFloatArray *DepthData;
vtkUnsignedCharArray *TmpPixelData;
diff --git a/Rendering/Parallel/vtkCompositeZPass.h b/Rendering/Parallel/vtkCompositeZPass.h
index 1943bb5a6caf8416c3a9dc029cce8524ae20ce62..e6fb1b94d0f095c4f7b2c803f8c1192802dbcf19 100644
--- a/Rendering/Parallel/vtkCompositeZPass.h
+++ b/Rendering/Parallel/vtkCompositeZPass.h
@@ -50,20 +50,20 @@ class VTKRENDERINGPARALLEL_EXPORT vtkCompositeZPass : public vtkRenderPass
public:
static vtkCompositeZPass *New();
vtkTypeMacro(vtkCompositeZPass,vtkRenderPass);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Perform rendering according to a render state \p s.
* \pre s_exists: s!=0
*/
- void Render(const vtkRenderState *s) VTK_OVERRIDE;
+ void Render(const vtkRenderState *s) override;
/**
* Release graphics resources and ask components to release their own
* resources.
* \pre w_exists: w!=0
*/
- void ReleaseGraphicsResources(vtkWindow *w) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *w) override;
//@{
/**
@@ -89,7 +89,7 @@ public:
/**
* Destructor.
*/
- ~vtkCompositeZPass() VTK_OVERRIDE;
+ ~vtkCompositeZPass() override;
/**
* Create program for texture mapping.
diff --git a/Rendering/Parallel/vtkCompositedSynchronizedRenderers.h b/Rendering/Parallel/vtkCompositedSynchronizedRenderers.h
index 9215a78b81d7d70730cd6c728fb6885d68303549..faa6939ab97a3773010ea1d2f9702a292560c046 100644
--- a/Rendering/Parallel/vtkCompositedSynchronizedRenderers.h
+++ b/Rendering/Parallel/vtkCompositedSynchronizedRenderers.h
@@ -33,7 +33,7 @@ class VTKRENDERINGPARALLEL_EXPORT vtkCompositedSynchronizedRenderers : public vt
public:
static vtkCompositedSynchronizedRenderers* New();
vtkTypeMacro(vtkCompositedSynchronizedRenderers, vtkSynchronizedRenderers);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -45,10 +45,10 @@ public:
protected:
vtkCompositedSynchronizedRenderers();
- ~vtkCompositedSynchronizedRenderers() VTK_OVERRIDE;
+ ~vtkCompositedSynchronizedRenderers() override;
- void MasterEndRender() VTK_OVERRIDE;
- void SlaveEndRender() VTK_OVERRIDE;
+ void MasterEndRender() override;
+ void SlaveEndRender() override;
void CaptureRenderedDepthBuffer(vtkFloatArray* depth_buffer);
vtkCompositer* Compositer;
diff --git a/Rendering/Parallel/vtkCompositer.h b/Rendering/Parallel/vtkCompositer.h
index 054e0059daeaa9557b22d1de6a98dbaa36438e91..b2438b5ec1dfed825be7b338c5aa47670a1fb09b 100644
--- a/Rendering/Parallel/vtkCompositer.h
+++ b/Rendering/Parallel/vtkCompositer.h
@@ -43,7 +43,7 @@ class VTKRENDERINGPARALLEL_EXPORT vtkCompositer : public vtkObject
public:
static vtkCompositer *New();
vtkTypeMacro(vtkCompositer,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* This method gets called on every process. The final image gets
@@ -81,7 +81,7 @@ public:
protected:
vtkCompositer();
- ~vtkCompositer() VTK_OVERRIDE;
+ ~vtkCompositer() override;
vtkMultiProcessController *Controller;
int NumberOfProcesses;
diff --git a/Rendering/Parallel/vtkCompressCompositer.h b/Rendering/Parallel/vtkCompressCompositer.h
index 60157cb2912cd93f4cb3257b01489cb69969f941..cad4cc85dd468408d4227e7d263093631ba68f95 100644
--- a/Rendering/Parallel/vtkCompressCompositer.h
+++ b/Rendering/Parallel/vtkCompressCompositer.h
@@ -42,10 +42,10 @@ class VTKRENDERINGPARALLEL_EXPORT vtkCompressCompositer : public vtkCompositer
public:
static vtkCompressCompositer *New();
vtkTypeMacro(vtkCompressCompositer,vtkCompositer);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
void CompositeBuffer(vtkDataArray *pBuf, vtkFloatArray *zBuf,
- vtkDataArray *pTmp, vtkFloatArray *zTmp) VTK_OVERRIDE;
+ vtkDataArray *pTmp, vtkFloatArray *zTmp) override;
/**
* I am granting access to these methods and making them static
@@ -63,7 +63,7 @@ public:
vtkFloatArray *outZ, vtkDataArray *outP);
protected:
vtkCompressCompositer();
- ~vtkCompressCompositer() VTK_OVERRIDE;
+ ~vtkCompressCompositer() override;
vtkDataArray *InternalPData;
diff --git a/Rendering/Parallel/vtkImageRenderManager.h b/Rendering/Parallel/vtkImageRenderManager.h
index ed440b5419d7296638579bbd71424bc9023e760e..8b5ee35643109519be031112b8071baef4ef8320 100644
--- a/Rendering/Parallel/vtkImageRenderManager.h
+++ b/Rendering/Parallel/vtkImageRenderManager.h
@@ -38,14 +38,14 @@ class VTKRENDERINGPARALLEL_EXPORT vtkImageRenderManager : public vtkParallelRend
public:
vtkTypeMacro(vtkImageRenderManager, vtkParallelRenderManager);
static vtkImageRenderManager *New();
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
protected:
vtkImageRenderManager();
- ~vtkImageRenderManager() VTK_OVERRIDE;
+ ~vtkImageRenderManager() override;
- void PreRenderProcessing() VTK_OVERRIDE;
- void PostRenderProcessing() VTK_OVERRIDE;
+ void PreRenderProcessing() override;
+ void PostRenderProcessing() override;
private:
vtkImageRenderManager(const vtkImageRenderManager &) VTK_DELETE_FUNCTION;
diff --git a/Rendering/Parallel/vtkPHardwareSelector.cxx b/Rendering/Parallel/vtkPHardwareSelector.cxx
index f2c323512690c38e4e7ab027e224434cdfaef177..083923b0f1b4fb5d8216667ef2e0116fa7b626a7 100644
--- a/Rendering/Parallel/vtkPHardwareSelector.cxx
+++ b/Rendering/Parallel/vtkPHardwareSelector.cxx
@@ -24,7 +24,7 @@ class vtkPHardwareSelector::vtkObserver : public vtkCommand
public:
static vtkObserver* New() { return new vtkObserver(); }
void Execute(vtkObject *, unsigned long eventId,
- void *) VTK_OVERRIDE
+ void *) override
{
if (eventId == vtkCommand::StartEvent)
{
diff --git a/Rendering/Parallel/vtkPHardwareSelector.h b/Rendering/Parallel/vtkPHardwareSelector.h
index 8d3f20f2dd25cb788f52146857a0f91681c218bc..f0f54bd43f19adbcf67c22a1c23553d643a27e52 100644
--- a/Rendering/Parallel/vtkPHardwareSelector.h
+++ b/Rendering/Parallel/vtkPHardwareSelector.h
@@ -38,7 +38,7 @@ class VTKRENDERINGPARALLEL_EXPORT vtkPHardwareSelector : public vtkOpenGLHardwar
public:
static vtkPHardwareSelector* New();
vtkTypeMacro(vtkPHardwareSelector, vtkOpenGLHardwareSelector);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -57,11 +57,11 @@ public:
* vtkHardwareSelector as the capturing of buffers progresses is done as a
* slave to the master render.
*/
- bool CaptureBuffers() VTK_OVERRIDE;
+ bool CaptureBuffers() override;
protected:
vtkPHardwareSelector();
- ~vtkPHardwareSelector() VTK_OVERRIDE;
+ ~vtkPHardwareSelector() override;
void StartRender();
void EndRender();
diff --git a/Rendering/Parallel/vtkParallelRenderManager.h b/Rendering/Parallel/vtkParallelRenderManager.h
index 629491ba3d5c2c461a065c613b7eee9c44087961..cda24b693d0cd9bcb15815973899b893cae02eff 100644
--- a/Rendering/Parallel/vtkParallelRenderManager.h
+++ b/Rendering/Parallel/vtkParallelRenderManager.h
@@ -60,7 +60,7 @@ class VTKRENDERINGPARALLEL_EXPORT vtkParallelRenderManager : public vtkObject
{
public:
vtkTypeMacro(vtkParallelRenderManager, vtkObject);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
/**
* Builds a vtkRenderWindow compatible with this render manager. The
@@ -458,7 +458,7 @@ public:
protected:
vtkParallelRenderManager();
- ~vtkParallelRenderManager() VTK_OVERRIDE;
+ ~vtkParallelRenderManager() override;
//@{
diff --git a/Rendering/Parallel/vtkSynchronizedRenderWindows.cxx b/Rendering/Parallel/vtkSynchronizedRenderWindows.cxx
index 595032988639236645a1f49cbe4f7c03cdbd8979..920e15c8870d26e1ee6ea9ac500b9631937df479 100644
--- a/Rendering/Parallel/vtkSynchronizedRenderWindows.cxx
+++ b/Rendering/Parallel/vtkSynchronizedRenderWindows.cxx
@@ -34,7 +34,7 @@ public:
return obs;
}
- void Execute(vtkObject *, unsigned long eventId, void *) VTK_OVERRIDE
+ void Execute(vtkObject *, unsigned long eventId, void *) override
{
if (this->Target)
{
diff --git a/Rendering/Parallel/vtkSynchronizedRenderWindows.h b/Rendering/Parallel/vtkSynchronizedRenderWindows.h
index 47da0c726f1db6ba4193f62bed51f6aa763ed71f..a23e0f72e47b9cfc4d11e07580456abc30660d3f 100644
--- a/Rendering/Parallel/vtkSynchronizedRenderWindows.h
+++ b/Rendering/Parallel/vtkSynchronizedRenderWindows.h
@@ -37,7 +37,7 @@ class VTKRENDERINGPARALLEL_EXPORT vtkSynchronizedRenderWindows : public vtkObjec
public:
static vtkSynchronizedRenderWindows* New();
vtkTypeMacro(vtkSynchronizedRenderWindows, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -114,7 +114,7 @@ public:
};
protected:
vtkSynchronizedRenderWindows();
- ~vtkSynchronizedRenderWindows() VTK_OVERRIDE;
+ ~vtkSynchronizedRenderWindows() override;
struct RenderWindowInfo
{
diff --git a/Rendering/Parallel/vtkSynchronizedRenderers.cxx b/Rendering/Parallel/vtkSynchronizedRenderers.cxx
index 022f7d9cc09d385715d34c90764417ca4913f18c..0ea559b22867bb94e1ed53bfced1eb75fe4a5c82 100644
--- a/Rendering/Parallel/vtkSynchronizedRenderers.cxx
+++ b/Rendering/Parallel/vtkSynchronizedRenderers.cxx
@@ -52,7 +52,7 @@ public:
return obs;
}
- void Execute(vtkObject *, unsigned long eventId, void *) VTK_OVERRIDE
+ void Execute(vtkObject *, unsigned long eventId, void *) override
{
if (this->Target && this->Target->GetAutomaticEventHandling())
{
diff --git a/Rendering/Parallel/vtkSynchronizedRenderers.h b/Rendering/Parallel/vtkSynchronizedRenderers.h
index 27e10a0b15f9f68baf1366733faad1199aa9ccde..80b218caf868da508e8d9f6845d4f532246a8233 100644
--- a/Rendering/Parallel/vtkSynchronizedRenderers.h
+++ b/Rendering/Parallel/vtkSynchronizedRenderers.h
@@ -47,7 +47,7 @@ class VTKRENDERINGPARALLEL_EXPORT vtkSynchronizedRenderers : public vtkObject
public:
static vtkSynchronizedRenderers* New();
vtkTypeMacro(vtkSynchronizedRenderers, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -222,7 +222,7 @@ public:
protected:
vtkSynchronizedRenderers();
- ~vtkSynchronizedRenderers() VTK_OVERRIDE;
+ ~vtkSynchronizedRenderers() override;
struct RendererInfo
{
diff --git a/Rendering/Parallel/vtkTreeCompositer.h b/Rendering/Parallel/vtkTreeCompositer.h
index 47dadfb60ccd2957e7604b018daf40f076d952bf..6b24ae711d7b2b8fe928375fe4483684ab241ad2 100644
--- a/Rendering/Parallel/vtkTreeCompositer.h
+++ b/Rendering/Parallel/vtkTreeCompositer.h
@@ -66,14 +66,14 @@ class VTKRENDERINGPARALLEL_EXPORT vtkTreeCompositer : public vtkCompositer
public:
static vtkTreeCompositer *New();
vtkTypeMacro(vtkTreeCompositer,vtkCompositer);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
void CompositeBuffer(vtkDataArray *pBuf, vtkFloatArray *zBuf,
- vtkDataArray *pTmp, vtkFloatArray *zTmp) VTK_OVERRIDE;
+ vtkDataArray *pTmp, vtkFloatArray *zTmp) override;
protected:
vtkTreeCompositer();
- ~vtkTreeCompositer() VTK_OVERRIDE;
+ ~vtkTreeCompositer() override;
private:
vtkTreeCompositer(const vtkTreeCompositer&) VTK_DELETE_FUNCTION;
diff --git a/Rendering/ParallelLIC/vtkPLineIntegralConvolution2D.h b/Rendering/ParallelLIC/vtkPLineIntegralConvolution2D.h
index c738c75952c84e2c702f16ad6858ba11ea955de4..50da6841aec8e2f2f9a413d16fc9890f53051be1 100644
--- a/Rendering/ParallelLIC/vtkPLineIntegralConvolution2D.h
+++ b/Rendering/ParallelLIC/vtkPLineIntegralConvolution2D.h
@@ -39,7 +39,7 @@ class VTKRENDERINGPARALLELLIC_EXPORT vtkPLineIntegralConvolution2D : public vtkL
public:
static vtkPLineIntegralConvolution2D *New();
vtkTypeMacro(vtkPLineIntegralConvolution2D, vtkLineIntegralConvolution2D);
- virtual void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ virtual void PrintSelf(ostream &os, vtkIndent indent) override;
//@{
/**
@@ -49,8 +49,8 @@ public:
* hold/manage reference to the communicator during use
* of the LIC object.
*/
- virtual void SetCommunicator(vtkPainterCommunicator *) VTK_OVERRIDE;
- virtual vtkPainterCommunicator *GetCommunicator() VTK_OVERRIDE;
+ virtual void SetCommunicator(vtkPainterCommunicator *) override;
+ virtual vtkPainterCommunicator *GetCommunicator() override;
//@}
/**
@@ -60,7 +60,7 @@ public:
virtual void GetGlobalMinMax(
vtkPainterCommunicator *comm,
float &min,
- float &max) VTK_OVERRIDE;
+ float &max) override;
/**
* Methods used for parallel benchmarks. Use cmake to define
@@ -68,7 +68,7 @@ public:
* During each update timing information is stored, it can
* be written to disk by calling WriteLog.
*/
- virtual void WriteTimerLog(const char *fileName) VTK_OVERRIDE;
+ virtual void WriteTimerLog(const char *fileName) override;
protected:
vtkPLineIntegralConvolution2D();
@@ -82,8 +82,8 @@ protected:
* disk by calling WriteLog. Note: Some of the timings are
* enabled by the surface lic painter.
*/
- virtual void StartTimerEvent(const char *name) VTK_OVERRIDE;
- virtual void EndTimerEvent(const char *name) VTK_OVERRIDE;
+ virtual void StartTimerEvent(const char *name) override;
+ virtual void EndTimerEvent(const char *name) override;
//@}
private:
diff --git a/Rendering/ParallelLIC/vtkPSurfaceLICComposite.h b/Rendering/ParallelLIC/vtkPSurfaceLICComposite.h
index 5499702cbaf51d731e70d075e6651a7097c57f12..051304bcadccf094a11f74722aa1a329eaed220c 100644
--- a/Rendering/ParallelLIC/vtkPSurfaceLICComposite.h
+++ b/Rendering/ParallelLIC/vtkPSurfaceLICComposite.h
@@ -55,27 +55,27 @@ class VTKRENDERINGPARALLELLIC_EXPORT vtkPSurfaceLICComposite : public vtkSurface
public:
static vtkPSurfaceLICComposite *New();
vtkTypeMacro(vtkPSurfaceLICComposite, vtkSurfaceLICComposite);
- virtual void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ virtual void PrintSelf(ostream &os, vtkIndent indent) override;
/**
* Set the rendering context. Must set prior to use. Reference is not
* held, so caller must ensure the renderer is not destroyed during
* use.
*/
- virtual void SetContext(vtkOpenGLRenderWindow *rwin) VTK_OVERRIDE;
- virtual vtkOpenGLRenderWindow *GetContext() VTK_OVERRIDE { return this->Context; }
+ virtual void SetContext(vtkOpenGLRenderWindow *rwin) override;
+ virtual vtkOpenGLRenderWindow *GetContext() override { return this->Context; }
/**
* Set the communicator for parallel communication. The Default is
* COMM_NULL.
*/
- virtual void SetCommunicator(vtkPainterCommunicator *comm) VTK_OVERRIDE;
+ virtual void SetCommunicator(vtkPainterCommunicator *comm) override;
/**
* Build programs to move data to the new decomp
* THIS IS A COLLECTIVE OPERATION
*/
- virtual int BuildProgram(float *vectors) VTK_OVERRIDE;
+ virtual int BuildProgram(float *vectors) override;
/**
* Move a single buffer from the geometry decomp to the LIC decomp.
@@ -85,7 +85,7 @@ public:
void *pSendPBO,
int dataType,
int nComps,
- vtkTextureObject *&newImage) VTK_OVERRIDE;
+ vtkTextureObject *&newImage) override;
/**
* Move a single buffer from the LIC decomp to the geometry decomp
@@ -95,7 +95,7 @@ public:
void *pSendPBO,
int dataType,
int nComps,
- vtkTextureObject *&newImage) VTK_OVERRIDE;
+ vtkTextureObject *&newImage) override;
protected:
vtkPSurfaceLICComposite();
diff --git a/Rendering/ParallelLIC/vtkPSurfaceLICInterface.h b/Rendering/ParallelLIC/vtkPSurfaceLICInterface.h
index da4480a98f4d4cab2d494189460f506cfcb44077..f37a227a356ef4621bd8ec03bee9026b2a9a5b48 100644
--- a/Rendering/ParallelLIC/vtkPSurfaceLICInterface.h
+++ b/Rendering/ParallelLIC/vtkPSurfaceLICInterface.h
@@ -35,7 +35,7 @@ class VTKRENDERINGPARALLELLIC_EXPORT vtkPSurfaceLICInterface : public vtkSurface
public:
static vtkPSurfaceLICInterface* New();
vtkTypeMacro(vtkPSurfaceLICInterface, vtkSurfaceLICInterface);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Methods used for parallel benchmarks. Use cmake to define
@@ -43,7 +43,7 @@ public:
* update timing information is stored, it can be written to
* disk by calling WriteLog.
*/
- virtual void WriteTimerLog(const char *fileName) VTK_OVERRIDE;
+ virtual void WriteTimerLog(const char *fileName) override;
protected:
vtkPSurfaceLICInterface();
@@ -57,7 +57,7 @@ protected:
virtual void GetGlobalMinMax(
vtkPainterCommunicator *comm,
float &min,
- float &max) VTK_OVERRIDE;
+ float &max) override;
/**
* Creates a new communicator with/without the calling processes
@@ -65,13 +65,13 @@ protected:
* is included in the new communicator. In parallel this call is mpi
* collective on the world communicator. In serial this is a no-op.
*/
- virtual vtkPainterCommunicator *CreateCommunicator(int include) VTK_OVERRIDE;
+ virtual vtkPainterCommunicator *CreateCommunicator(int include) override;
/**
* Ensure that if any rank udpates the communicator they all
* do. This is a global collective operation.
*/
- virtual bool NeedToUpdateCommunicator() VTK_OVERRIDE;
+ virtual bool NeedToUpdateCommunicator() override;
//@{
/**
diff --git a/Rendering/ParallelLIC/vtkPSurfaceLICPainter.h b/Rendering/ParallelLIC/vtkPSurfaceLICPainter.h
index f7ebec923e4026bb8eae4ac613ee5de6d416a477..c3c188b3d32adc5d3a24c327551de9f39a5c6447 100644
--- a/Rendering/ParallelLIC/vtkPSurfaceLICPainter.h
+++ b/Rendering/ParallelLIC/vtkPSurfaceLICPainter.h
@@ -35,7 +35,7 @@ class VTKRENDERINGPARALLELLIC_EXPORT vtkPSurfaceLICPainter : public vtkSurfaceLI
public:
static vtkPSurfaceLICPainter* New();
vtkTypeMacro(vtkPSurfaceLICPainter, vtkSurfaceLICPainter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Methods used for parallel benchmarks. Use cmake to define
diff --git a/Rendering/ParallelLIC/vtkParallelTimer.h b/Rendering/ParallelLIC/vtkParallelTimer.h
index 37fef3314ae74417cbc9746b63a4507b21c83b13..bf1abbd461a5552c0327e676a48c16ffd22cb836 100644
--- a/Rendering/ParallelLIC/vtkParallelTimer.h
+++ b/Rendering/ParallelLIC/vtkParallelTimer.h
@@ -57,7 +57,7 @@ class VTKRENDERINGPARALLELLIC_EXPORT vtkParallelTimer : public vtkObject
public:
static vtkParallelTimer *New();
vtkTypeMacro(vtkParallelTimer,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
diff --git a/Rendering/Qt/vtkQImageToImageSource.h b/Rendering/Qt/vtkQImageToImageSource.h
index ea9e5bb01ea045f455d5a7152af0a7c4369f4410..c891e2cdafab4f4fd08b06fda93fad38923140b0 100644
--- a/Rendering/Qt/vtkQImageToImageSource.h
+++ b/Rendering/Qt/vtkQImageToImageSource.h
@@ -32,7 +32,7 @@ class VTKRENDERINGQT_EXPORT vtkQImageToImageSource : public vtkImageAlgorithm
public:
static vtkQImageToImageSource *New();
vtkTypeMacro(vtkQImageToImageSource,vtkImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Set/Get QImage surface to be used.
@@ -43,15 +43,15 @@ public:
protected:
vtkQImageToImageSource();
- ~vtkQImageToImageSource() VTK_OVERRIDE {}
+ ~vtkQImageToImageSource() override {}
const QImage* QtImage;
int DataExtent[6];
- int RequestData( vtkInformation*, vtkInformationVector**, vtkInformationVector*) VTK_OVERRIDE;
+ int RequestData( vtkInformation*, vtkInformationVector**, vtkInformationVector*) override;
int RequestInformation ( vtkInformation * vtkNotUsed(request),
vtkInformationVector ** vtkNotUsed( inputVector ),
- vtkInformationVector *outputVector) VTK_OVERRIDE;
+ vtkInformationVector *outputVector) override;
private:
vtkQImageToImageSource(const vtkQImageToImageSource&) VTK_DELETE_FUNCTION;
void operator=(const vtkQImageToImageSource&) VTK_DELETE_FUNCTION;
diff --git a/Rendering/Qt/vtkQtInitialization.h b/Rendering/Qt/vtkQtInitialization.h
index cc0871719230212288aee045875c5503b07cdf72..2970d6db852a77c3085aed4577b30117e8ca9535 100644
--- a/Rendering/Qt/vtkQtInitialization.h
+++ b/Rendering/Qt/vtkQtInitialization.h
@@ -42,11 +42,11 @@ class VTKRENDERINGQT_EXPORT vtkQtInitialization : public vtkObject
public:
static vtkQtInitialization* New();
vtkTypeMacro(vtkQtInitialization, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkQtInitialization();
- ~vtkQtInitialization() VTK_OVERRIDE;
+ ~vtkQtInitialization() override;
private:
vtkQtInitialization(const vtkQtInitialization &) VTK_DELETE_FUNCTION;
diff --git a/Rendering/Qt/vtkQtLabelRenderStrategy.h b/Rendering/Qt/vtkQtLabelRenderStrategy.h
index 969a70f334274d22bc6de1d8e026f15f26eabd5f..5d82a6a4f2caec785cdeb6a79dba8b72c10fdaac 100644
--- a/Rendering/Qt/vtkQtLabelRenderStrategy.h
+++ b/Rendering/Qt/vtkQtLabelRenderStrategy.h
@@ -40,7 +40,7 @@ class vtkTextureMapToPlane;
class VTKRENDERINGQT_EXPORT vtkQtLabelRenderStrategy : public vtkLabelRenderStrategy
{
public:
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
vtkTypeMacro(vtkQtLabelRenderStrategy, vtkLabelRenderStrategy);
static vtkQtLabelRenderStrategy* New();
@@ -48,47 +48,47 @@ class VTKRENDERINGQT_EXPORT vtkQtLabelRenderStrategy : public vtkLabelRenderStra
* Compute the bounds of a label. Must be performed after the renderer is set.
*/
void ComputeLabelBounds(vtkTextProperty* tprop, vtkStdString label,
- double bds[4]) VTK_OVERRIDE
+ double bds[4]) override
{ this->Superclass::ComputeLabelBounds(tprop, label, bds); }
void ComputeLabelBounds(vtkTextProperty* tprop, vtkUnicodeString label,
- double bds[4]) VTK_OVERRIDE;
+ double bds[4]) override;
//@{
/**
* Render a label at a location in world coordinates.
* Must be performed between StartFrame() and EndFrame() calls.
*/
- void RenderLabel(int x[2], vtkTextProperty* tprop, vtkStdString label) VTK_OVERRIDE
+ void RenderLabel(int x[2], vtkTextProperty* tprop, vtkStdString label) override
{ this->Superclass::RenderLabel(x, tprop, label); }
void RenderLabel(int x[2], vtkTextProperty* tprop, vtkStdString label,
- int maxWidth) VTK_OVERRIDE
+ int maxWidth) override
{ this->Superclass::RenderLabel(x, tprop, label, maxWidth); }
void RenderLabel(int x[2], vtkTextProperty* tprop,
- vtkUnicodeString label) VTK_OVERRIDE;
+ vtkUnicodeString label) override;
void RenderLabel(int x[2], vtkTextProperty* tprop,
- vtkUnicodeString label, int maxWidth) VTK_OVERRIDE;
+ vtkUnicodeString label, int maxWidth) override;
//@}
/**
* Start a rendering frame. Renderer must be set.
*/
- void StartFrame() VTK_OVERRIDE;
+ void StartFrame() override;
/**
* End a rendering frame.
*/
- void EndFrame() VTK_OVERRIDE;
+ void EndFrame() override;
/**
* Release any graphics resources that are being consumed by this strategy.
* The parameter window could be used to determine which graphic
* resources to release.
*/
- void ReleaseGraphicsResources(vtkWindow *window) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *window) override;
protected:
vtkQtLabelRenderStrategy();
- ~vtkQtLabelRenderStrategy() VTK_OVERRIDE;
+ ~vtkQtLabelRenderStrategy() override;
class Internals;
Internals* Implementation;
diff --git a/Rendering/Qt/vtkQtStringToImage.h b/Rendering/Qt/vtkQtStringToImage.h
index 86fe937a6eb409648313b525acae65d4afcac365..37a5ae162d13dc60e9d3c41e88134b3796cfe195 100644
--- a/Rendering/Qt/vtkQtStringToImage.h
+++ b/Rendering/Qt/vtkQtStringToImage.h
@@ -34,7 +34,7 @@ class VTKRENDERINGQT_EXPORT vtkQtStringToImage : public vtkStringToImage
{
public:
vtkTypeMacro(vtkQtStringToImage, vtkStringToImage);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
static vtkQtStringToImage *New();
@@ -53,9 +53,9 @@ public:
* was empty).
*/
vtkVector2i GetBounds(vtkTextProperty *property,
- const vtkUnicodeString& string, int dpi) VTK_OVERRIDE;
+ const vtkUnicodeString& string, int dpi) override;
vtkVector2i GetBounds(vtkTextProperty *property,
- const vtkStdString& string, int dpi) VTK_OVERRIDE;
+ const vtkStdString& string, int dpi) override;
//@}
//@{
@@ -67,11 +67,11 @@ public:
int RenderString(vtkTextProperty *property,
const vtkUnicodeString& string, int dpi,
vtkImageData *data,
- int textDims[2] = NULL) VTK_OVERRIDE;
+ int textDims[2] = NULL) override;
int RenderString(vtkTextProperty *property,
const vtkStdString& string, int dpi,
vtkImageData *data,
- int textDims[2] = NULL) VTK_OVERRIDE;
+ int textDims[2] = NULL) override;
//@}
/**
@@ -81,7 +81,7 @@ public:
protected:
vtkQtStringToImage();
- ~vtkQtStringToImage() VTK_OVERRIDE;
+ ~vtkQtStringToImage() override;
class Internals;
Internals* Implementation;
diff --git a/Rendering/Qt/vtkQtTreeRingLabelMapper.h b/Rendering/Qt/vtkQtTreeRingLabelMapper.h
index 2d57e7b2d9d8c995b9c7ee28579cfed27a7cfb41..d0e245c98288534a7becf2d215f5c452e03ef630 100644
--- a/Rendering/Qt/vtkQtTreeRingLabelMapper.h
+++ b/Rendering/Qt/vtkQtTreeRingLabelMapper.h
@@ -66,14 +66,14 @@ class VTKRENDERINGQT_EXPORT vtkQtTreeRingLabelMapper : public vtkLabeledDataMapp
public:
static vtkQtTreeRingLabelMapper *New();
vtkTypeMacro(vtkQtTreeRingLabelMapper,vtkLabeledDataMapper);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
* Draw the text to the screen at each input point.
*/
- void RenderOpaqueGeometry(vtkViewport* viewport, vtkActor2D* actor) VTK_OVERRIDE;
- void RenderOverlay(vtkViewport *viewport, vtkActor2D *actor) VTK_OVERRIDE;
+ void RenderOpaqueGeometry(vtkViewport* viewport, vtkActor2D* actor) override;
+ void RenderOverlay(vtkViewport *viewport, vtkActor2D *actor) override;
//@}
/**
@@ -92,12 +92,12 @@ public:
* (set with a second integer parameter) are not currently supported,
* but are provided to avoid compiler warnings.
*/
- void SetLabelTextProperty(vtkTextProperty *p) VTK_OVERRIDE;
- vtkTextProperty* GetLabelTextProperty() VTK_OVERRIDE
+ void SetLabelTextProperty(vtkTextProperty *p) override;
+ vtkTextProperty* GetLabelTextProperty() override
{ return this->LabelTextProperty; }
- void SetLabelTextProperty(vtkTextProperty *p, int type) VTK_OVERRIDE
+ void SetLabelTextProperty(vtkTextProperty *p, int type) override
{ this->Superclass::SetLabelTextProperty(p, type); }
- vtkTextProperty* GetLabelTextProperty(int type) VTK_OVERRIDE
+ vtkTextProperty* GetLabelTextProperty(int type) override
{ return this->Superclass::GetLabelTextProperty(type); }
//@}
@@ -113,7 +113,7 @@ public:
* Return the object's MTime. This is overridden to include
* the timestamp of its internal class.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
void SetRenderer(vtkRenderer* ren)
{
@@ -127,7 +127,7 @@ public:
protected:
vtkQtTreeRingLabelMapper();
- ~vtkQtTreeRingLabelMapper() VTK_OVERRIDE;
+ ~vtkQtTreeRingLabelMapper() override;
void LabelTree(vtkTree *tree, vtkDataArray *sectorInfo,
vtkDataArray *numericData, vtkStringArray *stringData, vtkUnicodeStringArray *uStringData,
int activeComp, int numComps, vtkViewport* viewport);
diff --git a/Rendering/SceneGraph/Testing/Cxx/UnitTests.cxx b/Rendering/SceneGraph/Testing/Cxx/UnitTests.cxx
index 40e1994ed2e088f056c3a72f38b763cadcaad985..92a6d2656f862944065b115640840a3f2018ca21 100644
--- a/Rendering/SceneGraph/Testing/Cxx/UnitTests.cxx
+++ b/Rendering/SceneGraph/Testing/Cxx/UnitTests.cxx
@@ -41,7 +41,7 @@ class vtkMyActorNode : public vtkActorNode
public:
static vtkMyActorNode* New();
vtkTypeMacro(vtkMyActorNode, vtkActorNode);
- virtual void Render(bool prepass) VTK_OVERRIDE {
+ virtual void Render(bool prepass) override {
if (prepass)
{
cerr << "Render " << this << " " << this->GetClassName() << endl;
@@ -60,7 +60,7 @@ class vtkMyCameraNode : public vtkCameraNode
public:
static vtkMyCameraNode* New();
vtkTypeMacro(vtkMyCameraNode, vtkCameraNode);
- virtual void Render(bool prepass) VTK_OVERRIDE {
+ virtual void Render(bool prepass) override {
if (prepass)
{
cerr << "Render " << this << " " << this->GetClassName() << endl;
@@ -79,7 +79,7 @@ class vtkMyLightNode : public vtkLightNode
public:
static vtkMyLightNode* New();
vtkTypeMacro(vtkMyLightNode, vtkLightNode);
- virtual void Render( bool prepass) VTK_OVERRIDE {
+ virtual void Render( bool prepass) override {
if (prepass)
{
cerr << "Render " << this << " " << this->GetClassName() << endl;
@@ -98,7 +98,7 @@ class vtkMyRendererNode : public vtkRendererNode
public:
static vtkMyRendererNode* New();
vtkTypeMacro(vtkMyRendererNode, vtkRendererNode);
- virtual void Render(bool prepass) VTK_OVERRIDE {
+ virtual void Render(bool prepass) override {
if (prepass)
{
cerr << "Render " << this << " " << this->GetClassName() << endl;
@@ -117,7 +117,7 @@ class vtkMyWindowNode : public vtkWindowNode
public:
static vtkMyWindowNode* New();
vtkTypeMacro(vtkMyWindowNode, vtkWindowNode);
- virtual void Render(bool prepass) VTK_OVERRIDE {
+ virtual void Render(bool prepass) override {
if (prepass)
{
cerr << "Render " << this << " " << this->GetClassName() << endl;
diff --git a/Rendering/SceneGraph/vtkActorNode.h b/Rendering/SceneGraph/vtkActorNode.h
index 7af171d75cfe62825240dab81db845b0dbb54a5f..1165926c8126eb8c3af9199c9b2f1cd9c1a1d568 100644
--- a/Rendering/SceneGraph/vtkActorNode.h
+++ b/Rendering/SceneGraph/vtkActorNode.h
@@ -33,12 +33,12 @@ class VTKRENDERINGSCENEGRAPH_EXPORT vtkActorNode :
public:
static vtkActorNode* New();
vtkTypeMacro(vtkActorNode, vtkViewNode);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Build containers for our child nodes.
*/
- virtual void Build(bool prepass) VTK_OVERRIDE;
+ virtual void Build(bool prepass) override;
protected:
vtkActorNode();
diff --git a/Rendering/SceneGraph/vtkCameraNode.h b/Rendering/SceneGraph/vtkCameraNode.h
index 050436913ee18f1e45ed919d837cc6e8c75f5920..3396fee3247da59c7110b89ab58c6b7e05d44344 100644
--- a/Rendering/SceneGraph/vtkCameraNode.h
+++ b/Rendering/SceneGraph/vtkCameraNode.h
@@ -31,7 +31,7 @@ class VTKRENDERINGSCENEGRAPH_EXPORT vtkCameraNode :
public:
static vtkCameraNode* New();
vtkTypeMacro(vtkCameraNode, vtkViewNode);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkCameraNode();
diff --git a/Rendering/SceneGraph/vtkLightNode.h b/Rendering/SceneGraph/vtkLightNode.h
index f2658990bf70726c5c92dc9ca02b22182b072e91..4269b98d76bba97766e90ef2ff149be185dcdf6f 100644
--- a/Rendering/SceneGraph/vtkLightNode.h
+++ b/Rendering/SceneGraph/vtkLightNode.h
@@ -31,7 +31,7 @@ class VTKRENDERINGSCENEGRAPH_EXPORT vtkLightNode :
public:
static vtkLightNode* New();
vtkTypeMacro(vtkLightNode, vtkViewNode);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkLightNode();
diff --git a/Rendering/SceneGraph/vtkMapperNode.h b/Rendering/SceneGraph/vtkMapperNode.h
index 967a1f2f5896e1d5362a6354601097b51cd355ec..88a2976c95a9ad0f44790b8428c68d558cc54dce 100644
--- a/Rendering/SceneGraph/vtkMapperNode.h
+++ b/Rendering/SceneGraph/vtkMapperNode.h
@@ -36,7 +36,7 @@ class VTKRENDERINGSCENEGRAPH_EXPORT vtkMapperNode :
public:
static vtkMapperNode* New();
vtkTypeMacro(vtkMapperNode, vtkViewNode);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkMapperNode();
diff --git a/Rendering/SceneGraph/vtkPolyDataMapperNode.h b/Rendering/SceneGraph/vtkPolyDataMapperNode.h
index 1b1429f897f05c59c0c1255d0f2ea7dc1dd0e6c0..20f11a154e29f8cc0c29b2001e7fbfcc002586a9 100644
--- a/Rendering/SceneGraph/vtkPolyDataMapperNode.h
+++ b/Rendering/SceneGraph/vtkPolyDataMapperNode.h
@@ -39,7 +39,7 @@ class VTKRENDERINGSCENEGRAPH_EXPORT vtkPolyDataMapperNode :
public:
static vtkPolyDataMapperNode* New();
vtkTypeMacro(vtkPolyDataMapperNode, vtkMapperNode);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
typedef struct {
std::vector<unsigned int> vertex_index;
diff --git a/Rendering/SceneGraph/vtkRendererNode.h b/Rendering/SceneGraph/vtkRendererNode.h
index 18a872802e8cb4e20210f326a188e4bbbb492336..f4dbae6905d54e7ce700d7795e1c6f4251804c0b 100644
--- a/Rendering/SceneGraph/vtkRendererNode.h
+++ b/Rendering/SceneGraph/vtkRendererNode.h
@@ -33,17 +33,17 @@ class VTKRENDERINGSCENEGRAPH_EXPORT vtkRendererNode :
public:
static vtkRendererNode* New();
vtkTypeMacro(vtkRendererNode, vtkViewNode);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Build containers for our child nodes.
*/
- virtual void Build(bool prepass) VTK_OVERRIDE;
+ virtual void Build(bool prepass) override;
/**
* Synchronize our state
*/
- virtual void Synchronize(bool prepass) VTK_OVERRIDE;
+ virtual void Synchronize(bool prepass) override;
protected:
vtkRendererNode();
diff --git a/Rendering/SceneGraph/vtkViewNode.h b/Rendering/SceneGraph/vtkViewNode.h
index dce7a11fb2afee50c6e043beac452e3c363ecc63..d7a8b884833a5c392e9ac20eea3dd21d60bf632e 100644
--- a/Rendering/SceneGraph/vtkViewNode.h
+++ b/Rendering/SceneGraph/vtkViewNode.h
@@ -39,7 +39,7 @@ class VTKRENDERINGSCENEGRAPH_EXPORT vtkViewNode :
{
public:
vtkTypeMacro(vtkViewNode, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
diff --git a/Rendering/SceneGraph/vtkViewNodeCollection.h b/Rendering/SceneGraph/vtkViewNodeCollection.h
index 475f537d36b1a79272a19d88298628662dfaa4f9..1dbb73a9d836972ec740d4851d0734a2ecd46888 100644
--- a/Rendering/SceneGraph/vtkViewNodeCollection.h
+++ b/Rendering/SceneGraph/vtkViewNodeCollection.h
@@ -33,7 +33,7 @@ class VTKRENDERINGSCENEGRAPH_EXPORT vtkViewNodeCollection :
public:
static vtkViewNodeCollection* New();
vtkTypeMacro(vtkViewNodeCollection, vtkCollection);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Add a ViewNode to the list.
diff --git a/Rendering/SceneGraph/vtkViewNodeFactory.h b/Rendering/SceneGraph/vtkViewNodeFactory.h
index 3bb841df8954e5a67afbf70f2b40fba1d284510b..3524a0c8db91a4450ae971f1f0127058b1663bec 100644
--- a/Rendering/SceneGraph/vtkViewNodeFactory.h
+++ b/Rendering/SceneGraph/vtkViewNodeFactory.h
@@ -36,7 +36,7 @@ class VTKRENDERINGSCENEGRAPH_EXPORT vtkViewNodeFactory :
public:
static vtkViewNodeFactory* New();
vtkTypeMacro(vtkViewNodeFactory, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Give a functin pointer to a class that will manufacture a
diff --git a/Rendering/SceneGraph/vtkVolumeMapperNode.h b/Rendering/SceneGraph/vtkVolumeMapperNode.h
index 6a1e92581d376934b0b21ff27f8acdc9891d63f3..daa04643eb7a9d8af3b2c271f539d9317871af36 100644
--- a/Rendering/SceneGraph/vtkVolumeMapperNode.h
+++ b/Rendering/SceneGraph/vtkVolumeMapperNode.h
@@ -39,7 +39,7 @@ class VTKRENDERINGSCENEGRAPH_EXPORT vtkVolumeMapperNode :
public:
static vtkVolumeMapperNode* New();
vtkTypeMacro(vtkVolumeMapperNode, vtkMapperNode);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkVolumeMapperNode();
diff --git a/Rendering/SceneGraph/vtkVolumeNode.h b/Rendering/SceneGraph/vtkVolumeNode.h
index 2cd7d778b93f4789a69c8b30af49a301a526ec91..401237bea0356aeebfcb1d67804dcd7de74a17d0 100644
--- a/Rendering/SceneGraph/vtkVolumeNode.h
+++ b/Rendering/SceneGraph/vtkVolumeNode.h
@@ -33,12 +33,12 @@ class VTKRENDERINGSCENEGRAPH_EXPORT vtkVolumeNode :
public:
static vtkVolumeNode* New();
vtkTypeMacro(vtkVolumeNode, vtkViewNode);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Build containers for our child nodes.
*/
- virtual void Build(bool prepass) VTK_OVERRIDE;
+ virtual void Build(bool prepass) override;
protected:
vtkVolumeNode();
diff --git a/Rendering/SceneGraph/vtkWindowNode.h b/Rendering/SceneGraph/vtkWindowNode.h
index 8892e5c25869bbd7ee3ae760d03f16b0bfbece87..5f04903031cf3a0f1ccaf23001028b4c8a7e4240 100644
--- a/Rendering/SceneGraph/vtkWindowNode.h
+++ b/Rendering/SceneGraph/vtkWindowNode.h
@@ -34,17 +34,17 @@ class VTKRENDERINGSCENEGRAPH_EXPORT vtkWindowNode :
public:
static vtkWindowNode* New();
vtkTypeMacro(vtkWindowNode, vtkViewNode);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Build containers for our child nodes.
*/
- virtual void Build(bool prepass) VTK_OVERRIDE;
+ virtual void Build(bool prepass) override;
/**
* Get state of my renderable.
*/
- virtual void Synchronize(bool prepass) VTK_OVERRIDE;
+ virtual void Synchronize(bool prepass) override;
/**
* Return the size of the last rendered image
diff --git a/Rendering/Tk/vtkCocoaTkUtilities.h b/Rendering/Tk/vtkCocoaTkUtilities.h
index 2e0ed03b526930549a3aef10a46e4a4633d36a13..adf354471524823b327ad852151e519483eafbab 100644
--- a/Rendering/Tk/vtkCocoaTkUtilities.h
+++ b/Rendering/Tk/vtkCocoaTkUtilities.h
@@ -43,7 +43,7 @@ class vtkCocoaTkUtilities : public vtkObject
public:
static vtkCocoaTkUtilities *New();
vtkTypeMacro(vtkCocoaTkUtilities,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Return the NSView for a Tk_Window. It is returned as a void pointer
@@ -53,7 +53,7 @@ public:
protected:
vtkCocoaTkUtilities() {}
- ~vtkCocoaTkUtilities() VTK_OVERRIDE {}
+ ~vtkCocoaTkUtilities() override {}
private:
vtkCocoaTkUtilities(const vtkCocoaTkUtilities&) VTK_DELETE_FUNCTION;
diff --git a/Rendering/Tk/vtkXRenderWindowTclInteractor.h b/Rendering/Tk/vtkXRenderWindowTclInteractor.h
index c84cb42f95b32bfb65297d20bc942cda477afe6a..afac6a358026749b1d0246bac08afc2d10a503ac 100644
--- a/Rendering/Tk/vtkXRenderWindowTclInteractor.h
+++ b/Rendering/Tk/vtkXRenderWindowTclInteractor.h
@@ -38,18 +38,18 @@ class vtkXRenderWindowTclInteractor : public vtkXRenderWindowInteractor
public:
static vtkXRenderWindowTclInteractor *New();
vtkTypeMacro(vtkXRenderWindowTclInteractor,vtkXRenderWindowInteractor);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Initializes a Tcl/Tk specific event handler.
*/
- void Initialize() VTK_OVERRIDE;
+ void Initialize() override;
/**
* Overridden only to eliminate the "virtual function hidden" warning.
* Implementation delegates directly to the Superclass.
*/
- void Initialize(XtAppContext app) VTK_OVERRIDE;
+ void Initialize(XtAppContext app) override;
//@{
/**
@@ -61,8 +61,8 @@ public:
* and all other interactors associated with the widget are disabled
* when their data is not displayed.
*/
- void Enable() VTK_OVERRIDE;
- void Disable() VTK_OVERRIDE;
+ void Enable() override;
+ void Disable() override;
//@}
/**
@@ -70,19 +70,19 @@ public:
* presses the 'q' or 'e' key or when some other event observer calls
* our ExitCallback method.
*/
- void Start() VTK_OVERRIDE;
+ void Start() override;
protected:
vtkXRenderWindowTclInteractor();
- ~vtkXRenderWindowTclInteractor() VTK_OVERRIDE;
+ ~vtkXRenderWindowTclInteractor() override;
//@{
/**
* Tcl/Tk specific internal timer methods. See the superclass for detailed
* documentation.
*/
- int InternalCreateTimer(int timerId, int timerType, unsigned long duration) VTK_OVERRIDE;
- int InternalDestroyTimer(int platformTimerId) VTK_OVERRIDE;
+ int InternalCreateTimer(int timerId, int timerType, unsigned long duration) override;
+ int InternalDestroyTimer(int platformTimerId) override;
//@}
private:
diff --git a/Rendering/Volume/Testing/Cxx/ExerciseUnstructuredGridRayCastMapper.cxx b/Rendering/Volume/Testing/Cxx/ExerciseUnstructuredGridRayCastMapper.cxx
index 9ce79fffb049c526d07597e5bacbf72aff919527..0783d90177a23953fa40b58e50536d088b8602ad 100644
--- a/Rendering/Volume/Testing/Cxx/ExerciseUnstructuredGridRayCastMapper.cxx
+++ b/Rendering/Volume/Testing/Cxx/ExerciseUnstructuredGridRayCastMapper.cxx
@@ -62,7 +62,7 @@ protected:
~vtkClassifyVolume();
int RequestData(vtkInformation *, vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
virtual void Classify(vtkDataSetAttributes *in, vtkDataSetAttributes *out);
diff --git a/Rendering/Volume/Testing/Cxx/TestGPURayCastClippingUserTransform.cxx b/Rendering/Volume/Testing/Cxx/TestGPURayCastClippingUserTransform.cxx
index eef060a82fe3a508aada5e8300247b86e718aa58..cdcbd309430bf9ff4b73e716c4c5aab09c210527 100644
--- a/Rendering/Volume/Testing/Cxx/TestGPURayCastClippingUserTransform.cxx
+++ b/Rendering/Volume/Testing/Cxx/TestGPURayCastClippingUserTransform.cxx
@@ -132,7 +132,7 @@ public:
return new vtkInteractorStyleCallback;
}
- void Execute(vtkObject *caller, unsigned long, void*) VTK_OVERRIDE
+ void Execute(vtkObject *caller, unsigned long, void*) override
{
vtkInteractorStyle* style = reinterpret_cast<vtkInteractorStyle*>(caller);
diff --git a/Rendering/Volume/Testing/Cxx/TestGPURayCastVolumePicking.cxx b/Rendering/Volume/Testing/Cxx/TestGPURayCastVolumePicking.cxx
index 31a48ae631f91b8a5717d5847b836f98ef87debf..87881f178f0c270157413c337c673ad50dcbf070 100644
--- a/Rendering/Volume/Testing/Cxx/TestGPURayCastVolumePicking.cxx
+++ b/Rendering/Volume/Testing/Cxx/TestGPURayCastVolumePicking.cxx
@@ -62,12 +62,12 @@ public:
{
};
- ~VolumePickingCommand() VTK_OVERRIDE
+ ~VolumePickingCommand() override
{
};
void Execute(vtkObject* vtkNotUsed(caller), unsigned long vtkNotUsed(eventId),
- void* vtkNotUsed(callData)) VTK_OVERRIDE
+ void* vtkNotUsed(callData)) override
{
assert(this->Renderer != nullptr);
diff --git a/Rendering/Volume/Testing/Cxx/TestRemoveVolumeNonCurrentContext.cxx b/Rendering/Volume/Testing/Cxx/TestRemoveVolumeNonCurrentContext.cxx
index bdcfb8c913a3c8e7ae1919d60668248376f1d28c..f2dfa3cc5e45151a600fbe2f4a9cc8af62b6c795 100644
--- a/Rendering/Volume/Testing/Cxx/TestRemoveVolumeNonCurrentContext.cxx
+++ b/Rendering/Volume/Testing/Cxx/TestRemoveVolumeNonCurrentContext.cxx
@@ -539,7 +539,7 @@ public:
void Execute(vtkObject* caller,
unsigned long eventId,
- void* vtkNotUsed(callData)) VTK_OVERRIDE
+ void* vtkNotUsed(callData)) override
{
if (eventId != vtkCommand::KeyPressEvent)
{
diff --git a/Rendering/Volume/vtkDirectionEncoder.h b/Rendering/Volume/vtkDirectionEncoder.h
index 841b2242779919bfac7e1da48e6397792e481b02..968c9b1159400b0ba4131f4ee86c9319f2f5a8b0 100644
--- a/Rendering/Volume/vtkDirectionEncoder.h
+++ b/Rendering/Volume/vtkDirectionEncoder.h
@@ -44,7 +44,7 @@ public:
* Get the name of this class
*/
vtkTypeMacro(vtkDirectionEncoder,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
/**
@@ -72,7 +72,7 @@ public:
protected:
vtkDirectionEncoder() {}
- ~vtkDirectionEncoder()VTK_OVERRIDE {}
+ ~vtkDirectionEncoder() override {}
private:
vtkDirectionEncoder(const vtkDirectionEncoder&) VTK_DELETE_FUNCTION;
void operator=(const vtkDirectionEncoder&) VTK_DELETE_FUNCTION;
diff --git a/Rendering/Volume/vtkEncodedGradientEstimator.h b/Rendering/Volume/vtkEncodedGradientEstimator.h
index f92b44102ca7ddcd93ebd714da17884ecacc81fe..11d36b166dfd70486fc880176988d6c384dcc19d 100644
--- a/Rendering/Volume/vtkEncodedGradientEstimator.h
+++ b/Rendering/Volume/vtkEncodedGradientEstimator.h
@@ -45,7 +45,7 @@ class VTKRENDERINGVOLUME_EXPORT vtkEncodedGradientEstimator : public vtkObject
{
public:
vtkTypeMacro(vtkEncodedGradientEstimator,vtkObject);
- void PrintSelf( ostream& os, vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf( ostream& os, vtkIndent indent ) override;
//@{
/**
@@ -212,9 +212,9 @@ public:
protected:
vtkEncodedGradientEstimator();
- ~vtkEncodedGradientEstimator() VTK_OVERRIDE;
+ ~vtkEncodedGradientEstimator() override;
- void ReportReferences(vtkGarbageCollector*) VTK_OVERRIDE;
+ void ReportReferences(vtkGarbageCollector*) override;
// The number of threads to use when encoding normals
int NumberOfThreads;
diff --git a/Rendering/Volume/vtkEncodedGradientShader.h b/Rendering/Volume/vtkEncodedGradientShader.h
index 1faebd5172226ed8cb1ccdf54a8ea52139c8d4b5..0225b08a9646284f8cb873fd05fc26e3f68b4f79 100644
--- a/Rendering/Volume/vtkEncodedGradientShader.h
+++ b/Rendering/Volume/vtkEncodedGradientShader.h
@@ -51,7 +51,7 @@ public:
/**
* Print the vtkEncodedGradientShader
*/
- void PrintSelf( ostream& os, vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf( ostream& os, vtkIndent indent ) override;
//@{
/**
@@ -94,7 +94,7 @@ public:
protected:
vtkEncodedGradientShader();
- ~vtkEncodedGradientShader() VTK_OVERRIDE;
+ ~vtkEncodedGradientShader() override;
/**
* Build a shading table for a light with the specified direction,
diff --git a/Rendering/Volume/vtkFiniteDifferenceGradientEstimator.h b/Rendering/Volume/vtkFiniteDifferenceGradientEstimator.h
index faeb5966cad7037f68736d35975673f1a134490f..5b1b159d56923610df6aae6e88ccf53660667940 100644
--- a/Rendering/Volume/vtkFiniteDifferenceGradientEstimator.h
+++ b/Rendering/Volume/vtkFiniteDifferenceGradientEstimator.h
@@ -46,7 +46,7 @@ class VTKRENDERINGVOLUME_EXPORT vtkFiniteDifferenceGradientEstimator : public vt
{
public:
vtkTypeMacro(vtkFiniteDifferenceGradientEstimator,vtkEncodedGradientEstimator);
- void PrintSelf( ostream& os, vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf( ostream& os, vtkIndent indent ) override;
/**
* Construct a vtkFiniteDifferenceGradientEstimator with
@@ -68,12 +68,12 @@ public:
protected:
vtkFiniteDifferenceGradientEstimator();
- ~vtkFiniteDifferenceGradientEstimator() VTK_OVERRIDE;
+ ~vtkFiniteDifferenceGradientEstimator() override;
/**
* Recompute the encoded normals and gradient magnitudes.
*/
- void UpdateNormals( void ) VTK_OVERRIDE;
+ void UpdateNormals( void ) override;
private:
vtkFiniteDifferenceGradientEstimator(const vtkFiniteDifferenceGradientEstimator&) VTK_DELETE_FUNCTION;
diff --git a/Rendering/Volume/vtkFixedPointRayCastImage.h b/Rendering/Volume/vtkFixedPointRayCastImage.h
index f8c62089c571e63eb22e6ce901c017c5711cb3c8..739c63bdcff3ecd2af0e5614218fe1bf0717bb7f 100644
--- a/Rendering/Volume/vtkFixedPointRayCastImage.h
+++ b/Rendering/Volume/vtkFixedPointRayCastImage.h
@@ -41,7 +41,7 @@ class VTKRENDERINGVOLUME_EXPORT vtkFixedPointRayCastImage : public vtkObject
public:
static vtkFixedPointRayCastImage *New();
vtkTypeMacro(vtkFixedPointRayCastImage,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Get the internal storage for the image. It is a pointer to
@@ -177,7 +177,7 @@ public:
protected:
vtkFixedPointRayCastImage();
- ~vtkFixedPointRayCastImage() VTK_OVERRIDE;
+ ~vtkFixedPointRayCastImage() override;
// This is how big the image would be if it covered the entire viewport
int ImageViewportSize[2];
diff --git a/Rendering/Volume/vtkFixedPointVolumeRayCastCompositeGOHelper.h b/Rendering/Volume/vtkFixedPointVolumeRayCastCompositeGOHelper.h
index c47f5cdd36079b9db7af0768f7428413a7c3c4a2..6005bb2bdc18fc05d8738e3796c35d89d8809b94 100644
--- a/Rendering/Volume/vtkFixedPointVolumeRayCastCompositeGOHelper.h
+++ b/Rendering/Volume/vtkFixedPointVolumeRayCastCompositeGOHelper.h
@@ -41,16 +41,16 @@ class VTKRENDERINGVOLUME_EXPORT vtkFixedPointVolumeRayCastCompositeGOHelper : pu
public:
static vtkFixedPointVolumeRayCastCompositeGOHelper *New();
vtkTypeMacro(vtkFixedPointVolumeRayCastCompositeGOHelper,vtkFixedPointVolumeRayCastHelper);
- void PrintSelf( ostream& os, vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf( ostream& os, vtkIndent indent ) override;
void GenerateImage( int threadID,
int threadCount,
vtkVolume *vol,
- vtkFixedPointVolumeRayCastMapper *mapper) VTK_OVERRIDE;
+ vtkFixedPointVolumeRayCastMapper *mapper) override;
protected:
vtkFixedPointVolumeRayCastCompositeGOHelper();
- ~vtkFixedPointVolumeRayCastCompositeGOHelper() VTK_OVERRIDE;
+ ~vtkFixedPointVolumeRayCastCompositeGOHelper() override;
private:
vtkFixedPointVolumeRayCastCompositeGOHelper(const vtkFixedPointVolumeRayCastCompositeGOHelper&) VTK_DELETE_FUNCTION;
diff --git a/Rendering/Volume/vtkFixedPointVolumeRayCastCompositeGOShadeHelper.h b/Rendering/Volume/vtkFixedPointVolumeRayCastCompositeGOShadeHelper.h
index 7fbcf5381fac1aa10534163024453e86c35365a8..83a99d9ea1f110e95e925630904b4943ceffdf62 100644
--- a/Rendering/Volume/vtkFixedPointVolumeRayCastCompositeGOShadeHelper.h
+++ b/Rendering/Volume/vtkFixedPointVolumeRayCastCompositeGOShadeHelper.h
@@ -41,16 +41,16 @@ class VTKRENDERINGVOLUME_EXPORT vtkFixedPointVolumeRayCastCompositeGOShadeHelper
public:
static vtkFixedPointVolumeRayCastCompositeGOShadeHelper *New();
vtkTypeMacro(vtkFixedPointVolumeRayCastCompositeGOShadeHelper,vtkFixedPointVolumeRayCastHelper);
- void PrintSelf( ostream& os, vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf( ostream& os, vtkIndent indent ) override;
void GenerateImage( int threadID,
int threadCount,
vtkVolume *vol,
- vtkFixedPointVolumeRayCastMapper *mapper) VTK_OVERRIDE;
+ vtkFixedPointVolumeRayCastMapper *mapper) override;
protected:
vtkFixedPointVolumeRayCastCompositeGOShadeHelper();
- ~vtkFixedPointVolumeRayCastCompositeGOShadeHelper() VTK_OVERRIDE;
+ ~vtkFixedPointVolumeRayCastCompositeGOShadeHelper() override;
private:
vtkFixedPointVolumeRayCastCompositeGOShadeHelper(const vtkFixedPointVolumeRayCastCompositeGOShadeHelper&) VTK_DELETE_FUNCTION;
diff --git a/Rendering/Volume/vtkFixedPointVolumeRayCastCompositeHelper.h b/Rendering/Volume/vtkFixedPointVolumeRayCastCompositeHelper.h
index 2d67815f33d79658e28fe6d00bb156604fe91454..cc7eae04e2e0a4413bde274e323e5dbd67d8acf3 100644
--- a/Rendering/Volume/vtkFixedPointVolumeRayCastCompositeHelper.h
+++ b/Rendering/Volume/vtkFixedPointVolumeRayCastCompositeHelper.h
@@ -41,16 +41,16 @@ class VTKRENDERINGVOLUME_EXPORT vtkFixedPointVolumeRayCastCompositeHelper : publ
public:
static vtkFixedPointVolumeRayCastCompositeHelper *New();
vtkTypeMacro(vtkFixedPointVolumeRayCastCompositeHelper,vtkFixedPointVolumeRayCastHelper);
- void PrintSelf( ostream& os, vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf( ostream& os, vtkIndent indent ) override;
void GenerateImage( int threadID,
int threadCount,
vtkVolume *vol,
- vtkFixedPointVolumeRayCastMapper *mapper) VTK_OVERRIDE;
+ vtkFixedPointVolumeRayCastMapper *mapper) override;
protected:
vtkFixedPointVolumeRayCastCompositeHelper();
- ~vtkFixedPointVolumeRayCastCompositeHelper() VTK_OVERRIDE;
+ ~vtkFixedPointVolumeRayCastCompositeHelper() override;
private:
vtkFixedPointVolumeRayCastCompositeHelper(const vtkFixedPointVolumeRayCastCompositeHelper&) VTK_DELETE_FUNCTION;
diff --git a/Rendering/Volume/vtkFixedPointVolumeRayCastCompositeShadeHelper.h b/Rendering/Volume/vtkFixedPointVolumeRayCastCompositeShadeHelper.h
index 20518facbaf76e2b270d28fca650d0f2b02a1f7b..02e45c29480e3c90ac3ee3bc63c3fe02764db07c 100644
--- a/Rendering/Volume/vtkFixedPointVolumeRayCastCompositeShadeHelper.h
+++ b/Rendering/Volume/vtkFixedPointVolumeRayCastCompositeShadeHelper.h
@@ -41,16 +41,16 @@ class VTKRENDERINGVOLUME_EXPORT vtkFixedPointVolumeRayCastCompositeShadeHelper :
public:
static vtkFixedPointVolumeRayCastCompositeShadeHelper *New();
vtkTypeMacro(vtkFixedPointVolumeRayCastCompositeShadeHelper,vtkFixedPointVolumeRayCastHelper);
- void PrintSelf( ostream& os, vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf( ostream& os, vtkIndent indent ) override;
void GenerateImage( int threadID,
int threadCount,
vtkVolume *vol,
- vtkFixedPointVolumeRayCastMapper *mapper) VTK_OVERRIDE;
+ vtkFixedPointVolumeRayCastMapper *mapper) override;
protected:
vtkFixedPointVolumeRayCastCompositeShadeHelper();
- ~vtkFixedPointVolumeRayCastCompositeShadeHelper() VTK_OVERRIDE;
+ ~vtkFixedPointVolumeRayCastCompositeShadeHelper() override;
private:
vtkFixedPointVolumeRayCastCompositeShadeHelper(const vtkFixedPointVolumeRayCastCompositeShadeHelper&) VTK_DELETE_FUNCTION;
diff --git a/Rendering/Volume/vtkFixedPointVolumeRayCastHelper.h b/Rendering/Volume/vtkFixedPointVolumeRayCastHelper.h
index d236fdf6e2e63755c4677dce033b402601121369..e515899e2db745438c154af6b7235522758c1649 100644
--- a/Rendering/Volume/vtkFixedPointVolumeRayCastHelper.h
+++ b/Rendering/Volume/vtkFixedPointVolumeRayCastHelper.h
@@ -1174,7 +1174,7 @@ class VTKRENDERINGVOLUME_EXPORT vtkFixedPointVolumeRayCastHelper : public vtkObj
public:
static vtkFixedPointVolumeRayCastHelper *New();
vtkTypeMacro(vtkFixedPointVolumeRayCastHelper,vtkObject);
- void PrintSelf( ostream& os, vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf( ostream& os, vtkIndent indent ) override;
virtual void GenerateImage( int,
int,
@@ -1183,7 +1183,7 @@ public:
protected:
vtkFixedPointVolumeRayCastHelper();
- ~vtkFixedPointVolumeRayCastHelper() VTK_OVERRIDE;
+ ~vtkFixedPointVolumeRayCastHelper() override;
private:
diff --git a/Rendering/Volume/vtkFixedPointVolumeRayCastMIPHelper.h b/Rendering/Volume/vtkFixedPointVolumeRayCastMIPHelper.h
index 42a71f2d98253c6de6960c79b9dbc1a51d8b2f3e..ef86817cf5d6702be968e3a8c1ce3ec0635f49e4 100644
--- a/Rendering/Volume/vtkFixedPointVolumeRayCastMIPHelper.h
+++ b/Rendering/Volume/vtkFixedPointVolumeRayCastMIPHelper.h
@@ -39,16 +39,16 @@ class VTKRENDERINGVOLUME_EXPORT vtkFixedPointVolumeRayCastMIPHelper : public vtk
public:
static vtkFixedPointVolumeRayCastMIPHelper *New();
vtkTypeMacro(vtkFixedPointVolumeRayCastMIPHelper,vtkFixedPointVolumeRayCastHelper);
- void PrintSelf( ostream& os, vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf( ostream& os, vtkIndent indent ) override;
void GenerateImage( int threadID,
int threadCount,
vtkVolume *vol,
- vtkFixedPointVolumeRayCastMapper *mapper) VTK_OVERRIDE;
+ vtkFixedPointVolumeRayCastMapper *mapper) override;
protected:
vtkFixedPointVolumeRayCastMIPHelper();
- ~vtkFixedPointVolumeRayCastMIPHelper() VTK_OVERRIDE;
+ ~vtkFixedPointVolumeRayCastMIPHelper() override;
private:
vtkFixedPointVolumeRayCastMIPHelper(const vtkFixedPointVolumeRayCastMIPHelper&) VTK_DELETE_FUNCTION;
diff --git a/Rendering/Volume/vtkFixedPointVolumeRayCastMapper.h b/Rendering/Volume/vtkFixedPointVolumeRayCastMapper.h
index 196e955e323c494d8160f87485212d77f4b7feda..faf19fdfcdc5bd4de2526b6b1cc3f4bc581b5e7a 100644
--- a/Rendering/Volume/vtkFixedPointVolumeRayCastMapper.h
+++ b/Rendering/Volume/vtkFixedPointVolumeRayCastMapper.h
@@ -101,7 +101,7 @@ class VTKRENDERINGVOLUME_EXPORT vtkFixedPointVolumeRayCastMapper : public vtkVol
public:
static vtkFixedPointVolumeRayCastMapper *New();
vtkTypeMacro(vtkFixedPointVolumeRayCastMapper,vtkVolumeMapper);
- void PrintSelf( ostream& os, vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf( ostream& os, vtkIndent indent ) override;
//@{
/**
@@ -223,7 +223,7 @@ public:
* WARNING: INTERNAL METHOD - NOT INTENDED FOR GENERAL USE
* Initialize rendering for this volume.
*/
- void Render( vtkRenderer *, vtkVolume * ) VTK_OVERRIDE;
+ void Render( vtkRenderer *, vtkVolume * ) override;
unsigned int ToFixedPointPosition( float val );
void ToFixedPointPosition( float in[3], unsigned int out[3] );
@@ -357,11 +357,11 @@ public:
* The parameter window could be used to determine which graphic
* resources to release.
*/
- void ReleaseGraphicsResources(vtkWindow *) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *) override;
protected:
vtkFixedPointVolumeRayCastMapper();
- ~vtkFixedPointVolumeRayCastMapper() VTK_OVERRIDE;
+ ~vtkFixedPointVolumeRayCastMapper() override;
// The helper class that displays the image
vtkRayCastImageDisplayHelper *ImageDisplayHelper;
diff --git a/Rendering/Volume/vtkGPUVolumeRayCastMapper.h b/Rendering/Volume/vtkGPUVolumeRayCastMapper.h
index e75a7c03dec1765ce3c78ed46e728ff852e1d2e5..7d8f736fb50772a9104c08c152e76dff2d440151 100644
--- a/Rendering/Volume/vtkGPUVolumeRayCastMapper.h
+++ b/Rendering/Volume/vtkGPUVolumeRayCastMapper.h
@@ -39,7 +39,7 @@ class VTKRENDERINGVOLUME_EXPORT vtkGPUVolumeRayCastMapper : public vtkVolumeMapp
public:
static vtkGPUVolumeRayCastMapper *New();
vtkTypeMacro(vtkGPUVolumeRayCastMapper,vtkVolumeMapper);
- void PrintSelf( ostream& os, vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf( ostream& os, vtkIndent indent ) override;
//@{
/**
@@ -332,7 +332,7 @@ public:
* Initialize rendering for this volume.
* \warning INTERNAL METHOD - NOT INTENDED FOR GENERAL USE
*/
- void Render( vtkRenderer *, vtkVolume * ) VTK_OVERRIDE;
+ void Render( vtkRenderer *, vtkVolume * ) override;
/**
* Handled in the subclass - the actual render method
@@ -346,7 +346,7 @@ public:
* resources to release.
* \warning INTERNAL METHOD - NOT INTENDED FOR GENERAL USE
*/
- void ReleaseGraphicsResources(vtkWindow *) VTK_OVERRIDE {}
+ void ReleaseGraphicsResources(vtkWindow *) override {}
/**
* Return how much the dataset has to be reduced in each dimension to
@@ -364,7 +364,7 @@ public:
protected:
vtkGPUVolumeRayCastMapper();
- ~vtkGPUVolumeRayCastMapper() VTK_OVERRIDE;
+ ~vtkGPUVolumeRayCastMapper() override;
// Check to see that the render will be OK
int ValidateRender( vtkRenderer *, vtkVolume * );
diff --git a/Rendering/Volume/vtkHAVSVolumeMapper.h b/Rendering/Volume/vtkHAVSVolumeMapper.h
index 4a3d557fe4b1ce65fa50d71786b6c8c46a791e27..390eec9352c2c8c8f9c2930037000c5c96feb54c 100644
--- a/Rendering/Volume/vtkHAVSVolumeMapper.h
+++ b/Rendering/Volume/vtkHAVSVolumeMapper.h
@@ -136,7 +136,7 @@ public:
static vtkHAVSVolumeMapper *New();
vtkTypeMacro(vtkHAVSVolumeMapper,
vtkUnstructuredGridVolumeMapper);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -206,7 +206,7 @@ public:
protected:
vtkHAVSVolumeMapper();
- ~vtkHAVSVolumeMapper() VTK_OVERRIDE;
+ ~vtkHAVSVolumeMapper() override;
virtual void Initialize(vtkRenderer *ren, vtkVolume *vol) = 0;
void InitializePrimitives(vtkVolume *vol);
diff --git a/Rendering/Volume/vtkOSPRayVolumeInterface.h b/Rendering/Volume/vtkOSPRayVolumeInterface.h
index ca1e2ab4d75f32f4fcfd6c8a66d02d5a677ee54c..5d919a231ab7f090d03cbd7c327f8f604d35c49e 100644
--- a/Rendering/Volume/vtkOSPRayVolumeInterface.h
+++ b/Rendering/Volume/vtkOSPRayVolumeInterface.h
@@ -36,16 +36,16 @@ class VTKRENDERINGVOLUME_EXPORT vtkOSPRayVolumeInterface
public:
static vtkOSPRayVolumeInterface *New();
vtkTypeMacro(vtkOSPRayVolumeInterface,vtkVolumeMapper);
- void PrintSelf( ostream& os, vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf( ostream& os, vtkIndent indent ) override;
/**
* Overridden to warn about lack of OSPRay if not overridden.
*/
- void Render(vtkRenderer *, vtkVolume *) VTK_OVERRIDE;
+ void Render(vtkRenderer *, vtkVolume *) override;
protected:
vtkOSPRayVolumeInterface();
- ~vtkOSPRayVolumeInterface() VTK_OVERRIDE;
+ ~vtkOSPRayVolumeInterface() override;
private:
vtkOSPRayVolumeInterface
diff --git a/Rendering/Volume/vtkProjectedAAHexahedraMapper.h b/Rendering/Volume/vtkProjectedAAHexahedraMapper.h
index df62cc4b23d11302ebb5d6d5ef15c9668c60aa3e..3d7ef8eb327a068b22f5ed6d94f2b56c2c3f29de 100644
--- a/Rendering/Volume/vtkProjectedAAHexahedraMapper.h
+++ b/Rendering/Volume/vtkProjectedAAHexahedraMapper.h
@@ -48,7 +48,7 @@ public:
vtkTypeMacro(vtkProjectedAAHexahedraMapper,
vtkUnstructuredGridVolumeMapper);
static vtkProjectedAAHexahedraMapper *New();
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
//@{
/**
@@ -67,13 +67,13 @@ public:
protected:
vtkProjectedAAHexahedraMapper();
- ~vtkProjectedAAHexahedraMapper() VTK_OVERRIDE;
+ ~vtkProjectedAAHexahedraMapper() override;
/**
* The visibility sort will probably make a reference loop by holding a
* reference to the input.
*/
- void ReportReferences(vtkGarbageCollector *collector) VTK_OVERRIDE;
+ void ReportReferences(vtkGarbageCollector *collector) override;
vtkVisibilitySort *VisibilitySort;
diff --git a/Rendering/Volume/vtkProjectedTetrahedraMapper.h b/Rendering/Volume/vtkProjectedTetrahedraMapper.h
index dc0b3bc030f2f861825bbf8b8c83c20a61929f31..de86ea2b4695f9e7507431ff01cc015e5876de4a 100644
--- a/Rendering/Volume/vtkProjectedTetrahedraMapper.h
+++ b/Rendering/Volume/vtkProjectedTetrahedraMapper.h
@@ -58,7 +58,7 @@ public:
vtkTypeMacro(vtkProjectedTetrahedraMapper,
vtkUnstructuredGridVolumeMapper);
static vtkProjectedTetrahedraMapper *New();
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
virtual void SetVisibilitySort(vtkVisibilitySort *sort);
vtkGetObjectMacro(VisibilitySort, vtkVisibilitySort);
@@ -80,7 +80,7 @@ public:
protected:
vtkProjectedTetrahedraMapper();
- ~vtkProjectedTetrahedraMapper() VTK_OVERRIDE;
+ ~vtkProjectedTetrahedraMapper() override;
vtkVisibilitySort *VisibilitySort;
@@ -88,7 +88,7 @@ protected:
* The visibility sort will probably make a reference loop by holding a
* reference to the input.
*/
- void ReportReferences(vtkGarbageCollector *collector) VTK_OVERRIDE;
+ void ReportReferences(vtkGarbageCollector *collector) override;
private:
vtkProjectedTetrahedraMapper(const vtkProjectedTetrahedraMapper &) VTK_DELETE_FUNCTION;
diff --git a/Rendering/Volume/vtkRayCastImageDisplayHelper.h b/Rendering/Volume/vtkRayCastImageDisplayHelper.h
index bf923b2dc461db0204160bde7557ce4cba90b627..c8601fa9c46575bc97e4542ea28fdfa4bab3c326 100644
--- a/Rendering/Volume/vtkRayCastImageDisplayHelper.h
+++ b/Rendering/Volume/vtkRayCastImageDisplayHelper.h
@@ -41,7 +41,7 @@ class VTKRENDERINGVOLUME_EXPORT vtkRayCastImageDisplayHelper : public vtkObject
public:
static vtkRayCastImageDisplayHelper *New();
vtkTypeMacro(vtkRayCastImageDisplayHelper,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
virtual void RenderTexture( vtkVolume *vol, vtkRenderer *ren,
int imageMemorySize[2],
@@ -86,7 +86,7 @@ public:
protected:
vtkRayCastImageDisplayHelper();
- ~vtkRayCastImageDisplayHelper() VTK_OVERRIDE;
+ ~vtkRayCastImageDisplayHelper() override;
/**
* Have the colors already been multiplied by alpha?
diff --git a/Rendering/Volume/vtkRecursiveSphereDirectionEncoder.h b/Rendering/Volume/vtkRecursiveSphereDirectionEncoder.h
index bc40d2d0508c80a25dcc75081ec6e2aab2f69fa5..d39738b448d061bb9b1e242b64bac35020135355 100644
--- a/Rendering/Volume/vtkRecursiveSphereDirectionEncoder.h
+++ b/Rendering/Volume/vtkRecursiveSphereDirectionEncoder.h
@@ -36,7 +36,7 @@ class VTKRENDERINGVOLUME_EXPORT vtkRecursiveSphereDirectionEncoder : public vtkD
{
public:
vtkTypeMacro(vtkRecursiveSphereDirectionEncoder,vtkDirectionEncoder);
- void PrintSelf( ostream& os, vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf( ostream& os, vtkIndent indent ) override;
/**
* Construct the object. Initialize the index table which will be
@@ -49,17 +49,17 @@ public:
/**
* Given a normal vector n, return the encoded direction
*/
- int GetEncodedDirection( float n[3] ) VTK_OVERRIDE;
+ int GetEncodedDirection( float n[3] ) override;
/**
* / Given an encoded value, return a pointer to the normal vector
*/
- float *GetDecodedGradient( int value ) VTK_OVERRIDE;
+ float *GetDecodedGradient( int value ) override;
/**
* Return the number of encoded directions
*/
- int GetNumberOfEncodedDirections( void ) VTK_OVERRIDE;
+ int GetNumberOfEncodedDirections( void ) override;
/**
* Get the decoded gradient table. There are
@@ -67,7 +67,7 @@ public:
* containing a normal (direction) vector. This is a flat structure -
* 3 times the number of directions floats in an array.
*/
- float *GetDecodedGradientTable( void ) VTK_OVERRIDE;
+ float *GetDecodedGradientTable( void ) override;
//@{
/**
@@ -91,7 +91,7 @@ public:
protected:
vtkRecursiveSphereDirectionEncoder();
- ~vtkRecursiveSphereDirectionEncoder() VTK_OVERRIDE;
+ ~vtkRecursiveSphereDirectionEncoder() override;
// How far to recursively divide the sphere
int RecursionDepth;
diff --git a/Rendering/Volume/vtkSphericalDirectionEncoder.h b/Rendering/Volume/vtkSphericalDirectionEncoder.h
index 8dd92be8c6f5c27e64bb36aa21f7b180670ff55b..4d23bca0bbf5a6c7c979525ef01e4155a8d1d016 100644
--- a/Rendering/Volume/vtkSphericalDirectionEncoder.h
+++ b/Rendering/Volume/vtkSphericalDirectionEncoder.h
@@ -33,7 +33,7 @@ class VTKRENDERINGVOLUME_EXPORT vtkSphericalDirectionEncoder : public vtkDirecti
{
public:
vtkTypeMacro(vtkSphericalDirectionEncoder,vtkDirectionEncoder);
- void PrintSelf( ostream& os, vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf( ostream& os, vtkIndent indent ) override;
/**
* Construct the object. Initialize the index table which will be
@@ -46,17 +46,17 @@ public:
/**
* Given a normal vector n, return the encoded direction
*/
- int GetEncodedDirection( float n[3] ) VTK_OVERRIDE;
+ int GetEncodedDirection( float n[3] ) override;
/**
* / Given an encoded value, return a pointer to the normal vector
*/
- float *GetDecodedGradient( int value ) VTK_OVERRIDE;
+ float *GetDecodedGradient( int value ) override;
/**
* Return the number of encoded directions
*/
- int GetNumberOfEncodedDirections( void )VTK_OVERRIDE { return 65536; }
+ int GetNumberOfEncodedDirections( void ) override { return 65536; }
/**
* Get the decoded gradient table. There are
@@ -64,7 +64,7 @@ public:
* containing a normal (direction) vector. This is a flat structure -
* 3 times the number of directions floats in an array.
*/
- float *GetDecodedGradientTable( void ) VTK_OVERRIDE
+ float *GetDecodedGradientTable( void ) override
{
return &(this->DecodedGradientTable[0]);
}
@@ -72,7 +72,7 @@ public:
protected:
vtkSphericalDirectionEncoder();
- ~vtkSphericalDirectionEncoder() VTK_OVERRIDE;
+ ~vtkSphericalDirectionEncoder() override;
static float DecodedGradientTable[65536*3];
diff --git a/Rendering/Volume/vtkUnstructuredGridBunykRayCastFunction.cxx b/Rendering/Volume/vtkUnstructuredGridBunykRayCastFunction.cxx
index e0ffaed625b85eefa869d42426a86f0a7b79fa3b..2ab409564ac7589566e336bd49cb0273c5750ec2 100644
--- a/Rendering/Volume/vtkUnstructuredGridBunykRayCastFunction.cxx
+++ b/Rendering/Volume/vtkUnstructuredGridBunykRayCastFunction.cxx
@@ -346,20 +346,20 @@ public:
vtkUnstructuredGridVolumeRayCastIterator);
static vtkUnstructuredGridBunykRayCastIterator *New();
- void Initialize(int x, int y) VTK_OVERRIDE;
+ void Initialize(int x, int y) override;
vtkIdType GetNextIntersections(vtkIdList *intersectedCells,
vtkDoubleArray *intersectionLengths,
vtkDataArray *scalars,
vtkDataArray *nearIntersections,
- vtkDataArray *farIntersections) VTK_OVERRIDE;
+ vtkDataArray *farIntersections) override;
vtkSetObjectMacro(RayCastFunction, vtkUnstructuredGridBunykRayCastFunction);
vtkGetObjectMacro(RayCastFunction, vtkUnstructuredGridBunykRayCastFunction);
protected:
vtkUnstructuredGridBunykRayCastIterator();
- ~vtkUnstructuredGridBunykRayCastIterator() VTK_OVERRIDE;
+ ~vtkUnstructuredGridBunykRayCastIterator() override;
int RayPosition[2];
diff --git a/Rendering/Volume/vtkUnstructuredGridBunykRayCastFunction.h b/Rendering/Volume/vtkUnstructuredGridBunykRayCastFunction.h
index 91b6ce512deee602f0b32d01df076f90dd578d9c..4501984f2fd5133379dcf1f786ac30669f2a53c1 100644
--- a/Rendering/Volume/vtkUnstructuredGridBunykRayCastFunction.h
+++ b/Rendering/Volume/vtkUnstructuredGridBunykRayCastFunction.h
@@ -85,20 +85,20 @@ class VTKRENDERINGVOLUME_EXPORT vtkUnstructuredGridBunykRayCastFunction : public
public:
static vtkUnstructuredGridBunykRayCastFunction *New();
vtkTypeMacro(vtkUnstructuredGridBunykRayCastFunction,vtkUnstructuredGridVolumeRayCastFunction);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Called by the ray cast mapper at the start of rendering
*/
- void Initialize( vtkRenderer *ren, vtkVolume *vol ) VTK_OVERRIDE;
+ void Initialize( vtkRenderer *ren, vtkVolume *vol ) override;
/**
* Called by the ray cast mapper at the end of rendering
*/
- void Finalize() VTK_OVERRIDE;
+ void Finalize() override;
VTK_NEWINSTANCE
- vtkUnstructuredGridVolumeRayCastIterator *NewIterator() VTK_OVERRIDE;
+ vtkUnstructuredGridVolumeRayCastIterator *NewIterator() override;
// Used to store each triangle - made public because of the
// templated function
@@ -168,7 +168,7 @@ public:
protected:
vtkUnstructuredGridBunykRayCastFunction();
- ~vtkUnstructuredGridBunykRayCastFunction() VTK_OVERRIDE;
+ ~vtkUnstructuredGridBunykRayCastFunction() override;
// These are cached during the initialize method so that they do not
// need to be passed into subsequent CastRay calls.
diff --git a/Rendering/Volume/vtkUnstructuredGridHomogeneousRayIntegrator.h b/Rendering/Volume/vtkUnstructuredGridHomogeneousRayIntegrator.h
index 1eaff4538515d53ce6c3191c922b81ede90a6f79..4f97dff10efbcd41d9d96213de54477b4b20bad0 100644
--- a/Rendering/Volume/vtkUnstructuredGridHomogeneousRayIntegrator.h
+++ b/Rendering/Volume/vtkUnstructuredGridHomogeneousRayIntegrator.h
@@ -48,14 +48,14 @@ public:
vtkTypeMacro(vtkUnstructuredGridHomogeneousRayIntegrator,
vtkUnstructuredGridVolumeRayIntegrator);
static vtkUnstructuredGridHomogeneousRayIntegrator *New();
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
- void Initialize(vtkVolume *volume, vtkDataArray *scalars) VTK_OVERRIDE;
+ void Initialize(vtkVolume *volume, vtkDataArray *scalars) override;
void Integrate(vtkDoubleArray *intersectionLengths,
vtkDataArray *nearIntersections,
vtkDataArray *farIntersections,
- float color[4]) VTK_OVERRIDE;
+ float color[4]) override;
//@{
/**
@@ -69,7 +69,7 @@ public:
protected:
vtkUnstructuredGridHomogeneousRayIntegrator();
- ~vtkUnstructuredGridHomogeneousRayIntegrator() VTK_OVERRIDE;
+ ~vtkUnstructuredGridHomogeneousRayIntegrator() override;
vtkVolume *Volume;
vtkVolumeProperty *Property;
diff --git a/Rendering/Volume/vtkUnstructuredGridLinearRayIntegrator.h b/Rendering/Volume/vtkUnstructuredGridLinearRayIntegrator.h
index 0bfa57a6bf67970bd4d81ff3538b776c654d6c38..e6450fdf3ef8a3b8a17ea6c4c02446aea2e17f87 100644
--- a/Rendering/Volume/vtkUnstructuredGridLinearRayIntegrator.h
+++ b/Rendering/Volume/vtkUnstructuredGridLinearRayIntegrator.h
@@ -55,14 +55,14 @@ public:
vtkTypeMacro(vtkUnstructuredGridLinearRayIntegrator,
vtkUnstructuredGridVolumeRayIntegrator);
static vtkUnstructuredGridLinearRayIntegrator *New();
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
- void Initialize(vtkVolume *volume, vtkDataArray *scalars) VTK_OVERRIDE;
+ void Initialize(vtkVolume *volume, vtkDataArray *scalars) override;
void Integrate(vtkDoubleArray *intersectionLengths,
vtkDataArray *nearIntersections,
vtkDataArray *farIntersections,
- float color[4]) VTK_OVERRIDE;
+ float color[4]) override;
//@{
/**
@@ -90,7 +90,7 @@ public:
protected:
vtkUnstructuredGridLinearRayIntegrator();
- ~vtkUnstructuredGridLinearRayIntegrator() VTK_OVERRIDE;
+ ~vtkUnstructuredGridLinearRayIntegrator() override;
vtkVolumeProperty *Property;
diff --git a/Rendering/Volume/vtkUnstructuredGridPartialPreIntegration.h b/Rendering/Volume/vtkUnstructuredGridPartialPreIntegration.h
index 7dddc7dfad767cea3ad3414ff09bb2ef14ccee2e..b926ff299ce1f1f13d7b3431171ce1ae660fe600 100644
--- a/Rendering/Volume/vtkUnstructuredGridPartialPreIntegration.h
+++ b/Rendering/Volume/vtkUnstructuredGridPartialPreIntegration.h
@@ -55,14 +55,14 @@ public:
vtkTypeMacro(vtkUnstructuredGridPartialPreIntegration,
vtkUnstructuredGridVolumeRayIntegrator);
static vtkUnstructuredGridPartialPreIntegration *New();
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
- void Initialize(vtkVolume *volume, vtkDataArray *scalars) VTK_OVERRIDE;
+ void Initialize(vtkVolume *volume, vtkDataArray *scalars) override;
void Integrate(vtkDoubleArray *intersectionLengths,
vtkDataArray *nearIntersections,
vtkDataArray *farIntersections,
- float color[4]) VTK_OVERRIDE;
+ float color[4]) override;
//@{
/**
@@ -95,7 +95,7 @@ public:
protected:
vtkUnstructuredGridPartialPreIntegration();
- ~vtkUnstructuredGridPartialPreIntegration() VTK_OVERRIDE;
+ ~vtkUnstructuredGridPartialPreIntegration() override;
vtkVolumeProperty *Property;
diff --git a/Rendering/Volume/vtkUnstructuredGridPreIntegration.h b/Rendering/Volume/vtkUnstructuredGridPreIntegration.h
index 45280586ed866781dfabf8a7594076446394dd01..f573df2e21eeba7099ba3abcd9a1d1f78426bf96 100644
--- a/Rendering/Volume/vtkUnstructuredGridPreIntegration.h
+++ b/Rendering/Volume/vtkUnstructuredGridPreIntegration.h
@@ -55,14 +55,14 @@ public:
vtkTypeMacro(vtkUnstructuredGridPreIntegration,
vtkUnstructuredGridVolumeRayIntegrator);
static vtkUnstructuredGridPreIntegration *New();
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
- void Initialize(vtkVolume *volume, vtkDataArray *scalars) VTK_OVERRIDE;
+ void Initialize(vtkVolume *volume, vtkDataArray *scalars) override;
void Integrate(vtkDoubleArray *intersectionLengths,
vtkDataArray *nearIntersections,
vtkDataArray *farIntersections,
- float color[4]) VTK_OVERRIDE;
+ float color[4]) override;
//@{
/**
@@ -134,7 +134,7 @@ public:
protected:
vtkUnstructuredGridPreIntegration();
- ~vtkUnstructuredGridPreIntegration() VTK_OVERRIDE;
+ ~vtkUnstructuredGridPreIntegration() override;
vtkUnstructuredGridVolumeRayIntegrator *Integrator;
diff --git a/Rendering/Volume/vtkUnstructuredGridVolumeMapper.h b/Rendering/Volume/vtkUnstructuredGridVolumeMapper.h
index 15d238b78362d3547ed286695ecb1613840f6901..7a4de98c6daa69b68a567bd4ed08ca91e6a38a1e 100644
--- a/Rendering/Volume/vtkUnstructuredGridVolumeMapper.h
+++ b/Rendering/Volume/vtkUnstructuredGridVolumeMapper.h
@@ -41,7 +41,7 @@ class VTKRENDERINGVOLUME_EXPORT vtkUnstructuredGridVolumeMapper : public vtkAbst
{
public:
vtkTypeMacro(vtkUnstructuredGridVolumeMapper,vtkAbstractVolumeMapper);
- void PrintSelf( ostream& os, vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf( ostream& os, vtkIndent indent ) override;
//@{
/**
@@ -64,7 +64,7 @@ public:
* DO NOT USE THIS METHOD OUTSIDE OF THE RENDERING PROCESS
* Render the volume
*/
- void Render(vtkRenderer *ren, vtkVolume *vol) VTK_OVERRIDE =0;
+ void Render(vtkRenderer *ren, vtkVolume *vol) override =0;
/**
* WARNING: INTERNAL METHOD - NOT INTENDED FOR GENERAL USE
@@ -72,7 +72,7 @@ public:
* The parameter window could be used to determine which graphic
* resources to release.
*/
- void ReleaseGraphicsResources(vtkWindow *) VTK_OVERRIDE {}
+ void ReleaseGraphicsResources(vtkWindow *) override {}
enum
{
@@ -82,11 +82,11 @@ public:
protected:
vtkUnstructuredGridVolumeMapper();
- ~vtkUnstructuredGridVolumeMapper() VTK_OVERRIDE;
+ ~vtkUnstructuredGridVolumeMapper() override;
int BlendMode;
- int FillInputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
+ int FillInputPortInformation(int, vtkInformation*) override;
private:
vtkUnstructuredGridVolumeMapper(const vtkUnstructuredGridVolumeMapper&) VTK_DELETE_FUNCTION;
diff --git a/Rendering/Volume/vtkUnstructuredGridVolumeRayCastFunction.h b/Rendering/Volume/vtkUnstructuredGridVolumeRayCastFunction.h
index 29e82ba79a0165e0b6b217311e80624b2b0c430d..1aa2dd59768818946879a09f4433113e1163a321 100644
--- a/Rendering/Volume/vtkUnstructuredGridVolumeRayCastFunction.h
+++ b/Rendering/Volume/vtkUnstructuredGridVolumeRayCastFunction.h
@@ -39,7 +39,7 @@ class VTKRENDERINGVOLUME_EXPORT vtkUnstructuredGridVolumeRayCastFunction : publi
{
public:
vtkTypeMacro(vtkUnstructuredGridVolumeRayCastFunction,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
virtual void Initialize( vtkRenderer *ren, vtkVolume *vol )=0;
@@ -55,7 +55,7 @@ public:
protected:
vtkUnstructuredGridVolumeRayCastFunction() {}
- ~vtkUnstructuredGridVolumeRayCastFunction()VTK_OVERRIDE {}
+ ~vtkUnstructuredGridVolumeRayCastFunction() override {}
private:
vtkUnstructuredGridVolumeRayCastFunction(const vtkUnstructuredGridVolumeRayCastFunction&) VTK_DELETE_FUNCTION;
diff --git a/Rendering/Volume/vtkUnstructuredGridVolumeRayCastIterator.h b/Rendering/Volume/vtkUnstructuredGridVolumeRayCastIterator.h
index a746eefaea8d39dee8ad779c75ddbfff0b7132bf..b9e44dc1c29ae0b65755fbe5e02184812643858d 100644
--- a/Rendering/Volume/vtkUnstructuredGridVolumeRayCastIterator.h
+++ b/Rendering/Volume/vtkUnstructuredGridVolumeRayCastIterator.h
@@ -44,7 +44,7 @@ class VTKRENDERINGVOLUME_EXPORT vtkUnstructuredGridVolumeRayCastIterator : publi
{
public:
vtkTypeMacro(vtkUnstructuredGridVolumeRayCastIterator, vtkObject);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
/**
* Initializes the iteration to the start of the ray at the given screen
@@ -86,7 +86,7 @@ public:
protected:
vtkUnstructuredGridVolumeRayCastIterator();
- ~vtkUnstructuredGridVolumeRayCastIterator() VTK_OVERRIDE;
+ ~vtkUnstructuredGridVolumeRayCastIterator() override;
double Bounds[2];
diff --git a/Rendering/Volume/vtkUnstructuredGridVolumeRayCastMapper.h b/Rendering/Volume/vtkUnstructuredGridVolumeRayCastMapper.h
index fdcdc48c53b5a9dcf58fdf679e723909e3d962e5..3565766b21be15cf41d2ba728166a8ff848cef4b 100644
--- a/Rendering/Volume/vtkUnstructuredGridVolumeRayCastMapper.h
+++ b/Rendering/Volume/vtkUnstructuredGridVolumeRayCastMapper.h
@@ -45,7 +45,7 @@ class VTKRENDERINGVOLUME_EXPORT vtkUnstructuredGridVolumeRayCastMapper : public
public:
static vtkUnstructuredGridVolumeRayCastMapper *New();
vtkTypeMacro(vtkUnstructuredGridVolumeRayCastMapper,vtkUnstructuredGridVolumeMapper);
- void PrintSelf( ostream& os, vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf( ostream& os, vtkIndent indent ) override;
//@{
/**
@@ -127,7 +127,7 @@ public:
* WARNING: INTERNAL METHOD - NOT INTENDED FOR GENERAL USE
* Initialize rendering for this volume.
*/
- void Render( vtkRenderer *, vtkVolume * ) VTK_OVERRIDE;
+ void Render( vtkRenderer *, vtkVolume * ) override;
/**
* WARNING: INTERNAL METHOD - NOT INTENDED FOR GENERAL USE
@@ -135,7 +135,7 @@ public:
* The parameter window could be used to determine which graphic
* resources to release.
*/
- void ReleaseGraphicsResources(vtkWindow *) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *) override;
vtkGetVectorMacro( ImageInUseSize, int, 2 );
vtkGetVectorMacro( ImageOrigin, int, 2 );
@@ -145,7 +145,7 @@ public:
protected:
vtkUnstructuredGridVolumeRayCastMapper();
- ~vtkUnstructuredGridVolumeRayCastMapper() VTK_OVERRIDE;
+ ~vtkUnstructuredGridVolumeRayCastMapper() override;
float ImageSampleDistance;
float MinimumImageSampleDistance;
diff --git a/Rendering/Volume/vtkUnstructuredGridVolumeRayIntegrator.h b/Rendering/Volume/vtkUnstructuredGridVolumeRayIntegrator.h
index 7b069eeac491659110307c3902ea2d3e418978f6..b1008d45933cb9189d192e7c3f7af6eacc195a49 100644
--- a/Rendering/Volume/vtkUnstructuredGridVolumeRayIntegrator.h
+++ b/Rendering/Volume/vtkUnstructuredGridVolumeRayIntegrator.h
@@ -42,7 +42,7 @@ class VTKRENDERINGVOLUME_EXPORT vtkUnstructuredGridVolumeRayIntegrator : public
{
public:
vtkTypeMacro(vtkUnstructuredGridVolumeRayIntegrator,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Set up the integrator with the given properties and scalars.
@@ -66,7 +66,7 @@ public:
protected:
vtkUnstructuredGridVolumeRayIntegrator();
- ~vtkUnstructuredGridVolumeRayIntegrator() VTK_OVERRIDE;
+ ~vtkUnstructuredGridVolumeRayIntegrator() override;
private:
vtkUnstructuredGridVolumeRayIntegrator(const vtkUnstructuredGridVolumeRayIntegrator&) VTK_DELETE_FUNCTION;
diff --git a/Rendering/Volume/vtkUnstructuredGridVolumeZSweepMapper.cxx b/Rendering/Volume/vtkUnstructuredGridVolumeZSweepMapper.cxx
index 2e53a090308a75dbb5f866ba2542fb514552d3e5..adf8f56ebba7a4ca1b4990969dcb7a26d0548611 100644
--- a/Rendering/Volume/vtkUnstructuredGridVolumeZSweepMapper.cxx
+++ b/Rendering/Volume/vtkUnstructuredGridVolumeZSweepMapper.cxx
@@ -745,16 +745,16 @@ public:
return (this->X>=this->X2) && (this->X<=this->X0);
}
}
- int GetX() VTK_OVERRIDE
+ int GetX() override
{
// assert("pre: valid_range" && ValidXRange() );
return this->X;
}
- double GetInvW() VTK_OVERRIDE { return this->InvW; }
- double *GetPValues() VTK_OVERRIDE { return this->PValues; }
- double GetZview() VTK_OVERRIDE { return this->Zview; }
+ double GetInvW() override { return this->InvW; }
+ double *GetPValues() override { return this->PValues; }
+ double GetZview() override { return this->Zview; }
- void NextLine(int y) VTK_OVERRIDE
+ void NextLine(int y) override
{
int i;
switch(this->Case)
@@ -1114,7 +1114,7 @@ public:
}
void SkipLines(int deltaY,
- int y) VTK_OVERRIDE
+ int y) override
{
if(deltaY==1)
{
@@ -1517,23 +1517,23 @@ public:
}
}
- int GetX() VTK_OVERRIDE { return this->Current->GetX(); }
- double GetInvW() VTK_OVERRIDE { return this->Current->GetInvW(); }
- double GetZview() VTK_OVERRIDE { return this->Current->GetZview(); }
- double *GetPValues() VTK_OVERRIDE { return this->Current->GetPValues(); }
+ int GetX() override { return this->Current->GetX(); }
+ double GetInvW() override { return this->Current->GetInvW(); }
+ double GetZview() override { return this->Current->GetZview(); }
+ double *GetPValues() override { return this->Current->GetPValues(); }
- void OnBottom(int skipped, int y) VTK_OVERRIDE
+ void OnBottom(int skipped, int y) override
{
this->Current=&this->Bottom;
this->Current->OnBottom(skipped,y);
}
- void NextLine(int y) VTK_OVERRIDE
+ void NextLine(int y) override
{
this->Current->NextLine(y);
}
void SkipLines(int deltaY,
- int y) VTK_OVERRIDE
+ int y) override
{
this->Current->SkipLines(deltaY,y);
}
diff --git a/Rendering/Volume/vtkUnstructuredGridVolumeZSweepMapper.h b/Rendering/Volume/vtkUnstructuredGridVolumeZSweepMapper.h
index 0ed9c5f0ed181392e7416b99356bb9d2d8c5f1bd..8e7f7d34b0499cf6336024133e847a6137de55b1 100644
--- a/Rendering/Volume/vtkUnstructuredGridVolumeZSweepMapper.h
+++ b/Rendering/Volume/vtkUnstructuredGridVolumeZSweepMapper.h
@@ -70,7 +70,7 @@ class VTKRENDERINGVOLUME_EXPORT vtkUnstructuredGridVolumeZSweepMapper : public v
{
public:
vtkTypeMacro(vtkUnstructuredGridVolumeZSweepMapper,vtkUnstructuredGridVolumeMapper);
- void PrintSelf( ostream& os, vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf( ostream& os, vtkIndent indent ) override;
/**
* Set MaxPixelListSize to 32.
@@ -157,7 +157,7 @@ public:
* Render the volume
*/
void Render(vtkRenderer *ren,
- vtkVolume *vol) VTK_OVERRIDE;
+ vtkVolume *vol) override;
vtkGetVectorMacro( ImageInUseSize, int, 2 );
vtkGetVectorMacro( ImageOrigin, int, 2 );
@@ -165,7 +165,7 @@ public:
protected:
vtkUnstructuredGridVolumeZSweepMapper();
- ~vtkUnstructuredGridVolumeZSweepMapper() VTK_OVERRIDE;
+ ~vtkUnstructuredGridVolumeZSweepMapper() override;
/**
* For each vertex, find the list of incident faces.
diff --git a/Rendering/Volume/vtkVolumeMapper.h b/Rendering/Volume/vtkVolumeMapper.h
index 15d0e8ad2f86ff97f02904d19df1758a831e500b..94f6dc4e665c3d387bcbcee67e3e49ebdc85253a 100644
--- a/Rendering/Volume/vtkVolumeMapper.h
+++ b/Rendering/Volume/vtkVolumeMapper.h
@@ -47,7 +47,7 @@ class VTKRENDERINGVOLUME_EXPORT vtkVolumeMapper : public vtkAbstractVolumeMapper
{
public:
vtkTypeMacro(vtkVolumeMapper,vtkAbstractVolumeMapper);
- void PrintSelf( ostream& os, vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf( ostream& os, vtkIndent indent ) override;
//@{
/**
@@ -182,7 +182,7 @@ public:
* DO NOT USE THIS METHOD OUTSIDE OF THE RENDERING PROCESS
* Render the volume
*/
- void Render(vtkRenderer *ren, vtkVolume *vol) VTK_OVERRIDE =0;
+ void Render(vtkRenderer *ren, vtkVolume *vol) override =0;
/**
* WARNING: INTERNAL METHOD - NOT INTENDED FOR GENERAL USE
@@ -190,7 +190,7 @@ public:
* The parameter window could be used to determine which graphic
* resources to release.
*/
- void ReleaseGraphicsResources(vtkWindow *) VTK_OVERRIDE {}
+ void ReleaseGraphicsResources(vtkWindow *) override {}
/**
* Blend modes.
@@ -236,7 +236,7 @@ public:
protected:
vtkVolumeMapper();
- ~vtkVolumeMapper() VTK_OVERRIDE;
+ ~vtkVolumeMapper() override;
/**
* Compute a sample distance from the data spacing. When the number of
@@ -265,7 +265,7 @@ protected:
void ConvertCroppingRegionPlanesToVoxels();
//@}
- int FillInputPortInformation(int, vtkInformation*) VTK_OVERRIDE;
+ int FillInputPortInformation(int, vtkInformation*) override;
private:
vtkVolumeMapper(const vtkVolumeMapper&) VTK_DELETE_FUNCTION;
diff --git a/Rendering/Volume/vtkVolumeOutlineSource.h b/Rendering/Volume/vtkVolumeOutlineSource.h
index 5792e25ea763e6bd30d115a457d0552c5eafafb2..94f5fd9aaa1b83c27adcc8474aeb0aebd2a389e1 100644
--- a/Rendering/Volume/vtkVolumeOutlineSource.h
+++ b/Rendering/Volume/vtkVolumeOutlineSource.h
@@ -40,7 +40,7 @@ class VTKRENDERINGVOLUME_EXPORT vtkVolumeOutlineSource : public vtkPolyDataAlgor
public:
static vtkVolumeOutlineSource *New();
vtkTypeMacro(vtkVolumeOutlineSource,vtkPolyDataAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -116,7 +116,7 @@ public:
protected:
vtkVolumeOutlineSource();
- ~vtkVolumeOutlineSource() VTK_OVERRIDE;
+ ~vtkVolumeOutlineSource() override;
vtkVolumeMapper *VolumeMapper;
int GenerateScalars;
@@ -166,15 +166,15 @@ protected:
vtkInformationVector** inputVector,
vtkInformationVector* outputVector,
int requestFromOutputPort,
- vtkMTimeType* mtime) VTK_OVERRIDE;
+ vtkMTimeType* mtime) override;
int RequestInformation(vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
int RequestData(vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
private:
vtkVolumeOutlineSource(const vtkVolumeOutlineSource&) VTK_DELETE_FUNCTION;
diff --git a/Rendering/Volume/vtkVolumePicker.h b/Rendering/Volume/vtkVolumePicker.h
index 2ee9fb06dcf5d45787aee6dfe32879c869a65eb6..0fac46aa3f0f143bdffbb054f388008560d87d26 100644
--- a/Rendering/Volume/vtkVolumePicker.h
+++ b/Rendering/Volume/vtkVolumePicker.h
@@ -41,7 +41,7 @@ class VTKRENDERINGVOLUME_EXPORT vtkVolumePicker : public vtkCellPicker
public:
static vtkVolumePicker *New();
vtkTypeMacro(vtkVolumePicker, vtkCellPicker);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -69,15 +69,15 @@ public:
protected:
vtkVolumePicker();
- ~vtkVolumePicker() VTK_OVERRIDE;
+ ~vtkVolumePicker() override;
- void ResetPickInfo() VTK_OVERRIDE;
+ void ResetPickInfo() override;
double IntersectVolumeWithLine(const double p1[3],
const double p2[3],
double t1, double t2,
vtkProp3D *prop,
- vtkAbstractVolumeMapper *mapper) VTK_OVERRIDE;
+ vtkAbstractVolumeMapper *mapper) override;
static int ClipLineWithCroppingRegion(const double bounds[6],
const int extent[6], int flags,
diff --git a/Rendering/Volume/vtkVolumeRayCastCompositeFunction.h b/Rendering/Volume/vtkVolumeRayCastCompositeFunction.h
index 023711903029d920c9359f8d77d792e509c79869..3bde3231beaf1423403cb8eed9a4e7f20520e705 100644
--- a/Rendering/Volume/vtkVolumeRayCastCompositeFunction.h
+++ b/Rendering/Volume/vtkVolumeRayCastCompositeFunction.h
@@ -42,7 +42,7 @@ class VTKRENDERINGVOLUME_EXPORT vtkVolumeRayCastCompositeFunction : public vtkVo
public:
static vtkVolumeRayCastCompositeFunction *New();
vtkTypeMacro(vtkVolumeRayCastCompositeFunction,vtkVolumeRayCastFunction);
- void PrintSelf( ostream& os, vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf( ostream& os, vtkIndent indent ) override;
//@{
/**
@@ -59,18 +59,18 @@ public:
//@}
void CastRay( vtkVolumeRayCastDynamicInfo *dynamicInfo,
- vtkVolumeRayCastStaticInfo *staticInfo) VTK_OVERRIDE;
+ vtkVolumeRayCastStaticInfo *staticInfo) override;
- float GetZeroOpacityThreshold( vtkVolume *vol ) VTK_OVERRIDE;
+ float GetZeroOpacityThreshold( vtkVolume *vol ) override;
protected:
vtkVolumeRayCastCompositeFunction();
- ~vtkVolumeRayCastCompositeFunction() VTK_OVERRIDE;
+ ~vtkVolumeRayCastCompositeFunction() override;
void SpecificFunctionInitialize( vtkRenderer *ren,
vtkVolume *vol,
vtkVolumeRayCastStaticInfo *staticInfo,
- vtkVolumeRayCastMapper *mapper ) VTK_OVERRIDE;
+ vtkVolumeRayCastMapper *mapper ) override;
int CompositeMethod;
private:
diff --git a/Rendering/Volume/vtkVolumeRayCastFunction.h b/Rendering/Volume/vtkVolumeRayCastFunction.h
index e63c6c95fe8bd0c09a00f1520c512a14ca2367bd..5ad3b601f75e277fdfb26bbb58da744501b91e23 100644
--- a/Rendering/Volume/vtkVolumeRayCastFunction.h
+++ b/Rendering/Volume/vtkVolumeRayCastFunction.h
@@ -137,7 +137,7 @@ class VTKRENDERINGVOLUME_EXPORT vtkVolumeRayCastFunction : public vtkObject
{
public:
vtkTypeMacro(vtkVolumeRayCastFunction,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Do the basic initialization. This includes saving the parameters
@@ -164,7 +164,7 @@ protected:
{
VTK_LEGACY_BODY(vtkVolumeRayCastMapper::vtkVolumeRayCastMapper,"VTK 7.0");
}
- ~vtkVolumeRayCastFunction()VTK_OVERRIDE {}
+ ~vtkVolumeRayCastFunction() override {}
/**
* This method gives the subclass a chance to do any special
diff --git a/Rendering/Volume/vtkVolumeRayCastIsosurfaceFunction.h b/Rendering/Volume/vtkVolumeRayCastIsosurfaceFunction.h
index fb0e165c8dabf3ba59b46854e673cfd8d0922dea..856b039158aa16d41c76dd6e7c77a3b0edda0c88 100644
--- a/Rendering/Volume/vtkVolumeRayCastIsosurfaceFunction.h
+++ b/Rendering/Volume/vtkVolumeRayCastIsosurfaceFunction.h
@@ -42,7 +42,7 @@ class VTKRENDERINGVOLUME_EXPORT vtkVolumeRayCastIsosurfaceFunction : public vtkV
{
public:
vtkTypeMacro(vtkVolumeRayCastIsosurfaceFunction,vtkVolumeRayCastFunction);
- void PrintSelf( ostream& os, vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf( ostream& os, vtkIndent indent ) override;
/**
* Construct a new vtkVolumeRayCastIsosurfaceFunction
@@ -52,7 +52,7 @@ public:
/**
* Get the scalar value below which all scalar values have 0 opacity
*/
- float GetZeroOpacityThreshold( vtkVolume *vol ) VTK_OVERRIDE;
+ float GetZeroOpacityThreshold( vtkVolume *vol ) override;
//@{
/**
@@ -74,16 +74,16 @@ public:
float Color[3];
void CastRay( vtkVolumeRayCastDynamicInfo *dynamicInfo,
- vtkVolumeRayCastStaticInfo *staticInfo) VTK_OVERRIDE;
+ vtkVolumeRayCastStaticInfo *staticInfo) override;
protected:
vtkVolumeRayCastIsosurfaceFunction();
- ~vtkVolumeRayCastIsosurfaceFunction() VTK_OVERRIDE;
+ ~vtkVolumeRayCastIsosurfaceFunction() override;
void SpecificFunctionInitialize( vtkRenderer *ren,
vtkVolume *vol,
vtkVolumeRayCastStaticInfo *staticInfo,
- vtkVolumeRayCastMapper *mapper ) VTK_OVERRIDE;
+ vtkVolumeRayCastMapper *mapper ) override;
private:
vtkVolumeRayCastIsosurfaceFunction(const vtkVolumeRayCastIsosurfaceFunction&) VTK_DELETE_FUNCTION;
diff --git a/Rendering/Volume/vtkVolumeRayCastMIPFunction.h b/Rendering/Volume/vtkVolumeRayCastMIPFunction.h
index 36af61a80d3f6efca3ff78ca1ebb287d13276f4a..53fd58cef16971e5a4b2fab0467ff9903cb86ab0 100644
--- a/Rendering/Volume/vtkVolumeRayCastMIPFunction.h
+++ b/Rendering/Volume/vtkVolumeRayCastMIPFunction.h
@@ -48,13 +48,13 @@ class VTKRENDERINGVOLUME_EXPORT vtkVolumeRayCastMIPFunction : public vtkVolumeRa
public:
static vtkVolumeRayCastMIPFunction *New();
vtkTypeMacro(vtkVolumeRayCastMIPFunction,vtkVolumeRayCastFunction);
- void PrintSelf( ostream& os, vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf( ostream& os, vtkIndent indent ) override;
/**
* Get the scalar value below which all scalar values have zero opacity.
*/
- float GetZeroOpacityThreshold( vtkVolume *vol ) VTK_OVERRIDE;
+ float GetZeroOpacityThreshold( vtkVolume *vol ) override;
//@{
@@ -72,18 +72,18 @@ public:
//@}
void CastRay( vtkVolumeRayCastDynamicInfo *dynamicInfo,
- vtkVolumeRayCastStaticInfo *staticInfo ) VTK_OVERRIDE;
+ vtkVolumeRayCastStaticInfo *staticInfo ) override;
protected:
vtkVolumeRayCastMIPFunction();
- ~vtkVolumeRayCastMIPFunction() VTK_OVERRIDE;
+ ~vtkVolumeRayCastMIPFunction() override;
int MaximizeMethod;
void SpecificFunctionInitialize( vtkRenderer *ren,
vtkVolume *vol,
vtkVolumeRayCastStaticInfo *staticInfo,
- vtkVolumeRayCastMapper *mapper ) VTK_OVERRIDE;
+ vtkVolumeRayCastMapper *mapper ) override;
private:
vtkVolumeRayCastMIPFunction(const vtkVolumeRayCastMIPFunction&) VTK_DELETE_FUNCTION;
diff --git a/Rendering/Volume/vtkVolumeRayCastMapper.h b/Rendering/Volume/vtkVolumeRayCastMapper.h
index 1bb7265a590ae67e36dcb57b3a8e220f1ed6806e..f9285a8fa5d22ec41862b27018434c5d93e41941 100644
--- a/Rendering/Volume/vtkVolumeRayCastMapper.h
+++ b/Rendering/Volume/vtkVolumeRayCastMapper.h
@@ -67,7 +67,7 @@ class VTKRENDERINGVOLUME_EXPORT vtkVolumeRayCastMapper : public vtkVolumeMapper
public:
static vtkVolumeRayCastMapper *New();
vtkTypeMacro(vtkVolumeRayCastMapper,vtkVolumeMapper);
- void PrintSelf( ostream& os, vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf( ostream& os, vtkIndent indent ) override;
//@{
/**
@@ -167,7 +167,7 @@ public:
* WARNING: INTERNAL METHOD - NOT INTENDED FOR GENERAL USE
* Initialize rendering for this volume.
*/
- void Render( vtkRenderer *, vtkVolume * ) VTK_OVERRIDE;
+ void Render( vtkRenderer *, vtkVolume * ) override;
/**
* WARNING: INTERNAL METHOD - NOT INTENDED FOR GENERAL USE
@@ -175,7 +175,7 @@ public:
* The parameter window could be used to determine which graphic
* resources to release.
*/
- void ReleaseGraphicsResources(vtkWindow *) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *) override;
/**
* WARNING: INTERNAL METHOD - NOT INTENDED FOR GENERAL USE
@@ -188,24 +188,24 @@ public:
* WARNING: INTERNAL METHOD - NOT INTENDED FOR GENERAL USE
* Values needed by the volume
*/
- float GetGradientMagnitudeScale() VTK_OVERRIDE;
- float GetGradientMagnitudeBias() VTK_OVERRIDE;
- float GetGradientMagnitudeScale(int) VTK_OVERRIDE
+ float GetGradientMagnitudeScale() override;
+ float GetGradientMagnitudeBias() override;
+ float GetGradientMagnitudeScale(int) override
{return this->GetGradientMagnitudeScale();};
- float GetGradientMagnitudeBias(int) VTK_OVERRIDE
+ float GetGradientMagnitudeBias(int) override
{return this->GetGradientMagnitudeBias();};
//@}
protected:
vtkVolumeRayCastMapper();
- ~vtkVolumeRayCastMapper() VTK_OVERRIDE;
+ ~vtkVolumeRayCastMapper() override;
vtkVolumeRayCastFunction *VolumeRayCastFunction;
vtkEncodedGradientEstimator *GradientEstimator;
vtkEncodedGradientShader *GradientShader;
vtkRayCastImageDisplayHelper *ImageDisplayHelper;
- void ReportReferences(vtkGarbageCollector*) VTK_OVERRIDE;
+ void ReportReferences(vtkGarbageCollector*) override;
// The distance between sample points along the ray
double SampleDistance;
diff --git a/Rendering/Volume/vtkVolumeRayCastSpaceLeapingImageFilter.h b/Rendering/Volume/vtkVolumeRayCastSpaceLeapingImageFilter.h
index 9d06f891b401eac26d348721759da653f795e739..264690c95465cd4427ae29d55c2e8410d1f6c3e7 100644
--- a/Rendering/Volume/vtkVolumeRayCastSpaceLeapingImageFilter.h
+++ b/Rendering/Volume/vtkVolumeRayCastSpaceLeapingImageFilter.h
@@ -41,7 +41,7 @@ class VTKRENDERINGVOLUME_EXPORT vtkVolumeRayCastSpaceLeapingImageFilter : public
{
public:
vtkTypeMacro(vtkVolumeRayCastSpaceLeapingImageFilter,vtkThreadedImageAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkVolumeRayCastSpaceLeapingImageFilter *New();
@@ -195,7 +195,7 @@ public:
protected:
vtkVolumeRayCastSpaceLeapingImageFilter();
- ~vtkVolumeRayCastSpaceLeapingImageFilter() VTK_OVERRIDE;
+ ~vtkVolumeRayCastSpaceLeapingImageFilter() override;
int IndependentComponents;
vtkTimeStamp LastMinMaxBuildTime;
@@ -223,19 +223,19 @@ protected:
*/
int RequestUpdateExtent(vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
void ThreadedRequestData( vtkInformation *request,
vtkInformationVector **inputVector,
vtkInformationVector *outputVector,
vtkImageData ***inData,
vtkImageData **outData,
- int outExt[6], int id) VTK_OVERRIDE;
+ int outExt[6], int id) override;
int RequestData( vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
int RequestInformation( vtkInformation *,
vtkInformationVector**,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
//@}
/**
@@ -268,9 +268,9 @@ protected:
*/
void AllocateOutputData(vtkImageData *out,
vtkInformation* outInfo,
- int *uExtent) VTK_OVERRIDE;
+ int *uExtent) override;
vtkImageData *AllocateOutputData(vtkDataObject *out,
- vtkInformation *outInfo) VTK_OVERRIDE;
+ vtkInformation *outInfo) override;
//@}
private:
diff --git a/Rendering/Volume/vtkVolumeTextureMapper.h b/Rendering/Volume/vtkVolumeTextureMapper.h
index 95ca6f52c9866db4ab9644d462295fce9d4d3ffa..81edb96887d677d9fd913f40471aa5fb920fd1c0 100644
--- a/Rendering/Volume/vtkVolumeTextureMapper.h
+++ b/Rendering/Volume/vtkVolumeTextureMapper.h
@@ -40,7 +40,7 @@ class VTKRENDERINGVOLUME_EXPORT vtkVolumeTextureMapper : public vtkVolumeMapper
{
public:
vtkTypeMacro(vtkVolumeTextureMapper,vtkVolumeMapper);
- void PrintSelf( ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf( ostream& os, vtkIndent indent) override;
//@{
/**
@@ -83,18 +83,18 @@ public:
* DO NOT USE THIS METHOD OUTSIDE OF THE RENDERING PROCESS
* Render the volume
*/
- void Render(vtkRenderer *ren, vtkVolume *vol) VTK_OVERRIDE =0;
+ void Render(vtkRenderer *ren, vtkVolume *vol) override =0;
//@{
/**
* WARNING: INTERNAL METHOD - NOT INTENDED FOR GENERAL USE
* Values needed by the volume
*/
- float GetGradientMagnitudeScale() VTK_OVERRIDE;
- float GetGradientMagnitudeBias() VTK_OVERRIDE;
- float GetGradientMagnitudeScale(int) VTK_OVERRIDE
+ float GetGradientMagnitudeScale() override;
+ float GetGradientMagnitudeBias() override;
+ float GetGradientMagnitudeScale(int) override
{ return this->GetGradientMagnitudeScale(); };
- float GetGradientMagnitudeBias(int) VTK_OVERRIDE
+ float GetGradientMagnitudeBias(int) override
{ return this->GetGradientMagnitudeBias(); };
//@}
@@ -103,15 +103,15 @@ public:
*/
int ProcessRequest(vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
protected:
vtkVolumeTextureMapper();
- ~vtkVolumeTextureMapper() VTK_OVERRIDE;
+ ~vtkVolumeTextureMapper() override;
void InitializeRender( vtkRenderer *ren, vtkVolume *vol );
- void ReportReferences(vtkGarbageCollector*) VTK_OVERRIDE;
+ void ReportReferences(vtkGarbageCollector*) override;
// Objects / variables needed for shading / gradient magnitude opacity
vtkEncodedGradientEstimator *GradientEstimator;
diff --git a/Rendering/Volume/vtkVolumeTextureMapper2D.h b/Rendering/Volume/vtkVolumeTextureMapper2D.h
index d4b7e7add8168c56f08d5670f9da9be334777138..b104f109c7a43b44a94ee3666231cfea4a66a7a7 100644
--- a/Rendering/Volume/vtkVolumeTextureMapper2D.h
+++ b/Rendering/Volume/vtkVolumeTextureMapper2D.h
@@ -35,7 +35,7 @@ class VTKRENDERINGVOLUME_EXPORT vtkVolumeTextureMapper2D : public vtkVolumeTextu
{
public:
vtkTypeMacro(vtkVolumeTextureMapper2D,vtkVolumeTextureMapper);
- void PrintSelf( ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf( ostream& os, vtkIndent indent) override;
static vtkVolumeTextureMapper2D *New();
@@ -79,7 +79,7 @@ public:
* DO NOT USE THIS METHOD OUTSIDE OF THE RENDERING PROCESS
* Render the volume
*/
- void Render(vtkRenderer *, vtkVolume *) VTK_OVERRIDE {}
+ void Render(vtkRenderer *, vtkVolume *) override {}
virtual void RenderQuads( int vtkNotUsed(count),
float *vtkNotUsed(v), float *vtkNotUsed(t),
@@ -101,7 +101,7 @@ public:
protected:
vtkVolumeTextureMapper2D();
- ~vtkVolumeTextureMapper2D() VTK_OVERRIDE;
+ ~vtkVolumeTextureMapper2D() override;
void InitializeRender( vtkRenderer *ren, vtkVolume *vol )
{this->InitializeRender( ren, vol, -1 );}
diff --git a/Rendering/Volume/vtkVolumeTextureMapper3D.h b/Rendering/Volume/vtkVolumeTextureMapper3D.h
index 29ddb6fcd7181747115d8f18405ce0372c68e994..dda7bf2163c7c550e28ef0775a309aa69c87e30e 100644
--- a/Rendering/Volume/vtkVolumeTextureMapper3D.h
+++ b/Rendering/Volume/vtkVolumeTextureMapper3D.h
@@ -89,7 +89,7 @@ class VTKRENDERINGVOLUME_EXPORT vtkVolumeTextureMapper3D : public vtkVolumeMappe
{
public:
vtkTypeMacro(vtkVolumeTextureMapper3D,vtkVolumeMapper);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkVolumeTextureMapper3D *New();
@@ -149,7 +149,7 @@ public:
* DO NOT USE THIS METHOD OUTSIDE OF THE RENDERING PROCESS
* Render the volume
*/
- void Render(vtkRenderer *, vtkVolume *) VTK_OVERRIDE {}
+ void Render(vtkRenderer *, vtkVolume *) override {}
/**
* What rendering method is supported?
@@ -199,7 +199,7 @@ public:
protected:
vtkVolumeTextureMapper3D();
- ~vtkVolumeTextureMapper3D() VTK_OVERRIDE;
+ ~vtkVolumeTextureMapper3D() override;
float *PolygonBuffer;
float *IntersectionBuffer;
diff --git a/Rendering/VolumeAMR/vtkAMRVolumeMapper.h b/Rendering/VolumeAMR/vtkAMRVolumeMapper.h
index 789239c88cc84680f4f19a1163f8b762adbfb64c..c27c87d5462cf7aaab0ff82a0ba9af634fc03315 100644
--- a/Rendering/VolumeAMR/vtkAMRVolumeMapper.h
+++ b/Rendering/VolumeAMR/vtkAMRVolumeMapper.h
@@ -42,17 +42,17 @@ class VTKRENDERINGVOLUMEAMR_EXPORT vtkAMRVolumeMapper : public vtkVolumeMapper
public:
static vtkAMRVolumeMapper *New();
vtkTypeMacro(vtkAMRVolumeMapper,vtkVolumeMapper);
- void PrintSelf( ostream& os, vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf( ostream& os, vtkIndent indent ) override;
//@{
/**
* Set the input data
*/
- void SetInputData( vtkImageData* ) VTK_OVERRIDE;
- void SetInputData( vtkDataSet* ) VTK_OVERRIDE;
+ void SetInputData( vtkImageData* ) override;
+ void SetInputData( vtkDataSet* ) override;
virtual void SetInputData( vtkOverlappingAMR* );
- void SetInputConnection (int port, vtkAlgorithmOutput *input) VTK_OVERRIDE;
- void SetInputConnection (vtkAlgorithmOutput *input) VTK_OVERRIDE
+ void SetInputConnection (int port, vtkAlgorithmOutput *input) override;
+ void SetInputConnection (vtkAlgorithmOutput *input) override
{this->SetInputConnection(0, input);}
//@}
@@ -61,8 +61,8 @@ public:
* Return bounding box (array of six doubles) of data expressed as
* (xmin,xmax, ymin,ymax, zmin,zmax).
*/
- double *GetBounds() VTK_OVERRIDE;
- void GetBounds(double bounds[6]) VTK_OVERRIDE
+ double *GetBounds() override;
+ void GetBounds(double bounds[6]) override
{this->vtkVolumeMapper::GetBounds(bounds); };
//@}
@@ -77,7 +77,7 @@ public:
* (ScalarModeToUseCellFieldData). If scalars are coming from a field
* data array, you must call SelectScalarArray.
*/
- void SetScalarMode(int mode) VTK_OVERRIDE;
+ void SetScalarMode(int mode) override;
//@{
/**
@@ -89,8 +89,8 @@ public:
* Additive blend mode adds scalars along the ray and multiply them by
* their opacity mapping value.
*/
- void SetBlendMode(int mode) VTK_OVERRIDE;
- int GetBlendMode() VTK_OVERRIDE;
+ void SetBlendMode(int mode) override;
+ int GetBlendMode() override;
//@}
//@{
@@ -100,17 +100,17 @@ public:
* The transfer function in the vtkVolumeProperty (attached to the calling
* vtkVolume) will decide how to convert vectors to colors.
*/
- void SelectScalarArray(int arrayNum) VTK_OVERRIDE;
- void SelectScalarArray(const char* arrayName) VTK_OVERRIDE;
+ void SelectScalarArray(int arrayNum) override;
+ void SelectScalarArray(const char* arrayName) override;
//@}
//@{
/**
* Get the array name or number and component to use for rendering.
*/
- char* GetArrayName() VTK_OVERRIDE;
- int GetArrayId() VTK_OVERRIDE;
- int GetArrayAccessMode() VTK_OVERRIDE;
+ char* GetArrayName() override;
+ int GetArrayId() override;
+ int GetArrayAccessMode() override;
//@}
/**
@@ -122,8 +122,8 @@ public:
* Turn On/Off orthogonal cropping. (Clipping planes are
* perpendicular to the coordinate axes.)
*/
- void SetCropping(int mode) VTK_OVERRIDE;
- int GetCropping() VTK_OVERRIDE;
+ void SetCropping(int mode) override;
+ int GetCropping() override;
//@}
//@{
@@ -133,13 +133,13 @@ public:
* considered.
*/
void SetCroppingRegionPlanes(double arg1, double arg2, double arg3,
- double arg4, double arg5, double arg6) VTK_OVERRIDE;
- void SetCroppingRegionPlanes(double *planes) VTK_OVERRIDE
+ double arg4, double arg5, double arg6) override;
+ void SetCroppingRegionPlanes(double *planes) override
{this->SetCroppingRegionPlanes(
planes[0],planes[1],planes[2],
planes[3],planes[4],planes[5]);}
- void GetCroppingRegionPlanes(double *planes) VTK_OVERRIDE;
- double *GetCroppingRegionPlanes() VTK_OVERRIDE;
+ void GetCroppingRegionPlanes(double *planes) override;
+ double *GetCroppingRegionPlanes() override;
//@}
//@{
/**
@@ -153,8 +153,8 @@ public:
* clip plane pairs), inverted fence, cross (between any two of the
* clip plane pairs) and inverted cross.
*/
- void SetCroppingRegionFlags(int mode) VTK_OVERRIDE;
- int GetCroppingRegionFlags() VTK_OVERRIDE;
+ void SetCroppingRegionFlags(int mode) override;
+ int GetCroppingRegionFlags() override;
//@}
// The possible values for the default and current render mode ivars
@@ -253,7 +253,7 @@ public:
* DO NOT USE THIS METHOD OUTSIDE OF THE RENDERING PROCESS
* Render the volume
*/
- void Render(vtkRenderer *ren, vtkVolume *vol) VTK_OVERRIDE;
+ void Render(vtkRenderer *ren, vtkVolume *vol) override;
/**
* WARNING: INTERNAL METHOD - NOT INTENDED FOR GENERAL USE
@@ -261,7 +261,7 @@ public:
* The parameter window could be used to determine which graphic
* resources to release.
*/
- void ReleaseGraphicsResources(vtkWindow *) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *) override;
void ProcessUpdateExtentRequest(vtkRenderer *renderer, vtkInformation*info,
vtkInformationVector **inputVector,
@@ -311,10 +311,10 @@ public:
protected:
vtkAMRVolumeMapper();
- ~vtkAMRVolumeMapper() VTK_OVERRIDE;
+ ~vtkAMRVolumeMapper() override;
// see algorithm for more info
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
void UpdateGrid();
vtkSmartVolumeMapper *InternalMapper;
diff --git a/Rendering/VolumeOpenGL/vtkOpenGLGPUVolumeRayCastMapper.cxx b/Rendering/VolumeOpenGL/vtkOpenGLGPUVolumeRayCastMapper.cxx
index b526426a93fda7b0177bc99f75658a8c32a156a5..2470de9ed928209a2ccf147e6618b3ffa80a6bbb 100644
--- a/Rendering/VolumeOpenGL/vtkOpenGLGPUVolumeRayCastMapper.cxx
+++ b/Rendering/VolumeOpenGL/vtkOpenGLGPUVolumeRayCastMapper.cxx
@@ -289,7 +289,7 @@ protected:
this->LastLinearInterpolation=false;
this->LastRange[0] = this->LastRange[1] = 0.0;
}
- ~vtkTextureTable() VTK_OVERRIDE
+ ~vtkTextureTable() override
{
if(this->TextureId!=0)
{
@@ -469,7 +469,7 @@ protected:
this->LastSampleDistance=1.0;
}
- ~vtkOpacityTable() VTK_OVERRIDE {};
+ ~vtkOpacityTable() override {};
int LastBlendMode;
double LastSampleDistance;
@@ -592,7 +592,7 @@ public:
protected:
vtkRGBTable() {};
- ~vtkRGBTable() VTK_OVERRIDE {};
+ ~vtkRGBTable() override {};
private:
vtkRGBTable(const vtkRGBTable &other) VTK_DELETE_FUNCTION;
diff --git a/Rendering/VolumeOpenGL/vtkOpenGLGPUVolumeRayCastMapper.h b/Rendering/VolumeOpenGL/vtkOpenGLGPUVolumeRayCastMapper.h
index 1f8d6bbf420d22a24b17b7d0f4457b3f1360ade3..f294fccd930cd448d93df5edf7a6e117ebae3cde 100644
--- a/Rendering/VolumeOpenGL/vtkOpenGLGPUVolumeRayCastMapper.h
+++ b/Rendering/VolumeOpenGL/vtkOpenGLGPUVolumeRayCastMapper.h
@@ -64,7 +64,7 @@ class VTKRENDERINGVOLUMEOPENGL_EXPORT vtkOpenGLGPUVolumeRayCastMapper
public:
static vtkOpenGLGPUVolumeRayCastMapper *New();
vtkTypeMacro(vtkOpenGLGPUVolumeRayCastMapper,vtkGPUVolumeRayCastMapper);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Based on hardware and properties, we may or may not be able to
@@ -73,13 +73,13 @@ public:
* necessary to support the specific properties are available.
*/
int IsRenderSupported(vtkRenderWindow *window,
- vtkVolumeProperty *property) VTK_OVERRIDE;
+ vtkVolumeProperty *property) override;
/**
* Delete OpenGL objects.
* \post done: this->OpenGLObjectsCreated==0
*/
- void ReleaseGraphicsResources(vtkWindow *window) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *window) override;
/**
* Return a string matching the OpenGL errorCode.
@@ -96,11 +96,11 @@ public:
protected:
vtkOpenGLGPUVolumeRayCastMapper();
- ~vtkOpenGLGPUVolumeRayCastMapper() VTK_OVERRIDE;
+ ~vtkOpenGLGPUVolumeRayCastMapper() override;
// The render method called by the superclass
void GPURender(vtkRenderer *ren,
- vtkVolume *vol) VTK_OVERRIDE;
+ vtkVolume *vol) override;
// Methods called by the AMR Volume Mapper.
void PreRender(vtkRenderer *ren,
@@ -108,15 +108,15 @@ protected:
double datasetBounds[6],
double scalarRange[2],
int numberOfScalarComponents,
- unsigned int numberOfLevels) VTK_OVERRIDE;
+ unsigned int numberOfLevels) override;
// \pre input is up-to-date
void RenderBlock(vtkRenderer *ren,
vtkVolume *vol,
- unsigned int level) VTK_OVERRIDE;
+ unsigned int level) override;
void PostRender(vtkRenderer *ren,
- int numberOfScalarComponents) VTK_OVERRIDE;
+ int numberOfScalarComponents) override;
/**
* Return if the required OpenGL extension `extensionName' is supported.
@@ -376,7 +376,7 @@ protected:
* \post valid_j_ratio: ratio[1]>0 && ratio[1]<=1.0
* \post valid_k_ratio: ratio[2]>0 && ratio[2]<=1.0
*/
- void GetReductionRatio(double ratio[3]) VTK_OVERRIDE;
+ void GetReductionRatio(double ratio[3]) override;
int NumberOfCroppingRegions;
diff --git a/Rendering/VolumeOpenGL/vtkOpenGLHAVSVolumeMapper.h b/Rendering/VolumeOpenGL/vtkOpenGLHAVSVolumeMapper.h
index 0cbf1b62760c36a84509965643ca0eb88b0ddd04..770914df275ac43835d170d700b63eb2cb3717f4 100644
--- a/Rendering/VolumeOpenGL/vtkOpenGLHAVSVolumeMapper.h
+++ b/Rendering/VolumeOpenGL/vtkOpenGLHAVSVolumeMapper.h
@@ -133,24 +133,24 @@ public:
static vtkOpenGLHAVSVolumeMapper *New();
vtkTypeMacro(vtkOpenGLHAVSVolumeMapper,
vtkHAVSVolumeMapper);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Render the volume
*/
- void Render(vtkRenderer *ren, vtkVolume *vol) VTK_OVERRIDE;
+ void Render(vtkRenderer *ren, vtkVolume *vol) override;
/**
* Release any graphics resources that are being consumed by this volume
* renderer.
*/
- void ReleaseGraphicsResources(vtkWindow *) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *) override;
/**
* Set/get whether or not the data structures should be stored on the GPU
* for better peformance.
*/
- void SetGPUDataStructures(bool) VTK_OVERRIDE;
+ void SetGPUDataStructures(bool) override;
/**
* Check hardware support for the HAVS algorithm. Necessary
@@ -158,14 +158,14 @@ public:
* render targets, and framebuffer objects.
* Subclasses must override this method to indicate if supported by Hardware.
*/
- bool SupportedByHardware(vtkRenderer *r) VTK_OVERRIDE;
+ bool SupportedByHardware(vtkRenderer *r) override;
protected:
vtkOpenGLHAVSVolumeMapper();
- ~vtkOpenGLHAVSVolumeMapper() VTK_OVERRIDE;
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ ~vtkOpenGLHAVSVolumeMapper() override;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
- void Initialize(vtkRenderer *ren, vtkVolume *vol) VTK_OVERRIDE;
+ void Initialize(vtkRenderer *ren, vtkVolume *vol) override;
virtual void InitializeLookupTables(vtkVolume *vol);
void InitializeGPUDataStructures();
void InitializeShaders();
diff --git a/Rendering/VolumeOpenGL/vtkOpenGLProjectedAAHexahedraMapper.h b/Rendering/VolumeOpenGL/vtkOpenGLProjectedAAHexahedraMapper.h
index 1e74dda6003b8909e851b0eb84ea29fc429cd0ca..620723294054a426f65f9c929cfab097d289052d 100644
--- a/Rendering/VolumeOpenGL/vtkOpenGLProjectedAAHexahedraMapper.h
+++ b/Rendering/VolumeOpenGL/vtkOpenGLProjectedAAHexahedraMapper.h
@@ -50,21 +50,21 @@ public:
vtkTypeMacro(vtkOpenGLProjectedAAHexahedraMapper,
vtkProjectedAAHexahedraMapper);
static vtkOpenGLProjectedAAHexahedraMapper *New();
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
/**
* Check if the required OpenGL extensions are supported by the OpenGL
* context attached to the render window `w'.
*/
- bool IsRenderSupported(vtkRenderWindow *w) VTK_OVERRIDE;
+ bool IsRenderSupported(vtkRenderWindow *w) override;
- void Render(vtkRenderer *renderer, vtkVolume *volume) VTK_OVERRIDE;
+ void Render(vtkRenderer *renderer, vtkVolume *volume) override;
- void ReleaseGraphicsResources(vtkWindow *window) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *window) override;
protected:
vtkOpenGLProjectedAAHexahedraMapper();
- ~vtkOpenGLProjectedAAHexahedraMapper() VTK_OVERRIDE;
+ ~vtkOpenGLProjectedAAHexahedraMapper() override;
/**
* Convert the input scalar values to floats.
diff --git a/Rendering/VolumeOpenGL/vtkOpenGLProjectedTetrahedraMapper.h b/Rendering/VolumeOpenGL/vtkOpenGLProjectedTetrahedraMapper.h
index 819f1c8e4e7243d1c6d20ecf05374f9c2ae71f88..90cdf060f977b66034bcee56a47f770028c42c81 100644
--- a/Rendering/VolumeOpenGL/vtkOpenGLProjectedTetrahedraMapper.h
+++ b/Rendering/VolumeOpenGL/vtkOpenGLProjectedTetrahedraMapper.h
@@ -52,11 +52,11 @@ public:
vtkTypeMacro(vtkOpenGLProjectedTetrahedraMapper,
vtkProjectedTetrahedraMapper);
static vtkOpenGLProjectedTetrahedraMapper *New();
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
- void ReleaseGraphicsResources(vtkWindow *window) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *window) override;
- void Render(vtkRenderer *renderer, vtkVolume *volume) VTK_OVERRIDE;
+ void Render(vtkRenderer *renderer, vtkVolume *volume) override;
//@{
/**
@@ -72,11 +72,11 @@ public:
* Return true if the rendering context provides
* the nececessary functionality to use this class.
*/
- bool IsSupported(vtkRenderWindow *context) VTK_OVERRIDE;
+ bool IsSupported(vtkRenderWindow *context) override;
protected:
vtkOpenGLProjectedTetrahedraMapper();
- ~vtkOpenGLProjectedTetrahedraMapper() VTK_OVERRIDE;
+ ~vtkOpenGLProjectedTetrahedraMapper() override;
void Initialize(vtkRenderer *ren);
bool Initialized;
diff --git a/Rendering/VolumeOpenGL/vtkOpenGLRayCastImageDisplayHelper.h b/Rendering/VolumeOpenGL/vtkOpenGLRayCastImageDisplayHelper.h
index 3bdb9ea3488b6595f1d5a7e54f23242733c3a971..b83483e5516428d51180703ae91f83c956293766 100644
--- a/Rendering/VolumeOpenGL/vtkOpenGLRayCastImageDisplayHelper.h
+++ b/Rendering/VolumeOpenGL/vtkOpenGLRayCastImageDisplayHelper.h
@@ -40,7 +40,7 @@ class VTKRENDERINGVOLUMEOPENGL_EXPORT vtkOpenGLRayCastImageDisplayHelper
public:
static vtkOpenGLRayCastImageDisplayHelper *New();
vtkTypeMacro(vtkOpenGLRayCastImageDisplayHelper,vtkRayCastImageDisplayHelper);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
void RenderTexture( vtkVolume *vol, vtkRenderer *ren,
int imageMemorySize[2],
@@ -48,7 +48,7 @@ public:
int imageInUseSize[2],
int imageOrigin[2],
float requestedDepth,
- unsigned char *image ) VTK_OVERRIDE;
+ unsigned char *image ) override;
void RenderTexture( vtkVolume *vol, vtkRenderer *ren,
int imageMemorySize[2],
@@ -56,15 +56,15 @@ public:
int imageInUseSize[2],
int imageOrigin[2],
float requestedDepth,
- unsigned short *image ) VTK_OVERRIDE;
+ unsigned short *image ) override;
void RenderTexture( vtkVolume *vol, vtkRenderer *ren,
vtkFixedPointRayCastImage *image,
- float requestedDepth ) VTK_OVERRIDE;
+ float requestedDepth ) override;
protected:
vtkOpenGLRayCastImageDisplayHelper();
- ~vtkOpenGLRayCastImageDisplayHelper() VTK_OVERRIDE;
+ ~vtkOpenGLRayCastImageDisplayHelper() override;
void RenderTextureInternal( vtkVolume *vol, vtkRenderer *ren,
int imageMemorySize[2],
diff --git a/Rendering/VolumeOpenGL/vtkOpenGLVolumeTextureMapper2D.h b/Rendering/VolumeOpenGL/vtkOpenGLVolumeTextureMapper2D.h
index 63d0af8304b1a56b590486decdf607877d08d984..04d774fe78d82552e54d964aef49974319321402 100644
--- a/Rendering/VolumeOpenGL/vtkOpenGLVolumeTextureMapper2D.h
+++ b/Rendering/VolumeOpenGL/vtkOpenGLVolumeTextureMapper2D.h
@@ -36,7 +36,7 @@ class VTKRENDERINGVOLUMEOPENGL_EXPORT vtkOpenGLVolumeTextureMapper2D
{
public:
vtkTypeMacro(vtkOpenGLVolumeTextureMapper2D,vtkVolumeTextureMapper2D);
- void PrintSelf( ostream& os, vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf( ostream& os, vtkIndent indent ) override;
static vtkOpenGLVolumeTextureMapper2D *New();
@@ -45,14 +45,14 @@ public:
* DO NOT USE THIS METHOD OUTSIDE OF THE RENDERING PROCESS
* Render the volume
*/
- void Render(vtkRenderer *ren, vtkVolume *vol) VTK_OVERRIDE;
+ void Render(vtkRenderer *ren, vtkVolume *vol) override;
void RenderQuads( int count, float *v, float *t,
- unsigned char *texture, int size[2], int reverseFlag) VTK_OVERRIDE;
+ unsigned char *texture, int size[2], int reverseFlag) override;
protected:
vtkOpenGLVolumeTextureMapper2D();
- ~vtkOpenGLVolumeTextureMapper2D() VTK_OVERRIDE;
+ ~vtkOpenGLVolumeTextureMapper2D() override;
private:
vtkOpenGLVolumeTextureMapper2D(const vtkOpenGLVolumeTextureMapper2D&) VTK_DELETE_FUNCTION;
diff --git a/Rendering/VolumeOpenGL/vtkOpenGLVolumeTextureMapper3D.h b/Rendering/VolumeOpenGL/vtkOpenGLVolumeTextureMapper3D.h
index 49e73ec2234be6dd12eadc04747ceb9183952bc7..9ddd91354b82ed23f137dcd3121e02784ad461cf 100644
--- a/Rendering/VolumeOpenGL/vtkOpenGLVolumeTextureMapper3D.h
+++ b/Rendering/VolumeOpenGL/vtkOpenGLVolumeTextureMapper3D.h
@@ -41,7 +41,7 @@ class VTKRENDERINGVOLUMEOPENGL_EXPORT vtkOpenGLVolumeTextureMapper3D
{
public:
vtkTypeMacro(vtkOpenGLVolumeTextureMapper3D,vtkVolumeTextureMapper3D);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static vtkOpenGLVolumeTextureMapper3D *New();
@@ -51,14 +51,14 @@ public:
* not support the required extensions
*/
int IsRenderSupported(vtkVolumeProperty *,
- vtkRenderer *ren) VTK_OVERRIDE;
+ vtkRenderer *ren) override;
/**
* WARNING: INTERNAL METHOD - NOT INTENDED FOR GENERAL USE
* DO NOT USE THIS METHOD OUTSIDE OF THE RENDERING PROCESS
* Render the volume
*/
- void Render(vtkRenderer *ren, vtkVolume *vol) VTK_OVERRIDE;
+ void Render(vtkRenderer *ren, vtkVolume *vol) override;
// Desciption:
// Initialize when we go to render, or go to answer the
@@ -71,11 +71,11 @@ public:
* The parameter window could be used to determine which graphic
* resources to release.
*/
- void ReleaseGraphicsResources(vtkWindow *) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *) override;
protected:
vtkOpenGLVolumeTextureMapper3D();
- ~vtkOpenGLVolumeTextureMapper3D() VTK_OVERRIDE;
+ ~vtkOpenGLVolumeTextureMapper3D() override;
void GetLightInformation(vtkRenderer *ren,
vtkVolume *vol,
@@ -148,7 +148,7 @@ protected:
* Check if we can support this texture size for the number of components.
*/
int IsTextureSizeSupported(int size[3],
- int components) VTK_OVERRIDE;
+ int components) override;
/**
* Common code for setting up interpolation / clamping on 3D textures
diff --git a/Rendering/VolumeOpenGL/vtkSmartVolumeMapper.h b/Rendering/VolumeOpenGL/vtkSmartVolumeMapper.h
index f0267dc6a67abb09f00d151b376ef65b00c38b16..08be6b46b6e2c055dfe22b01c4cbaeb9d5cb2aa1 100644
--- a/Rendering/VolumeOpenGL/vtkSmartVolumeMapper.h
+++ b/Rendering/VolumeOpenGL/vtkSmartVolumeMapper.h
@@ -123,7 +123,7 @@ class VTKRENDERINGVOLUMEOPENGL_EXPORT vtkSmartVolumeMapper : public vtkVolumeMap
public:
static vtkSmartVolumeMapper *New();
vtkTypeMacro(vtkSmartVolumeMapper,vtkVolumeMapper);
- void PrintSelf( ostream& os, vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf( ostream& os, vtkIndent indent ) override;
//@{
/**
@@ -315,7 +315,7 @@ public:
* WARNING: INTERNAL METHOD - NOT INTENDED FOR GENERAL USE
* Initialize rendering for this volume.
*/
- void Render( vtkRenderer *, vtkVolume * ) VTK_OVERRIDE;
+ void Render( vtkRenderer *, vtkVolume * ) override;
/**
* WARNING: INTERNAL METHOD - NOT INTENDED FOR GENERAL USE
@@ -323,11 +323,11 @@ public:
* The parameter window could be used to determine which graphic
* resources to release.
*/
- void ReleaseGraphicsResources(vtkWindow *) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *) override;
protected:
vtkSmartVolumeMapper();
- ~vtkSmartVolumeMapper() VTK_OVERRIDE;
+ ~vtkSmartVolumeMapper() override;
/**
* Connect input of the vtkSmartVolumeMapper to the input of the
diff --git a/Rendering/VolumeOpenGL2/vtkMultiBlockVolumeMapper.h b/Rendering/VolumeOpenGL2/vtkMultiBlockVolumeMapper.h
index 0b3ceca6e9ffa114701420bb7f74384cb1526bcc..346fe0f5c347081520d79286aa9f8007d0f50b20 100644
--- a/Rendering/VolumeOpenGL2/vtkMultiBlockVolumeMapper.h
+++ b/Rendering/VolumeOpenGL2/vtkMultiBlockVolumeMapper.h
@@ -55,20 +55,20 @@ class VTKRENDERINGVOLUMEOPENGL2_EXPORT vtkMultiBlockVolumeMapper :
public:
static vtkMultiBlockVolumeMapper *New();
vtkTypeMacro(vtkMultiBlockVolumeMapper,vtkVolumeMapper);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
* \brief API Superclass
* \sa vtkAbstractVolumeMapper
*/
- double* GetBounds() VTK_OVERRIDE;
+ double* GetBounds() override;
using vtkAbstractVolumeMapper::GetBounds;
- void SelectScalarArray(int arrayNum) VTK_OVERRIDE;
- void SelectScalarArray(char const* arrayName) VTK_OVERRIDE;
- void SetScalarMode(int ScalarMode) VTK_OVERRIDE;
- void SetArrayAccessMode(int accessMode) VTK_OVERRIDE;
+ void SelectScalarArray(int arrayNum) override;
+ void SelectScalarArray(char const* arrayName) override;
+ void SetScalarMode(int ScalarMode) override;
+ void SetArrayAccessMode(int accessMode) override;
/**
* Render the current dataset.
@@ -76,13 +76,13 @@ public:
* \warning Internal method - not intended for general use, do
* NOT use this method outside of the rendering process.
*/
- void Render(vtkRenderer* ren, vtkVolume* vol) VTK_OVERRIDE;
+ void Render(vtkRenderer* ren, vtkVolume* vol) override;
/**
* \warning Internal method - not intended for general use, do
* NOT use this method outside of the rendering process.
*/
- void ReleaseGraphicsResources(vtkWindow* window) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow* window) override;
//@}
//@{
@@ -109,7 +109,7 @@ public:
* Blending mode API from vtkVolumeMapper
* \sa vtkVolumeMapper::SetBlendMode
*/
- void SetBlendMode(int mode) VTK_OVERRIDE;
+ void SetBlendMode(int mode) override;
//@}
//@{
@@ -117,19 +117,19 @@ public:
* Cropping API from vtkVolumeMapper
* \sa vtkVolumeMapper::SetCropping
*/
- void SetCropping(int mode) VTK_OVERRIDE;
+ void SetCropping(int mode) override;
/**
* \sa vtkVolumeMapper::SetCroppingRegionPlanes
*/
void SetCroppingRegionPlanes(double arg1, double arg2, double arg3,
- double arg4, double arg5, double arg6) VTK_OVERRIDE;
- void SetCroppingRegionPlanes(double *planes) VTK_OVERRIDE;
+ double arg4, double arg5, double arg6) override;
+ void SetCroppingRegionPlanes(double *planes) override;
/**
* \sa vtkVolumeMapper::SetCroppingRegionFlags
*/
- void SetCroppingRegionFlags(int mode) VTK_OVERRIDE;
+ void SetCroppingRegionFlags(int mode) override;
//@}
protected:
@@ -143,7 +143,7 @@ protected:
*
* \sa vtkAlgorithm::FillInputPortInformation
*/
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
private:
/**
diff --git a/Rendering/VolumeOpenGL2/vtkOpenGLGPUVolumeRayCastMapper.h b/Rendering/VolumeOpenGL2/vtkOpenGLGPUVolumeRayCastMapper.h
index db0b02e31ea5df6a74e3dd712c9a9b5fd346b3ea..38915ff4f70e73f5d045f1815b3018d4b3e59835 100644
--- a/Rendering/VolumeOpenGL2/vtkOpenGLGPUVolumeRayCastMapper.h
+++ b/Rendering/VolumeOpenGL2/vtkOpenGLGPUVolumeRayCastMapper.h
@@ -42,7 +42,7 @@ public:
};
vtkTypeMacro(vtkOpenGLGPUVolumeRayCastMapper, vtkGPUVolumeRayCastMapper);
- void PrintSelf( ostream& os, vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf( ostream& os, vtkIndent indent ) override;
// Description:
// Low level API to enable access to depth texture in
@@ -61,12 +61,12 @@ public:
// Description:
// Low level API to export the depth texture as vtkImageData in
// RenderToImage mode.
- void GetDepthImage(vtkImageData* im) VTK_OVERRIDE;
+ void GetDepthImage(vtkImageData* im) override;
// Description:
// Low level API to export the color texture as vtkImageData in
// RenderToImage mode.
- void GetColorImage(vtkImageData* im) VTK_OVERRIDE;
+ void GetColorImage(vtkImageData* im) override;
// Description:
// Mapper can have multiple passes and internally it will set
@@ -105,12 +105,12 @@ public:
protected:
vtkOpenGLGPUVolumeRayCastMapper();
- ~vtkOpenGLGPUVolumeRayCastMapper() VTK_OVERRIDE;
+ ~vtkOpenGLGPUVolumeRayCastMapper() override;
// Description:
// Delete OpenGL objects.
// \post done: this->OpenGLObjectsCreated==0
- void ReleaseGraphicsResources(vtkWindow *window) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *window) override;
vtkGenericOpenGLResourceFreeCallback *ResourceCallback;
// Description:
@@ -130,19 +130,19 @@ protected:
double vtkNotUsed(datasetBounds)[6],
double vtkNotUsed(scalarRange)[2],
int vtkNotUsed(noOfComponents),
- unsigned int vtkNotUsed(numberOfLevels)) VTK_OVERRIDE {};
+ unsigned int vtkNotUsed(numberOfLevels)) override {};
// \pre input is up-to-date
void RenderBlock(vtkRenderer *vtkNotUsed(ren),
vtkVolume *vtkNotUsed(vol),
- unsigned int vtkNotUsed(level)) VTK_OVERRIDE {}
+ unsigned int vtkNotUsed(level)) override {}
void PostRender(vtkRenderer *vtkNotUsed(ren),
- int vtkNotUsed(noOfComponents)) VTK_OVERRIDE {}
+ int vtkNotUsed(noOfComponents)) override {}
// Description:
// Rendering volume on GPU
- void GPURender(vtkRenderer *ren, vtkVolume *vol) VTK_OVERRIDE;
+ void GPURender(vtkRenderer *ren, vtkVolume *vol) override;
// Description:
// Method that performs the actual rendering given a volume and a shader
@@ -166,7 +166,7 @@ protected:
// Description:
// Empty implementation.
- void GetReductionRatio(double* ratio) VTK_OVERRIDE
+ void GetReductionRatio(double* ratio) override
{
ratio[0] = ratio[1] = ratio[2] = 1.0;
}
@@ -175,7 +175,7 @@ protected:
// Description:
// Empty implementation.
int IsRenderSupported(vtkRenderWindow *vtkNotUsed(window),
- vtkVolumeProperty *vtkNotUsed(property)) VTK_OVERRIDE
+ vtkVolumeProperty *vtkNotUsed(property)) override
{
return 1;
}
diff --git a/Rendering/VolumeOpenGL2/vtkOpenGLProjectedTetrahedraMapper.h b/Rendering/VolumeOpenGL2/vtkOpenGLProjectedTetrahedraMapper.h
index b264b5a431b99ff87c330011db3cccc3c26730f0..a7f8648679cdb8ada538c59822d6485ca26f1041 100644
--- a/Rendering/VolumeOpenGL2/vtkOpenGLProjectedTetrahedraMapper.h
+++ b/Rendering/VolumeOpenGL2/vtkOpenGLProjectedTetrahedraMapper.h
@@ -56,11 +56,11 @@ public:
vtkTypeMacro(vtkOpenGLProjectedTetrahedraMapper,
vtkProjectedTetrahedraMapper);
static vtkOpenGLProjectedTetrahedraMapper *New();
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
- void ReleaseGraphicsResources(vtkWindow *window) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *window) override;
- void Render(vtkRenderer *renderer, vtkVolume *volume) VTK_OVERRIDE;
+ void Render(vtkRenderer *renderer, vtkVolume *volume) override;
//@{
/**
@@ -76,11 +76,11 @@ public:
* Return true if the rendering context provides
* the nececessary functionality to use this class.
*/
- bool IsSupported(vtkRenderWindow *context) VTK_OVERRIDE;
+ bool IsSupported(vtkRenderWindow *context) override;
protected:
vtkOpenGLProjectedTetrahedraMapper();
- ~vtkOpenGLProjectedTetrahedraMapper() VTK_OVERRIDE;
+ ~vtkOpenGLProjectedTetrahedraMapper() override;
void Initialize(vtkRenderer *ren);
bool Initialized;
diff --git a/Rendering/VolumeOpenGL2/vtkOpenGLRayCastImageDisplayHelper.h b/Rendering/VolumeOpenGL2/vtkOpenGLRayCastImageDisplayHelper.h
index 1612a07b78e32017c48e093d0e16b0ca10105913..ff4a5324c04dd8551a419143a7f45bf1b398ff46 100644
--- a/Rendering/VolumeOpenGL2/vtkOpenGLRayCastImageDisplayHelper.h
+++ b/Rendering/VolumeOpenGL2/vtkOpenGLRayCastImageDisplayHelper.h
@@ -43,7 +43,7 @@ class VTKRENDERINGVOLUMEOPENGL2_EXPORT vtkOpenGLRayCastImageDisplayHelper
public:
static vtkOpenGLRayCastImageDisplayHelper *New();
vtkTypeMacro(vtkOpenGLRayCastImageDisplayHelper,vtkRayCastImageDisplayHelper);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
void RenderTexture( vtkVolume *vol, vtkRenderer *ren,
int imageMemorySize[2],
@@ -51,7 +51,7 @@ public:
int imageInUseSize[2],
int imageOrigin[2],
float requestedDepth,
- unsigned char *image ) VTK_OVERRIDE;
+ unsigned char *image ) override;
void RenderTexture( vtkVolume *vol, vtkRenderer *ren,
int imageMemorySize[2],
@@ -59,17 +59,17 @@ public:
int imageInUseSize[2],
int imageOrigin[2],
float requestedDepth,
- unsigned short *image ) VTK_OVERRIDE;
+ unsigned short *image ) override;
void RenderTexture( vtkVolume *vol, vtkRenderer *ren,
vtkFixedPointRayCastImage *image,
- float requestedDepth ) VTK_OVERRIDE;
+ float requestedDepth ) override;
- void ReleaseGraphicsResources(vtkWindow *win) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *win) override;
protected:
vtkOpenGLRayCastImageDisplayHelper();
- ~vtkOpenGLRayCastImageDisplayHelper() VTK_OVERRIDE;
+ ~vtkOpenGLRayCastImageDisplayHelper() override;
void RenderTextureInternal( vtkVolume *vol, vtkRenderer *ren,
int imageMemorySize[2],
diff --git a/Rendering/VolumeOpenGL2/vtkOpenGLTransferFunction2D.h b/Rendering/VolumeOpenGL2/vtkOpenGLTransferFunction2D.h
index d3fe5d2dbad2fc6dfd3ea592303b17d510b249ea..640fa3c0e954c3e3348592222ae32df06024d1da 100644
--- a/Rendering/VolumeOpenGL2/vtkOpenGLTransferFunction2D.h
+++ b/Rendering/VolumeOpenGL2/vtkOpenGLTransferFunction2D.h
@@ -177,7 +177,7 @@ protected:
}
//--------------------------------------------------------------------------
- ~vtkOpenGLTransferFunction2D() VTK_OVERRIDE
+ ~vtkOpenGLTransferFunction2D() override
{
if (this->TextureObject)
{
diff --git a/Rendering/VolumeOpenGL2/vtkOpenGLVolumeGradientOpacityTable.h b/Rendering/VolumeOpenGL2/vtkOpenGLVolumeGradientOpacityTable.h
index a2677e26b23c9964f85bf41361856ab21dc4a34a..54087dbc9afa124eb865d0930b3cb2d94849b658 100644
--- a/Rendering/VolumeOpenGL2/vtkOpenGLVolumeGradientOpacityTable.h
+++ b/Rendering/VolumeOpenGL2/vtkOpenGLVolumeGradientOpacityTable.h
@@ -184,7 +184,7 @@ protected:
}
//--------------------------------------------------------------------------
- ~vtkOpenGLVolumeGradientOpacityTable() VTK_OVERRIDE
+ ~vtkOpenGLVolumeGradientOpacityTable() override
{
if (this->TextureObject)
{
diff --git a/Rendering/VolumeOpenGL2/vtkOpenGLVolumeOpacityTable.h b/Rendering/VolumeOpenGL2/vtkOpenGLVolumeOpacityTable.h
index fb856f5c687ca90dd596ab6c3ca560ec3e71f55b..cf52d8cd717f879c6e5ca149320cad555bb2097c 100644
--- a/Rendering/VolumeOpenGL2/vtkOpenGLVolumeOpacityTable.h
+++ b/Rendering/VolumeOpenGL2/vtkOpenGLVolumeOpacityTable.h
@@ -229,7 +229,7 @@ protected:
}
//--------------------------------------------------------------------------
- ~vtkOpenGLVolumeOpacityTable() VTK_OVERRIDE
+ ~vtkOpenGLVolumeOpacityTable() override
{
if (this->TextureObject)
{
diff --git a/Rendering/VolumeOpenGL2/vtkOpenGLVolumeRGBTable.h b/Rendering/VolumeOpenGL2/vtkOpenGLVolumeRGBTable.h
index e79179533765f19dc01a16c6c4d6de3006126b5f..3cc5ea734aea9e4ecdf601174199b977233fab97 100644
--- a/Rendering/VolumeOpenGL2/vtkOpenGLVolumeRGBTable.h
+++ b/Rendering/VolumeOpenGL2/vtkOpenGLVolumeRGBTable.h
@@ -181,7 +181,7 @@ protected:
}
//--------------------------------------------------------------------------
- ~vtkOpenGLVolumeRGBTable() VTK_OVERRIDE
+ ~vtkOpenGLVolumeRGBTable() override
{
if (this->TextureObject)
{
diff --git a/Rendering/VolumeOpenGL2/vtkSmartVolumeMapper.h b/Rendering/VolumeOpenGL2/vtkSmartVolumeMapper.h
index 6d586c38875e1e8a9aa07d7a3a35499a0de64cf7..b9cd45fada984b35dcc3d9fdd954557871371a70 100644
--- a/Rendering/VolumeOpenGL2/vtkSmartVolumeMapper.h
+++ b/Rendering/VolumeOpenGL2/vtkSmartVolumeMapper.h
@@ -92,7 +92,7 @@ class VTKRENDERINGVOLUMEOPENGL2_EXPORT vtkSmartVolumeMapper : public vtkVolumeMa
public:
static vtkSmartVolumeMapper *New();
vtkTypeMacro(vtkSmartVolumeMapper,vtkVolumeMapper);
- void PrintSelf( ostream& os, vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf( ostream& os, vtkIndent indent ) override;
//@{
/**
@@ -309,7 +309,7 @@ public:
* WARNING: INTERNAL METHOD - NOT INTENDED FOR GENERAL USE
* Initialize rendering for this volume.
*/
- void Render( vtkRenderer *, vtkVolume * ) VTK_OVERRIDE;
+ void Render( vtkRenderer *, vtkVolume * ) override;
/**
* WARNING: INTERNAL METHOD - NOT INTENDED FOR GENERAL USE
@@ -317,7 +317,7 @@ public:
* The parameter window could be used to determine which graphic
* resources to release.
*/
- void ReleaseGraphicsResources(vtkWindow *) VTK_OVERRIDE;
+ void ReleaseGraphicsResources(vtkWindow *) override;
//@{
/**
@@ -343,7 +343,7 @@ public:
protected:
vtkSmartVolumeMapper();
- ~vtkSmartVolumeMapper() VTK_OVERRIDE;
+ ~vtkSmartVolumeMapper() override;
/**
* Connect input of the vtkSmartVolumeMapper to the input of the
diff --git a/Rendering/VolumeOpenGL2/vtkVolumeTexture.h b/Rendering/VolumeOpenGL2/vtkVolumeTexture.h
index 5a80456ecdc4e82ebaa6703f5da6306bb5079a51..3c3076a0fe4b72b055166c91edfec9d8bb7a090a 100644
--- a/Rendering/VolumeOpenGL2/vtkVolumeTexture.h
+++ b/Rendering/VolumeOpenGL2/vtkVolumeTexture.h
@@ -103,7 +103,7 @@ public:
};
vtkTypeMacro(vtkVolumeTexture, vtkObject);
- void PrintSelf( ostream& os, vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf( ostream& os, vtkIndent indent ) override;
/**
* Set the parent volume mapper and initialize internals.
@@ -156,7 +156,7 @@ public:
protected:
vtkVolumeTexture();
- ~vtkVolumeTexture() VTK_OVERRIDE;
+ ~vtkVolumeTexture() override;
private:
/**
diff --git a/Testing/Core/vtkTestErrorObserver.h b/Testing/Core/vtkTestErrorObserver.h
index dbbb4a6110fcce7bb1a0e5eb51a5ea73ab22cd06..bca4bd1703eab5d6817541cbe4c6081382695e4b 100644
--- a/Testing/Core/vtkTestErrorObserver.h
+++ b/Testing/Core/vtkTestErrorObserver.h
@@ -51,7 +51,7 @@ public:
}
void Execute(vtkObject *vtkNotUsed(caller),
unsigned long event,
- void *calldata) VTK_OVERRIDE
+ void *calldata) override
{
switch(event)
{
diff --git a/Testing/GenericBridge/vtkBridgeAttribute.h b/Testing/GenericBridge/vtkBridgeAttribute.h
index 1d3282e1c1c2f2643336ec02f71d076e3091a75f..7c03dca13eaa4cb15ec9a4d31a5476fd0168766f 100644
--- a/Testing/GenericBridge/vtkBridgeAttribute.h
+++ b/Testing/GenericBridge/vtkBridgeAttribute.h
@@ -37,26 +37,26 @@ class VTKTESTINGGENERICBRIDGE_EXPORT vtkBridgeAttribute : public vtkGenericAttri
public:
static vtkBridgeAttribute *New();
vtkTypeMacro(vtkBridgeAttribute,vtkGenericAttribute);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Name of the attribute. (e.g. "velocity")
* \post result_may_not_exist: result!=0 || result==0
*/
- const char *GetName() VTK_OVERRIDE;
+ const char *GetName() override;
/**
* Dimension of the attribute. (1 for scalar, 3 for velocity)
* \post positive_result: result>=0
*/
- int GetNumberOfComponents() VTK_OVERRIDE;
+ int GetNumberOfComponents() override;
/**
* Is the attribute centered either on points, cells or boundaries?
* \post valid_result: (result==vtkCenteringPoints) ||
* (result==vtkCenteringCells) || (result==vtkCenteringBoundaries)
*/
- int GetCentering() VTK_OVERRIDE;
+ int GetCentering() override;
/**
* Type of the attribute: scalar, vector, normal, texture coordinate, tensor
@@ -66,7 +66,7 @@ class VTKTESTINGGENERICBRIDGE_EXPORT vtkBridgeAttribute : public vtkGenericAttri
* ||(result==vtkDataSetAttributes::TCOORDS)
* ||(result==vtkDataSetAttributes::TENSORS)
*/
- int GetType() VTK_OVERRIDE;
+ int GetType() override;
/**
* Type of the components of the attribute: int, float, double
@@ -77,18 +77,18 @@ class VTKTESTINGGENERICBRIDGE_EXPORT vtkBridgeAttribute : public vtkGenericAttri
* ||(result==VTK_UNSIGNED_LONG) ||(result==VTK_FLOAT)
* ||(result==VTK_DOUBLE) ||(result==VTK_ID_TYPE)
*/
- int GetComponentType() VTK_OVERRIDE;
+ int GetComponentType() override;
/**
* Number of tuples.
* \post valid_result: result>=0
*/
- vtkIdType GetSize() VTK_OVERRIDE;
+ vtkIdType GetSize() override;
/**
* Size in kibibytes (1024 bytes) taken by the attribute.
*/
- unsigned long GetActualMemorySize() VTK_OVERRIDE;
+ unsigned long GetActualMemorySize() override;
/**
* Range of the attribute component `component'. It returns double, even if
@@ -97,7 +97,7 @@ class VTKTESTINGGENERICBRIDGE_EXPORT vtkBridgeAttribute : public vtkGenericAttri
* \pre valid_component: (component>=0)&&(component<GetNumberOfComponents())
* \post result_exists: result!=0
*/
- double *GetRange(int component) VTK_OVERRIDE;
+ double *GetRange(int component) override;
/**
* Range of the attribute component `component'.
@@ -105,13 +105,13 @@ class VTKTESTINGGENERICBRIDGE_EXPORT vtkBridgeAttribute : public vtkGenericAttri
* \pre valid_component: (component>=0)&&(component<GetNumberOfComponents())
*/
void GetRange(int component,
- double range[2]) VTK_OVERRIDE;
+ double range[2]) override;
/**
* Return the maximum euclidean norm for the tuples.
* \post positive_result: result>=0
*/
- double GetMaxNorm() VTK_OVERRIDE;
+ double GetMaxNorm() override;
/**
* Attribute at all points of cell `c'.
@@ -120,7 +120,7 @@ class VTKTESTINGGENERICBRIDGE_EXPORT vtkBridgeAttribute : public vtkGenericAttri
* \post result_exists: result!=0
* \post valid_result: sizeof(result)==GetNumberOfComponents()*c->GetCell()->GetNumberOfPoints()
*/
- double *GetTuple(vtkGenericAdaptorCell *c) VTK_OVERRIDE;
+ double *GetTuple(vtkGenericAdaptorCell *c) override;
/**
* Put attribute at all points of cell `c' in `tuple'.
@@ -129,7 +129,7 @@ class VTKTESTINGGENERICBRIDGE_EXPORT vtkBridgeAttribute : public vtkGenericAttri
* \pre tuple_exists: tuple!=0
* \pre valid_tuple: sizeof(tuple)>=GetNumberOfComponents()*c->GetCell()->GetNumberOfPoints()
*/
- void GetTuple(vtkGenericAdaptorCell *c, double *tuple) VTK_OVERRIDE;
+ void GetTuple(vtkGenericAdaptorCell *c, double *tuple) override;
/**
* Attribute at all points of cell `c'.
@@ -138,7 +138,7 @@ class VTKTESTINGGENERICBRIDGE_EXPORT vtkBridgeAttribute : public vtkGenericAttri
* \post result_exists: result!=0
* \post valid_result: sizeof(result)==GetNumberOfComponents()*c->GetCell()->GetNumberOfPoints()
*/
- double *GetTuple(vtkGenericCellIterator *c) VTK_OVERRIDE;
+ double *GetTuple(vtkGenericCellIterator *c) override;
/**
* Put attribute at all points of cell `c' in `tuple'.
@@ -147,7 +147,7 @@ class VTKTESTINGGENERICBRIDGE_EXPORT vtkBridgeAttribute : public vtkGenericAttri
* \pre tuple_exists: tuple!=0
* \pre valid_tuple: sizeof(tuple)>=GetNumberOfComponents()*c->GetCell()->GetNumberOfPoints()
*/
- void GetTuple(vtkGenericCellIterator *c, double *tuple) VTK_OVERRIDE;
+ void GetTuple(vtkGenericCellIterator *c, double *tuple) override;
/**
* Value of the attribute at position `p'.
@@ -156,7 +156,7 @@ class VTKTESTINGGENERICBRIDGE_EXPORT vtkBridgeAttribute : public vtkGenericAttri
* \post result_exists: result!=0
* \post valid_result_size: sizeof(result)==GetNumberOfComponents()
*/
- double *GetTuple(vtkGenericPointIterator *p) VTK_OVERRIDE;
+ double *GetTuple(vtkGenericPointIterator *p) override;
/**
* Put the value of the attribute at position `p' into `tuple'.
@@ -165,7 +165,7 @@ class VTKTESTINGGENERICBRIDGE_EXPORT vtkBridgeAttribute : public vtkGenericAttri
* \pre tuple_exists: tuple!=0
* \pre valid_tuple_size: sizeof(tuple)>=GetNumberOfComponents()
*/
- void GetTuple(vtkGenericPointIterator *p, double *tuple) VTK_OVERRIDE;
+ void GetTuple(vtkGenericPointIterator *p, double *tuple) override;
/**
* Put component `i' of the attribute at all points of cell `c' in `values'.
@@ -175,7 +175,7 @@ class VTKTESTINGGENERICBRIDGE_EXPORT vtkBridgeAttribute : public vtkGenericAttri
* \pre values_exist: values!=0
* \pre valid_values: sizeof(values)>=c->GetCell()->GetNumberOfPoints()
*/
- void GetComponent(int i,vtkGenericCellIterator *c, double *values) VTK_OVERRIDE;
+ void GetComponent(int i,vtkGenericCellIterator *c, double *values) override;
/**
* Value of the component `i' of the attribute at position `p'.
@@ -183,21 +183,21 @@ class VTKTESTINGGENERICBRIDGE_EXPORT vtkBridgeAttribute : public vtkGenericAttri
* \pre p_exists: p!=0
* \pre p_valid: !p->IsAtEnd()
*/
- double GetComponent(int i,vtkGenericPointIterator *p) VTK_OVERRIDE;
+ double GetComponent(int i,vtkGenericPointIterator *p) override;
/**
* Recursive duplication of `other' in `this'.
* \pre other_exists: other!=0
* \pre not_self: other!=this
*/
- void DeepCopy(vtkGenericAttribute *other) VTK_OVERRIDE;
+ void DeepCopy(vtkGenericAttribute *other) override;
/**
* Update `this' using fields of `other'.
* \pre other_exists: other!=0
* \pre not_self: other!=this
*/
- void ShallowCopy(vtkGenericAttribute *other) VTK_OVERRIDE;
+ void ShallowCopy(vtkGenericAttribute *other) override;
/**
* Set the current attribute to be centered on points with attribute `i' of
@@ -225,7 +225,7 @@ protected:
/**
* Destructor.
*/
- ~vtkBridgeAttribute() VTK_OVERRIDE;
+ ~vtkBridgeAttribute() override;
/**
* If size>InternalTupleCapacity, allocate enough memory.
diff --git a/Testing/GenericBridge/vtkBridgeCell.h b/Testing/GenericBridge/vtkBridgeCell.h
index b2824893668d12bff36d3d9be760846e8a86f8a4..eac7883ad1cf22257279fba756f017c23e9f8bba 100644
--- a/Testing/GenericBridge/vtkBridgeCell.h
+++ b/Testing/GenericBridge/vtkBridgeCell.h
@@ -37,18 +37,18 @@ class VTKTESTINGGENERICBRIDGE_EXPORT vtkBridgeCell : public vtkGenericAdaptorCel
public:
static vtkBridgeCell *New();
vtkTypeMacro(vtkBridgeCell,vtkGenericAdaptorCell);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Unique identification number of the cell over the whole
* data set. This unique key may not be contiguous.
*/
- vtkIdType GetId() VTK_OVERRIDE;
+ vtkIdType GetId() override;
/**
* Does `this' a cell of a dataset? (otherwise, it is a boundary cell)
*/
- int IsInDataSet() VTK_OVERRIDE;
+ int IsInDataSet() override;
/**
* Type of the current cell.
@@ -56,19 +56,19 @@ public:
* (result==VTK_HIGHER_ORDER_TRIANGLE)||
* (result==VTK_HIGHER_ORDER_TETRAHEDRON)
*/
- int GetType() VTK_OVERRIDE;
+ int GetType() override;
/**
* Topological dimension of the current cell.
* \post valid_result: result>=0 && result<=3
*/
- int GetDimension() VTK_OVERRIDE;
+ int GetDimension() override;
/**
* Interpolation order of the geometry.
* \post positive_result: result>=0
*/
- int GetGeometryOrder() VTK_OVERRIDE;
+ int GetGeometryOrder() override;
/**
* Does the cell have no higher-order interpolation for geometry?
@@ -81,7 +81,7 @@ public:
* \pre a_exists: a!=0
* \post positive_result: result>=0
*/
- int GetAttributeOrder(vtkGenericAttribute *a) VTK_OVERRIDE;
+ int GetAttributeOrder(vtkGenericAttribute *a) override;
/**
* Does the attribute `a' have no higher-order interpolation for the cell?
@@ -93,13 +93,13 @@ public:
/**
* Is the cell primary (i.e. not composite) ?
*/
- int IsPrimary() VTK_OVERRIDE;
+ int IsPrimary() override;
/**
* Number of points that compose the cell.
* \post positive_result: result>=0
*/
- int GetNumberOfPoints() VTK_OVERRIDE;
+ int GetNumberOfPoints() override;
/**
* Return the number of boundaries of dimension `dim' (or all dimensions
@@ -111,7 +111,7 @@ public:
* \pre valid_dim_range: (dim==-1) || ((dim>=0)&&(dim<GetDimension()))
* \post positive_result: result>=0
*/
- int GetNumberOfBoundaries(int dim=-1) VTK_OVERRIDE;
+ int GetNumberOfBoundaries(int dim=-1) override;
/**
* Accumulated number of DOF nodes of the current cell. A DOF node is
@@ -125,19 +125,19 @@ public:
* an arbitrary number of field values associated with them.
* \post valid_result: result==GetNumberOfBoundaries(-1)+1
*/
- int GetNumberOfDOFNodes() VTK_OVERRIDE;
+ int GetNumberOfDOFNodes() override;
/**
* Return the points of cell into `it'.
* \pre it_exists: it!=0
*/
- void GetPointIterator(vtkGenericPointIterator *it) VTK_OVERRIDE;
+ void GetPointIterator(vtkGenericPointIterator *it) override;
/**
* Create an empty cell iterator.
* \post result_exists: result!=0
*/
- vtkGenericCellIterator *NewCellIterator() VTK_OVERRIDE;
+ vtkGenericCellIterator *NewCellIterator() override;
/**
* Return in `boundaries' the cells of dimension `dim' (or all dimensions
@@ -146,7 +146,7 @@ public:
* \pre boundaries_exist: boundaries!=0
*/
void GetBoundaryIterator(vtkGenericCellIterator *boundaries,
- int dim=-1) VTK_OVERRIDE;
+ int dim=-1) override;
//@{
/**
@@ -159,8 +159,8 @@ public:
* \pre boundary: HasBoundary(boundary)
* \post positive_result: result>=0
*/
- int CountNeighbors(vtkGenericAdaptorCell *boundary) VTK_OVERRIDE;
- void CountEdgeNeighbors( int* sharing ) VTK_OVERRIDE;
+ int CountNeighbors(vtkGenericAdaptorCell *boundary) override;
+ void CountEdgeNeighbors( int* sharing ) override;
//@}
/**
@@ -174,7 +174,7 @@ public:
* \pre neighbors_exist: neighbors!=0
*/
void GetNeighbors(vtkGenericAdaptorCell *boundary,
- vtkGenericCellIterator *neighbors) VTK_OVERRIDE;
+ vtkGenericCellIterator *neighbors) override;
/**
* Compute the closest boundary of the current sub-cell `subId' for point
@@ -185,7 +185,7 @@ public:
*/
int FindClosestBoundary(int subId,
double pcoords[3],
- vtkGenericCellIterator* &boundary) VTK_OVERRIDE;
+ vtkGenericCellIterator* &boundary) override;
/**
* Is `x' inside the current cell? It also evaluate parametric coordinates
@@ -202,7 +202,7 @@ public:
double *closestPoint,
int &subId,
double pcoords[3],
- double &dist2) VTK_OVERRIDE;
+ double &dist2) override;
/**
* Determine global coordinates `x' from sub-cell `subId' and parametric
@@ -213,7 +213,7 @@ public:
*/
void EvaluateLocation(int subId,
double pcoords[3],
- double x[3]) VTK_OVERRIDE;
+ double x[3]) override;
/**
* Interpolate the attribute `a' at local position `pcoords' of the cell into
@@ -226,7 +226,7 @@ public:
* \pre valid_size: sizeof(val)==a->GetNumberOfComponents()
*/
void InterpolateTuple(vtkGenericAttribute *a, double pcoords[3],
- double *val) VTK_OVERRIDE;
+ double *val) override;
/**
* Interpolate the whole collection of attributes `c' at local position
@@ -239,7 +239,7 @@ public:
* \pre valid_size: sizeof(val)==c->GetNumberOfPointCenteredComponents()
*/
void InterpolateTuple(vtkGenericAttributeCollection *c, double pcoords[3],
- double *val) VTK_OVERRIDE;
+ double *val) override;
#if 0
/**
* Generate a contour (contouring primitives) for each `values' or with
@@ -347,7 +347,7 @@ public:
double &t,
double x[3],
double pcoords[3],
- int &subId) VTK_OVERRIDE;
+ int &subId) override;
/**
* Compute derivatives `derivs' of the attribute `attribute' (from its
@@ -364,14 +364,14 @@ public:
void Derivatives(int subId,
double pcoords[3],
vtkGenericAttribute *attribute,
- double *derivs) VTK_OVERRIDE;
+ double *derivs) override;
/**
* Compute the bounding box of the current cell in `bounds' in global
* coordinates.
* THREAD SAFE
*/
- void GetBounds(double bounds[6]) VTK_OVERRIDE;
+ void GetBounds(double bounds[6]) override;
/**
* Return the bounding box of the current cell in global coordinates.
@@ -379,13 +379,13 @@ public:
* \post result_exists: result!=0
* \post valid_size: sizeof(result)>=6
*/
- double *GetBounds() VTK_OVERRIDE;
+ double *GetBounds() override;
/**
* Bounding box diagonal squared of the current cell.
* \post positive_result: result>=0
*/
- double GetLength2() VTK_OVERRIDE;
+ double GetLength2() override;
/**
* Center of the current cell in parametric coordinates `pcoords'.
@@ -393,7 +393,7 @@ public:
* that the center is in.
* \post valid_result: (result>=0) && (IsPrimary() implies result==0)
*/
- int GetParametricCenter(double pcoords[3]) VTK_OVERRIDE;
+ int GetParametricCenter(double pcoords[3]) override;
/**
* Distance of the parametric coordinate `pcoords' to the current cell.
@@ -403,7 +403,7 @@ public:
* cell.)
* \post positive_result: result>=0
*/
- double GetParametricDistance(double pcoords[3]) VTK_OVERRIDE;
+ double GetParametricDistance(double pcoords[3]) override;
/**
* Return a contiguous array of parametric coordinates of the points defining
@@ -416,7 +416,7 @@ public:
* ((!IsPrimary()) && (result==0))
* result!=0 implies sizeof(result)==GetNumberOfPoints()
*/
- double *GetParametricCoords() VTK_OVERRIDE;
+ double *GetParametricCoords() override;
#if 0
//@{
/**
@@ -437,8 +437,8 @@ public:
vtkPointData *pd, vtkCellData* cd);
#endif
// For the internals of the tesselation algorithm (the hash table in particular)
- int IsFaceOnBoundary(vtkIdType faceId) VTK_OVERRIDE;
- int IsOnBoundary() VTK_OVERRIDE;
+ int IsFaceOnBoundary(vtkIdType faceId) override;
+ int IsOnBoundary() override;
//@}
//@{
@@ -447,7 +447,7 @@ public:
* \pre id_exists: id!=0
* \pre valid_size: sizeof(id)==GetNumberOfPoints();
*/
- void GetPointIds(vtkIdType *id) VTK_OVERRIDE;
+ void GetPointIds(vtkIdType *id) override;
#if 0
virtual void TriangulateFace(vtkGenericAttributeCollection *attributes,
vtkGenericCellTessellator *tess,
@@ -465,7 +465,7 @@ public:
* \post result_exists: result!=0
* \post valid_size: sizeof(result)>=GetNumberOfVerticesOnFace(faceId)
*/
- int *GetFaceArray(int faceId) VTK_OVERRIDE;
+ int *GetFaceArray(int faceId) override;
/**
* Return the number of vertices defining face `faceId'
@@ -473,7 +473,7 @@ public:
* \pre valid_faceId_range: faceId>=0 && faceId<this->GetNumberOfBoundaries(2)
* \post positive_result: && result>0
*/
- int GetNumberOfVerticesOnFace(int faceId) VTK_OVERRIDE;
+ int GetNumberOfVerticesOnFace(int faceId) override;
/**
* Return the ids of the vertices defining edge `edgeId'.
@@ -482,7 +482,7 @@ public:
* \post result_exists: result!=0
* \post valid_size: sizeof(result)==2
*/
- int *GetEdgeArray(int edgeId) VTK_OVERRIDE;
+ int *GetEdgeArray(int edgeId) override;
/**
* Used internally for the Bridge.
@@ -510,7 +510,7 @@ public:
protected:
vtkBridgeCell();
- ~vtkBridgeCell() VTK_OVERRIDE;
+ ~vtkBridgeCell() override;
/**
* Allocate an array for the weights, only if it does not exist yet or if
diff --git a/Testing/GenericBridge/vtkBridgeCellIterator.h b/Testing/GenericBridge/vtkBridgeCellIterator.h
index b9bcf8b50bffa3649833dc300228646c162c2080..c35f48a283e871bfbc148b8e99df4561921ec834 100644
--- a/Testing/GenericBridge/vtkBridgeCellIterator.h
+++ b/Testing/GenericBridge/vtkBridgeCellIterator.h
@@ -45,23 +45,23 @@ class VTKTESTINGGENERICBRIDGE_EXPORT vtkBridgeCellIterator : public vtkGenericCe
public:
static vtkBridgeCellIterator *New();
vtkTypeMacro(vtkBridgeCellIterator,vtkGenericCellIterator);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Move iterator to first position if any (loop initialization).
*/
- void Begin() VTK_OVERRIDE;
+ void Begin() override;
/**
* Is there no cell at iterator position? (exit condition).
*/
- int IsAtEnd() VTK_OVERRIDE;
+ int IsAtEnd() override;
/**
* Create an empty cell.
* \post result_exists: result!=0
*/
- vtkGenericAdaptorCell *NewCell() VTK_OVERRIDE;
+ vtkGenericAdaptorCell *NewCell() override;
/**
* Cell at current position
@@ -69,7 +69,7 @@ public:
* \pre c_exists: c!=0
* THREAD SAFE
*/
- void GetCell(vtkGenericAdaptorCell *c) VTK_OVERRIDE;
+ void GetCell(vtkGenericAdaptorCell *c) override;
/**
* Cell at current position.
@@ -77,13 +77,13 @@ public:
* \pre not_at_end: !IsAtEnd()
* \post result_exits: result!=0
*/
- vtkGenericAdaptorCell *GetCell() VTK_OVERRIDE;
+ vtkGenericAdaptorCell *GetCell() override;
/**
* Move iterator to next position. (loop progression).
* \pre not_at_end: !IsAtEnd()
*/
- void Next() VTK_OVERRIDE;
+ void Next() override;
/**
* Used internally by vtkBridgeDataSet.
@@ -154,7 +154,7 @@ public:
protected:
vtkBridgeCellIterator();
- ~vtkBridgeCellIterator() VTK_OVERRIDE;
+ ~vtkBridgeCellIterator() override;
vtkBridgeCellIteratorStrategy *CurrentIterator;
vtkBridgeCellIteratorOnDataSet *IteratorOnDataSet;
diff --git a/Testing/GenericBridge/vtkBridgeCellIteratorOnCellBoundaries.h b/Testing/GenericBridge/vtkBridgeCellIteratorOnCellBoundaries.h
index 03d010d5609d41b4f22a05ed4f43e6bf37d0ef2b..a5d86e776c7542aa2a10db0eb45d3302c776812f 100644
--- a/Testing/GenericBridge/vtkBridgeCellIteratorOnCellBoundaries.h
+++ b/Testing/GenericBridge/vtkBridgeCellIteratorOnCellBoundaries.h
@@ -37,17 +37,17 @@ public:
static vtkBridgeCellIteratorOnCellBoundaries *New();
vtkTypeMacro(vtkBridgeCellIteratorOnCellBoundaries,
vtkBridgeCellIteratorStrategy);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Move iterator to first position if any (loop initialization).
*/
- void Begin() VTK_OVERRIDE;
+ void Begin() override;
/**
* Is there no cell at iterator position? (exit condition).
*/
- int IsAtEnd() VTK_OVERRIDE;
+ int IsAtEnd() override;
/**
* Cell at current position
@@ -55,7 +55,7 @@ public:
* \pre c_exists: c!=0
* THREAD SAFE
*/
- void GetCell(vtkGenericAdaptorCell *c) VTK_OVERRIDE;
+ void GetCell(vtkGenericAdaptorCell *c) override;
/**
* Cell at current position.
@@ -63,13 +63,13 @@ public:
* \pre not_at_end: !IsAtEnd()
* \post result_exits: result!=0
*/
- vtkGenericAdaptorCell *GetCell() VTK_OVERRIDE;
+ vtkGenericAdaptorCell *GetCell() override;
/**
* Move iterator to next position. (loop progression).
* \pre not_at_end: !IsAtEnd()
*/
- void Next() VTK_OVERRIDE;
+ void Next() override;
/**
* Used internally by vtkBridgeCell.
@@ -82,7 +82,7 @@ public:
protected:
vtkBridgeCellIteratorOnCellBoundaries();
- ~vtkBridgeCellIteratorOnCellBoundaries() VTK_OVERRIDE;
+ ~vtkBridgeCellIteratorOnCellBoundaries() override;
int Dim; // Dimension of cells over which to iterate (-1 to 3)
diff --git a/Testing/GenericBridge/vtkBridgeCellIteratorOnCellList.h b/Testing/GenericBridge/vtkBridgeCellIteratorOnCellList.h
index 2c985ea80935fa04e47112f75e2793cdeff5d97f..b1ee6b80ed6c37370500950a0f670ec56fdc35dd 100644
--- a/Testing/GenericBridge/vtkBridgeCellIteratorOnCellList.h
+++ b/Testing/GenericBridge/vtkBridgeCellIteratorOnCellList.h
@@ -36,17 +36,17 @@ public:
static vtkBridgeCellIteratorOnCellList *New();
vtkTypeMacro(vtkBridgeCellIteratorOnCellList,
vtkBridgeCellIteratorStrategy);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Move iterator to first position if any (loop initialization).
*/
- void Begin() VTK_OVERRIDE;
+ void Begin() override;
/**
* Is there no cell at iterator position? (exit condition).
*/
- int IsAtEnd() VTK_OVERRIDE;
+ int IsAtEnd() override;
/**
* Cell at current position
@@ -54,7 +54,7 @@ public:
* \pre c_exists: c!=0
* THREAD SAFE
*/
- void GetCell(vtkGenericAdaptorCell *c) VTK_OVERRIDE;
+ void GetCell(vtkGenericAdaptorCell *c) override;
/**
* Cell at current position.
@@ -62,13 +62,13 @@ public:
* \pre not_at_end: !IsAtEnd()
* \post result_exits: result!=0
*/
- vtkGenericAdaptorCell *GetCell() VTK_OVERRIDE;
+ vtkGenericAdaptorCell *GetCell() override;
/**
* Move iterator to next position. (loop progression).
* \pre not_at_end: !IsAtEnd()
*/
- void Next() VTK_OVERRIDE;
+ void Next() override;
/**
* Used internally by vtkBridgeCell.
@@ -81,7 +81,7 @@ public:
protected:
vtkBridgeCellIteratorOnCellList();
- ~vtkBridgeCellIteratorOnCellList() VTK_OVERRIDE;
+ ~vtkBridgeCellIteratorOnCellList() override;
vtkIdList *Cells; // cells traversed by the iterator.
vtkBridgeDataSet *DataSet;
diff --git a/Testing/GenericBridge/vtkBridgeCellIteratorOnDataSet.h b/Testing/GenericBridge/vtkBridgeCellIteratorOnDataSet.h
index bca10a41efab569b1356d52b48c77a9906a3931b..08f3d60b1db61215852735954300eb3df607cb7c 100644
--- a/Testing/GenericBridge/vtkBridgeCellIteratorOnDataSet.h
+++ b/Testing/GenericBridge/vtkBridgeCellIteratorOnDataSet.h
@@ -35,17 +35,17 @@ public:
static vtkBridgeCellIteratorOnDataSet *New();
vtkTypeMacro(vtkBridgeCellIteratorOnDataSet,
vtkBridgeCellIteratorStrategy);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Move iterator to first position if any (loop initialization).
*/
- void Begin() VTK_OVERRIDE;
+ void Begin() override;
/**
* Is there no cell at iterator position? (exit condition).
*/
- int IsAtEnd() VTK_OVERRIDE;
+ int IsAtEnd() override;
/**
* Cell at current position
@@ -53,7 +53,7 @@ public:
* \pre c_exists: c!=0
* THREAD SAFE
*/
- void GetCell(vtkGenericAdaptorCell *c) VTK_OVERRIDE;
+ void GetCell(vtkGenericAdaptorCell *c) override;
/**
* Cell at current position.
@@ -61,13 +61,13 @@ public:
* \pre not_at_end: !IsAtEnd()
* \post result_exits: result!=0
*/
- vtkGenericAdaptorCell *GetCell() VTK_OVERRIDE;
+ vtkGenericAdaptorCell *GetCell() override;
/**
* Move iterator to next position. (loop progression).
* \pre not_at_end: !IsAtEnd()
*/
- void Next() VTK_OVERRIDE;
+ void Next() override;
/**
* Used internally by vtkBridgeDataSet.
@@ -80,7 +80,7 @@ public:
protected:
vtkBridgeCellIteratorOnDataSet();
- ~vtkBridgeCellIteratorOnDataSet() VTK_OVERRIDE;
+ ~vtkBridgeCellIteratorOnDataSet() override;
int Dim; // Dimension of cells over which to iterate (-1 to 3)
diff --git a/Testing/GenericBridge/vtkBridgeCellIteratorOne.h b/Testing/GenericBridge/vtkBridgeCellIteratorOne.h
index 2e0f03a31563674676a002a844caacaf6602402b..032af006d35341cdd6a4c602a1fd24700244c042 100644
--- a/Testing/GenericBridge/vtkBridgeCellIteratorOne.h
+++ b/Testing/GenericBridge/vtkBridgeCellIteratorOne.h
@@ -37,17 +37,17 @@ public:
static vtkBridgeCellIteratorOne *New();
vtkTypeMacro(vtkBridgeCellIteratorOne,
vtkBridgeCellIteratorStrategy);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Move iterator to first position if any (loop initialization).
*/
- void Begin() VTK_OVERRIDE;
+ void Begin() override;
/**
* Is there no cell at iterator position? (exit condition).
*/
- int IsAtEnd() VTK_OVERRIDE;
+ int IsAtEnd() override;
/**
* Cell at current position
@@ -55,7 +55,7 @@ public:
* \pre c_exists: c!=0
* THREAD SAFE
*/
- void GetCell(vtkGenericAdaptorCell *c) VTK_OVERRIDE;
+ void GetCell(vtkGenericAdaptorCell *c) override;
/**
* Cell at current position.
@@ -63,13 +63,13 @@ public:
* \pre not_at_end: !IsAtEnd()
* \post result_exits: result!=0
*/
- vtkGenericAdaptorCell *GetCell() VTK_OVERRIDE;
+ vtkGenericAdaptorCell *GetCell() override;
/**
* Move iterator to next position. (loop progression).
* \pre not_at_end: !IsAtEnd()
*/
- void Next() VTK_OVERRIDE;
+ void Next() override;
/**
* Used internally by vtkBridgeDataSet.
@@ -103,7 +103,7 @@ public:
protected:
vtkBridgeCellIteratorOne();
- ~vtkBridgeCellIteratorOne() VTK_OVERRIDE;
+ ~vtkBridgeCellIteratorOne() override;
int cIsAtEnd;
vtkBridgeDataSet *DataSet; // the structure on which the objet iterates.
diff --git a/Testing/GenericBridge/vtkBridgeCellIteratorStrategy.h b/Testing/GenericBridge/vtkBridgeCellIteratorStrategy.h
index 5ce3aef5e10d147b983530185e14216f4b5b82b3..360b9a470637339d8a591ff91d59e788d45cd61d 100644
--- a/Testing/GenericBridge/vtkBridgeCellIteratorStrategy.h
+++ b/Testing/GenericBridge/vtkBridgeCellIteratorStrategy.h
@@ -40,17 +40,17 @@ class VTKTESTINGGENERICBRIDGE_EXPORT vtkBridgeCellIteratorStrategy : public vtkG
{
public:
vtkTypeMacro(vtkBridgeCellIteratorStrategy,vtkGenericCellIterator);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Create an empty cell. NOT USED
* \post result_exists: result!=0
*/
- vtkGenericAdaptorCell *NewCell() VTK_OVERRIDE;
+ vtkGenericAdaptorCell *NewCell() override;
protected:
vtkBridgeCellIteratorStrategy() {}
- ~vtkBridgeCellIteratorStrategy() VTK_OVERRIDE {}
+ ~vtkBridgeCellIteratorStrategy() override {}
private:
vtkBridgeCellIteratorStrategy(const vtkBridgeCellIteratorStrategy&) VTK_DELETE_FUNCTION;
diff --git a/Testing/GenericBridge/vtkBridgeDataSet.h b/Testing/GenericBridge/vtkBridgeDataSet.h
index 34a7fc0ed1f0b383beb12ad345aba4bb3f3c3344..a96cbb2b81d6fdf2c68a265aa0e589e7716e962e 100644
--- a/Testing/GenericBridge/vtkBridgeDataSet.h
+++ b/Testing/GenericBridge/vtkBridgeDataSet.h
@@ -33,7 +33,7 @@ class VTKTESTINGGENERICBRIDGE_EXPORT vtkBridgeDataSet : public vtkGenericDataSet
public:
static vtkBridgeDataSet *New();
vtkTypeMacro(vtkBridgeDataSet,vtkGenericDataSet);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Return the dataset that will be manipulated through the adaptor interface.
@@ -51,7 +51,7 @@ public:
* details.
* \post positive_result: result>=0
*/
- vtkIdType GetNumberOfPoints() VTK_OVERRIDE;
+ vtkIdType GetNumberOfPoints() override;
/**
* Number of cells that explicitly define the dataset. See NewCellIterator
@@ -59,7 +59,7 @@ public:
* \pre valid_dim_range: (dim>=-1) && (dim<=3)
* \post positive_result: result>=0
*/
- vtkIdType GetNumberOfCells(int dim=-1) VTK_OVERRIDE;
+ vtkIdType GetNumberOfCells(int dim=-1) override;
/**
* Return -1 if the dataset is explicitly defined by cells of several
@@ -68,7 +68,7 @@ public:
* dimension, return this dimension.
* \post valid_range: (result>=-1) && (result<=3)
*/
- int GetCellDimension() VTK_OVERRIDE;
+ int GetCellDimension() override;
/**
* Get a list of types of cells in a dataset. The list consists of an array
@@ -80,7 +80,7 @@ public:
* THE DATASET IS NOT MODIFIED
* \pre types_exist: types!=0
*/
- void GetCellTypes(vtkCellTypes *types) VTK_OVERRIDE;
+ void GetCellTypes(vtkCellTypes *types) override;
/**
* Cells of dimension `dim' (or all dimensions if -1) that explicitly define
@@ -91,7 +91,7 @@ public:
* \pre valid_dim_range: (dim>=-1) && (dim<=3)
* \post result_exists: result!=0
*/
- vtkGenericCellIterator *NewCellIterator(int dim=-1) VTK_OVERRIDE;
+ vtkGenericCellIterator *NewCellIterator(int dim=-1) override;
/**
* Boundaries of dimension `dim' (or all dimensions if -1) of the dataset.
@@ -102,19 +102,19 @@ public:
* \post result_exists: result!=0
*/
vtkGenericCellIterator *NewBoundaryIterator(int dim=-1,
- int exteriorOnly=0) VTK_OVERRIDE;
+ int exteriorOnly=0) override;
/**
* Points composing the dataset; they can be on a vertex or isolated.
* \post result_exists: result!=0
*/
- vtkGenericPointIterator *NewPointIterator() VTK_OVERRIDE;
+ vtkGenericPointIterator *NewPointIterator() override;
/**
* Estimated size needed after tessellation (or special operation)
*/
- vtkIdType GetEstimatedSize() VTK_OVERRIDE;
+ vtkIdType GetEstimatedSize() override;
/**
* Locate closest cell to position `x' (global coordinates) with respect to
@@ -132,7 +132,7 @@ public:
vtkGenericCellIterator* &cell,
double tol2,
int &subId,
- double pcoords[3]) VTK_OVERRIDE;
+ double pcoords[3]) override;
/**
* Locate closest point `p' to position `x' (global coordinates)
@@ -140,22 +140,22 @@ public:
* \pre p_exists: p!=0
*/
void FindPoint(double x[3],
- vtkGenericPointIterator *p) VTK_OVERRIDE;
+ vtkGenericPointIterator *p) override;
/**
* Datasets are composite objects and need to check each part for MTime.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
/**
* Compute the geometry bounding box.
*/
- void ComputeBounds() VTK_OVERRIDE;
+ void ComputeBounds() override;
protected:
// Constructor with default bounds (0,1, 0,1, 0,1).
vtkBridgeDataSet();
- ~vtkBridgeDataSet() VTK_OVERRIDE;
+ ~vtkBridgeDataSet() override;
friend class vtkBridgeCell;
friend class vtkBridgeCellIterator;
diff --git a/Testing/GenericBridge/vtkBridgePointIterator.h b/Testing/GenericBridge/vtkBridgePointIterator.h
index 75a3302a30a002e52a6cadfc89098425c1ccffbe..4a370b68facef7301160da922ebc273104fa2e23 100644
--- a/Testing/GenericBridge/vtkBridgePointIterator.h
+++ b/Testing/GenericBridge/vtkBridgePointIterator.h
@@ -40,43 +40,43 @@ class VTKTESTINGGENERICBRIDGE_EXPORT vtkBridgePointIterator : public vtkGenericP
public:
static vtkBridgePointIterator *New();
vtkTypeMacro(vtkBridgePointIterator,vtkGenericPointIterator);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Move iterator to first position if any (loop initialization).
*/
- void Begin() VTK_OVERRIDE;
+ void Begin() override;
/**
* Is there no point at iterator position? (exit condition).
*/
- int IsAtEnd() VTK_OVERRIDE;
+ int IsAtEnd() override;
/**
* Move iterator to next position. (loop progression).
* \pre not_off: !IsAtEnd()
*/
- void Next() VTK_OVERRIDE;
+ void Next() override;
/**
* Point at iterator position.
* \pre not_off: !IsAtEnd()
* \post result_exists: result!=0
*/
- double *GetPosition() VTK_OVERRIDE;
+ double *GetPosition() override;
/**
* Point at iterator position.
* \pre not_off: !IsAtEnd()
* \pre x_exists: x!=0
*/
- void GetPosition(double x[3]) VTK_OVERRIDE;
+ void GetPosition(double x[3]) override;
/**
* Unique identifier for the point, could be non-contiguous
* \pre not_off: !IsAtEnd()
*/
- vtkIdType GetId() VTK_OVERRIDE;
+ vtkIdType GetId() override;
/**
* Used internally by vtkBridgeDataSet.
@@ -109,7 +109,7 @@ protected:
/**
* Destructor.
*/
- ~vtkBridgePointIterator() VTK_OVERRIDE;
+ ~vtkBridgePointIterator() override;
vtkGenericPointIterator *CurrentIterator;
vtkBridgePointIteratorOnDataSet *IteratorOnDataSet;
diff --git a/Testing/GenericBridge/vtkBridgePointIteratorOnCell.h b/Testing/GenericBridge/vtkBridgePointIteratorOnCell.h
index af52a3a6c72f9308c48588bd08127cc73579aad2..c1577fd119b46fc39f589a92b5b6876f5f3b683f 100644
--- a/Testing/GenericBridge/vtkBridgePointIteratorOnCell.h
+++ b/Testing/GenericBridge/vtkBridgePointIteratorOnCell.h
@@ -36,43 +36,43 @@ class VTKTESTINGGENERICBRIDGE_EXPORT vtkBridgePointIteratorOnCell : public vtkGe
public:
static vtkBridgePointIteratorOnCell *New();
vtkTypeMacro(vtkBridgePointIteratorOnCell,vtkGenericPointIterator);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Move iterator to first position if any (loop initialization).
*/
- void Begin() VTK_OVERRIDE;
+ void Begin() override;
/**
* Is there no point at iterator position? (exit condition).
*/
- int IsAtEnd() VTK_OVERRIDE;
+ int IsAtEnd() override;
/**
* Move iterator to next position. (loop progression).
* \pre not_off: !IsAtEnd()
*/
- void Next() VTK_OVERRIDE;
+ void Next() override;
/**
* Point at iterator position.
* \pre not_off: !IsAtEnd()
* \post result_exists: result!=0
*/
- double *GetPosition() VTK_OVERRIDE;
+ double *GetPosition() override;
/**
* Point at iterator position.
* \pre not_off: !IsAtEnd()
* \pre x_exists: x!=0
*/
- void GetPosition(double x[3]) VTK_OVERRIDE;
+ void GetPosition(double x[3]) override;
/**
* Unique identifier for the point, could be non-contiguous
* \pre not_off: !IsAtEnd()
*/
- vtkIdType GetId() VTK_OVERRIDE;
+ vtkIdType GetId() override;
/**
* The iterator will iterate over the point of a cell
@@ -89,7 +89,7 @@ protected:
/**
* Destructor.
*/
- ~vtkBridgePointIteratorOnCell() VTK_OVERRIDE;
+ ~vtkBridgePointIteratorOnCell() override;
vtkBridgeDataSet *DataSet; // the structure on which the objet iterates.
vtkIdType Cursor; // current position
diff --git a/Testing/GenericBridge/vtkBridgePointIteratorOnDataSet.h b/Testing/GenericBridge/vtkBridgePointIteratorOnDataSet.h
index 1d6ebb3af4fff40dd0a04b14ee9745b636d5eb8f..edcc2f3c8d36d2d27901de48558bb528e2d61f0c 100644
--- a/Testing/GenericBridge/vtkBridgePointIteratorOnDataSet.h
+++ b/Testing/GenericBridge/vtkBridgePointIteratorOnDataSet.h
@@ -35,43 +35,43 @@ class VTKTESTINGGENERICBRIDGE_EXPORT vtkBridgePointIteratorOnDataSet : public vt
public:
static vtkBridgePointIteratorOnDataSet *New();
vtkTypeMacro(vtkBridgePointIteratorOnDataSet,vtkGenericPointIterator);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Move iterator to first position if any (loop initialization).
*/
- void Begin() VTK_OVERRIDE;
+ void Begin() override;
/**
* Is there no point at iterator position? (exit condition).
*/
- int IsAtEnd() VTK_OVERRIDE;
+ int IsAtEnd() override;
/**
* Move iterator to next position. (loop progression).
* \pre not_off: !IsAtEnd()
*/
- void Next() VTK_OVERRIDE;
+ void Next() override;
/**
* Point at iterator position.
* \pre not_off: !IsAtEnd()
* \post result_exists: result!=0
*/
- double *GetPosition() VTK_OVERRIDE;
+ double *GetPosition() override;
/**
* Point at iterator position.
* \pre not_off: !IsAtEnd()
* \pre x_exists: x!=0
*/
- void GetPosition(double x[3]) VTK_OVERRIDE;
+ void GetPosition(double x[3]) override;
/**
* Unique identifier for the point, could be non-contiguous
* \pre not_off: !IsAtEnd()
*/
- vtkIdType GetId() VTK_OVERRIDE;
+ vtkIdType GetId() override;
/**
* Used internally by vtkBridgeDataSet.
@@ -89,7 +89,7 @@ protected:
/**
* Destructor.
*/
- ~vtkBridgePointIteratorOnDataSet() VTK_OVERRIDE;
+ ~vtkBridgePointIteratorOnDataSet() override;
vtkBridgeDataSet *DataSet; // the structure on which the objet iterates.
vtkIdType Id; // the id at current position.
diff --git a/Testing/GenericBridge/vtkBridgePointIteratorOne.h b/Testing/GenericBridge/vtkBridgePointIteratorOne.h
index d4e78e4ba33121e1c9ac4f11215ceb47d9708077..69dea582a881adfa4e6d90baec18964683036ae5 100644
--- a/Testing/GenericBridge/vtkBridgePointIteratorOne.h
+++ b/Testing/GenericBridge/vtkBridgePointIteratorOne.h
@@ -32,43 +32,43 @@ class VTKTESTINGGENERICBRIDGE_EXPORT vtkBridgePointIteratorOne : public vtkGener
public:
static vtkBridgePointIteratorOne *New();
vtkTypeMacro(vtkBridgePointIteratorOne,vtkGenericPointIterator);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Move iterator to first position if any (loop initialization).
*/
- void Begin() VTK_OVERRIDE;
+ void Begin() override;
/**
* Is there no point at iterator position? (exit condition).
*/
- int IsAtEnd() VTK_OVERRIDE;
+ int IsAtEnd() override;
/**
* Move iterator to next position. (loop progression).
* \pre not_off: !IsAtEnd()
*/
- void Next() VTK_OVERRIDE;
+ void Next() override;
/**
* Point at iterator position.
* \pre not_off: !IsAtEnd()
* \post result_exists: result!=0
*/
- double *GetPosition() VTK_OVERRIDE;
+ double *GetPosition() override;
/**
* Point at iterator position.
* \pre not_off: !IsAtEnd()
* \pre x_exists: x!=0
*/
- void GetPosition(double x[3]) VTK_OVERRIDE;
+ void GetPosition(double x[3]) override;
/**
* Unique identifier for the point, could be non-contiguous
* \pre not_off: !IsAtEnd()
*/
- vtkIdType GetId() VTK_OVERRIDE;
+ vtkIdType GetId() override;
/**
* Used internally by vtkBridgeDataSet.
@@ -88,7 +88,7 @@ protected:
/**
* Destructor.
*/
- ~vtkBridgePointIteratorOne() VTK_OVERRIDE;
+ ~vtkBridgePointIteratorOne() override;
vtkBridgeDataSet *DataSet; // the structure on which the objet iterates.
vtkIdType Id; // the id at current position.
diff --git a/Testing/Rendering/vtkTesting.h b/Testing/Rendering/vtkTesting.h
index 024b919e5a30bda73b3fdb5c7a634353bf6550ce..60b44dbb5463bf00601768d6ef2bb05f0810c22b 100644
--- a/Testing/Rendering/vtkTesting.h
+++ b/Testing/Rendering/vtkTesting.h
@@ -79,7 +79,7 @@ class VTKTESTINGRENDERING_EXPORT vtkTesting : public vtkObject
public:
static vtkTesting *New();
vtkTypeMacro(vtkTesting,vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
enum ReturnValue {
FAILED = 0,
@@ -312,7 +312,7 @@ public:
protected:
vtkTesting();
- ~vtkTesting() VTK_OVERRIDE;
+ ~vtkTesting() override;
static char* IncrementFileName(const char* fname, int count);
static int LookForFile(const char* newFileName);
diff --git a/Testing/Rendering/vtkTestingInteractor.h b/Testing/Rendering/vtkTestingInteractor.h
index 8c369e30480cdc58383e434571600c4ac7342703..3141018614e88b7e8543fd330e2d13f6b77269cf 100644
--- a/Testing/Rendering/vtkTestingInteractor.h
+++ b/Testing/Rendering/vtkTestingInteractor.h
@@ -46,10 +46,10 @@ public:
* Type and printing information.
*/
vtkTypeMacro(vtkTestingInteractor,vtkRenderWindowInteractor);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@}
- void Start() VTK_OVERRIDE;
+ void Start() override;
static int TestReturnStatus; // Return status of the test
static double ErrorThreshold; // Error Threshold
diff --git a/Testing/Rendering/vtkTestingObjectFactory.h b/Testing/Rendering/vtkTestingObjectFactory.h
index d43c91515b7138352988350c570ebeec9258f2f3..857ec9e12f62073e51ef70558b5fe5401b64427a 100644
--- a/Testing/Rendering/vtkTestingObjectFactory.h
+++ b/Testing/Rendering/vtkTestingObjectFactory.h
@@ -55,9 +55,9 @@ class VTKTESTINGRENDERING_EXPORT vtkTestingObjectFactory : public vtkObjectFacto
public:
static vtkTestingObjectFactory* New();
vtkTypeMacro(vtkTestingObjectFactory,vtkObjectFactory);
- const char* GetVTKSourceVersion() VTK_OVERRIDE;
- const char* GetDescription() VTK_OVERRIDE { return "Factory for overrides during testing"; }
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ const char* GetVTKSourceVersion() override;
+ const char* GetDescription() override { return "Factory for overrides during testing"; }
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
/**
diff --git a/Utilities/Maintenance/AddOverrides.py b/Utilities/Maintenance/AddOverrides.py
index 74bdc7a6c16c78e5cb8a6c07c67c8490e18897e8..8596eb11f763e638ee44bd20c3d03aa5ff516efe 100644
--- a/Utilities/Maintenance/AddOverrides.py
+++ b/Utilities/Maintenance/AddOverrides.py
@@ -1,11 +1,11 @@
-# This Python script can be used to add VTK_OVERRIDE statements where they are
+# This Python script can be used to add override statements where they are
# reported to be needed according to warnings produced by clang-700.1.76 on macOS
# 10.11.6 with the -Winconsistent-missing-override option enabled. To run the
# script, invoke
# > python AddOverrides.py <overrides.txt>
-# Each line of the overrides.txt file has the form
+# Each line of the overrides.txt file has the form
# <source file>:<line number>:<position>: warning: 'RequestDataDescription' \
# overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
@@ -43,7 +43,7 @@ for k, v in lines_map.items():
sorted_line_numbers = sorted(v)
lines_map[k] = sorted_line_numbers
-# Now open each file in the dictionary, append VTK_OVERRIDE to the end of each
+# Now open each file in the dictionary, append override to the end of each
# line, and save out the modified file
for file_name, line_numbers in lines_map.items():
@@ -59,28 +59,28 @@ for file_name, line_numbers in lines_map.items():
in_multi_line = False
for line in lines:
- if line.find('VTK_OVERRIDE') >= 0:
+ if line.find('override') >= 0:
in_multi_line = False
else:
if in_multi_line or (counter in line_numbers and re.match('^vtk.*Macro', line.lstrip()) is None):
if line.endswith(');'):
- line = line[0:-1] + ' VTK_OVERRIDE;'
+ line = line[0:-1] + ' override;'
in_multi_line = False
#print(65, file_name, line, counter)
elif line.endswith('=0;'):
- line = line[0:-3] + ' VTK_OVERRIDE = 0;'
+ line = line[0:-3] + ' override = 0;'
in_multi_line = False
elif line.endswith(' = 0;'):
- line = line[0:-5] + ' VTK_OVERRIDE = 0;'
+ line = line[0:-5] + ' override = 0;'
in_multi_line = False
elif line.endswith(')'):
- line = line + ' VTK_OVERRIDE'
+ line = line + ' override'
in_multi_line = False
#print(75, file_name, line, counter)
elif line.find('{') >= 0:
idx = line.find('{')
- line = line[:idx].rstrip() + ' VTK_OVERRIDE ' + line[idx:].lstrip()
+ line = line[:idx].rstrip() + ' override ' + line[idx:].lstrip()
in_multi_line = False
print(65, file_name, line, counter)
elif line.endswith(',') or line.endswith('('):
diff --git a/Utilities/PythonInterpreter/vtkPythonInteractiveInterpreter.h b/Utilities/PythonInterpreter/vtkPythonInteractiveInterpreter.h
index a5ce9752af241b0857c8766cf75d9308ca4bf500..7609b86ce71710ee3db73841d0748799531352ef 100644
--- a/Utilities/PythonInterpreter/vtkPythonInteractiveInterpreter.h
+++ b/Utilities/PythonInterpreter/vtkPythonInteractiveInterpreter.h
@@ -46,7 +46,7 @@ class VTKPYTHONINTERPRETER_EXPORT vtkPythonInteractiveInterpreter : public vtkOb
public:
static vtkPythonInteractiveInterpreter* New();
vtkTypeMacro(vtkPythonInteractiveInterpreter, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Push a line of code. It should have have trailing newlines. It can have
@@ -87,7 +87,7 @@ public:
protected:
vtkPythonInteractiveInterpreter();
- ~vtkPythonInteractiveInterpreter() VTK_OVERRIDE;
+ ~vtkPythonInteractiveInterpreter() override;
void HandleEvents(vtkObject* caller, unsigned long eventid, void* calldata);
diff --git a/Utilities/PythonInterpreter/vtkPythonInterpreter.h b/Utilities/PythonInterpreter/vtkPythonInterpreter.h
index ef2ce00d0bc2178143abe1744cc709886eb00942..0baddcd7e8c1c85f6477a86e18530d174e581ee1 100644
--- a/Utilities/PythonInterpreter/vtkPythonInterpreter.h
+++ b/Utilities/PythonInterpreter/vtkPythonInterpreter.h
@@ -66,7 +66,7 @@ class VTKPYTHONINTERPRETER_EXPORT vtkPythonInterpreter : public vtkObject
public:
static vtkPythonInterpreter* New();
vtkTypeMacro(vtkPythonInterpreter, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Call this method to initialize Python. This has no effect if Python is
@@ -133,7 +133,7 @@ public:
protected:
vtkPythonInterpreter();
- ~vtkPythonInterpreter() VTK_OVERRIDE;
+ ~vtkPythonInterpreter() override;
friend struct vtkPythonStdStreamCaptureHelper;
diff --git a/Views/Context2D/vtkContextInteractorStyle.h b/Views/Context2D/vtkContextInteractorStyle.h
index 73f71ee280cbb803bf57d48e4a5c0d6141d6571a..66f41c7a794daaf8ac45fdb8a10feea82d366885 100644
--- a/Views/Context2D/vtkContextInteractorStyle.h
+++ b/Views/Context2D/vtkContextInteractorStyle.h
@@ -38,7 +38,7 @@ class VTKVIEWSCONTEXT2D_EXPORT vtkContextInteractorStyle : public vtkInteractorS
public:
static vtkContextInteractorStyle *New();
vtkTypeMacro(vtkContextInteractorStyle, vtkInteractorStyle);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Set the scene to forward user events to.
@@ -63,55 +63,55 @@ public:
* Called when the user moves the mouse
* Default behavior forwards the event to the observed scene.
*/
- void OnMouseMove() VTK_OVERRIDE;
+ void OnMouseMove() override;
/**
* Called when the user clicks the mouse left button.
* Default behavior forwards the event to the observed scene.
*/
- void OnLeftButtonDown() VTK_OVERRIDE;
+ void OnLeftButtonDown() override;
/**
* Called when the user releases the mouse left button.
* Default behavior forwards the event to the observed scene.
*/
- void OnLeftButtonUp() VTK_OVERRIDE;
+ void OnLeftButtonUp() override;
/**
* Called when the user clicks the mouse middle button.
* Default behavior forwards the event to the observed scene.
*/
- void OnMiddleButtonDown() VTK_OVERRIDE;
+ void OnMiddleButtonDown() override;
/**
* Called when the user releases the mouse middle button.
* Default behavior forwards the event to the observed scene.
*/
- void OnMiddleButtonUp() VTK_OVERRIDE;
+ void OnMiddleButtonUp() override;
/**
* Called when the user clicks the mouse right button.
* Default behavior forwards the event to the observed scene.
*/
- void OnRightButtonDown() VTK_OVERRIDE;
+ void OnRightButtonDown() override;
/**
* Called when the user releases the mouse right button.
* Default behavior forwards the event to the observed scene.
*/
- void OnRightButtonUp() VTK_OVERRIDE;
+ void OnRightButtonUp() override;
/**
* Called when the user moves the mouse wheel forward.
* Default behavior forwards the event to the observed scene.
*/
- void OnMouseWheelForward() VTK_OVERRIDE;
+ void OnMouseWheelForward() override;
/**
* Called when the user moves the mouse wheel backward.
* Default behavior forwards the event to the observed scene.
*/
- void OnMouseWheelBackward() VTK_OVERRIDE;
+ void OnMouseWheelBackward() override;
/**
* Place holder for future implementation.
@@ -122,21 +122,21 @@ public:
/**
* Handle key presses.
*/
- void OnChar() VTK_OVERRIDE;
+ void OnChar() override;
/**
* Called when the user presses a key.
*/
- void OnKeyPress() VTK_OVERRIDE;
+ void OnKeyPress() override;
/**
* Called when the user releases a key.
*/
- void OnKeyRelease() VTK_OVERRIDE;
+ void OnKeyRelease() override;
protected:
vtkContextInteractorStyle();
- ~vtkContextInteractorStyle() VTK_OVERRIDE;
+ ~vtkContextInteractorStyle() override;
static void ProcessSceneEvents(vtkObject* object, unsigned long event,
void* clientdata, void* calldata);
diff --git a/Views/Context2D/vtkContextView.h b/Views/Context2D/vtkContextView.h
index 0bd335540b145710539c707319cfa2fe23bbcf5d..33a6a826b2f5dde00ec8a70decf178acfebd9e94 100644
--- a/Views/Context2D/vtkContextView.h
+++ b/Views/Context2D/vtkContextView.h
@@ -38,7 +38,7 @@ class vtkContextScene;
class VTKVIEWSCONTEXT2D_EXPORT vtkContextView : public vtkRenderViewBase
{
public:
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
vtkTypeMacro(vtkContextView, vtkRenderViewBase);
static vtkContextView* New();
@@ -65,7 +65,7 @@ public:
protected:
vtkContextView();
- ~vtkContextView() VTK_OVERRIDE;
+ ~vtkContextView() override;
vtkSmartPointer<vtkContextScene> Scene;
vtkSmartPointer<vtkContext2D> Context;
diff --git a/Views/Core/vtkConvertSelectionDomain.h b/Views/Core/vtkConvertSelectionDomain.h
index 50664c88899d94dc3023a87b5e375a16d0bcf7d9..c662e99e89cea2338374921633ca9af83c4124b4 100644
--- a/Views/Core/vtkConvertSelectionDomain.h
+++ b/Views/Core/vtkConvertSelectionDomain.h
@@ -51,22 +51,22 @@ class VTKVIEWSCORE_EXPORT vtkConvertSelectionDomain : public vtkPassInputTypeAlg
public:
static vtkConvertSelectionDomain *New();
vtkTypeMacro(vtkConvertSelectionDomain, vtkPassInputTypeAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkConvertSelectionDomain();
- ~vtkConvertSelectionDomain() VTK_OVERRIDE;
+ ~vtkConvertSelectionDomain() override;
int RequestData(
vtkInformation *,
vtkInformationVector **,
- vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformationVector *) override;
int FillInputPortInformation(
- int port, vtkInformation* info) VTK_OVERRIDE;
+ int port, vtkInformation* info) override;
int FillOutputPortInformation(
- int port, vtkInformation* info) VTK_OVERRIDE;
+ int port, vtkInformation* info) override;
private:
vtkConvertSelectionDomain(const vtkConvertSelectionDomain&) VTK_DELETE_FUNCTION;
diff --git a/Views/Core/vtkDataRepresentation.cxx b/Views/Core/vtkDataRepresentation.cxx
index bc815459783ca1f3c70060402a528ad46d062016..ec00839fec017c17b2b3c8b50b688f7f825536b3 100644
--- a/Views/Core/vtkDataRepresentation.cxx
+++ b/Views/Core/vtkDataRepresentation.cxx
@@ -69,7 +69,7 @@ class vtkDataRepresentation::Command : public vtkCommand
public:
static Command* New() { return new Command(); }
void Execute(vtkObject *caller, unsigned long eventId,
- void *callData) VTK_OVERRIDE
+ void *callData) override
{
if (this->Target)
{
diff --git a/Views/Core/vtkDataRepresentation.h b/Views/Core/vtkDataRepresentation.h
index a2704e895e00fd527e8a64eb5f363e39070232b0..874b447a4ef258591bf751b57e5f00e638ad1250 100644
--- a/Views/Core/vtkDataRepresentation.h
+++ b/Views/Core/vtkDataRepresentation.h
@@ -68,7 +68,7 @@ class VTKVIEWSCORE_EXPORT vtkDataRepresentation : public vtkPassInputTypeAlgorit
public:
static vtkDataRepresentation *New();
vtkTypeMacro(vtkDataRepresentation, vtkPassInputTypeAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Convenience override method for obtaining the input connection
@@ -227,7 +227,7 @@ public:
protected:
vtkDataRepresentation();
- ~vtkDataRepresentation() VTK_OVERRIDE;
+ ~vtkDataRepresentation() override;
/**
* Subclasses should override this to connect inputs to the internal pipeline
@@ -242,7 +242,7 @@ protected:
int RequestData(
vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE
+ vtkInformationVector*) override
{ return 1; }
/**
diff --git a/Views/Core/vtkEmptyRepresentation.h b/Views/Core/vtkEmptyRepresentation.h
index 44aaaba00f8ddcb0559555956959751a48adc64c..fb5416745d0bf4cf521bfeac00b77d13aca568ab 100644
--- a/Views/Core/vtkEmptyRepresentation.h
+++ b/Views/Core/vtkEmptyRepresentation.h
@@ -37,22 +37,22 @@ class VTKVIEWSCORE_EXPORT vtkEmptyRepresentation : public vtkDataRepresentation
public:
static vtkEmptyRepresentation* New();
vtkTypeMacro(vtkEmptyRepresentation, vtkDataRepresentation);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Since this representation has no inputs, override superclass
* implementation with one that ignores "port" and "conn" and still allows it
* to have an annotation output.
*/
- vtkAlgorithmOutput* GetInternalAnnotationOutputPort() VTK_OVERRIDE
+ vtkAlgorithmOutput* GetInternalAnnotationOutputPort() override
{ return this->GetInternalAnnotationOutputPort(0); }
- vtkAlgorithmOutput* GetInternalAnnotationOutputPort(int port) VTK_OVERRIDE
+ vtkAlgorithmOutput* GetInternalAnnotationOutputPort(int port) override
{ return this->GetInternalAnnotationOutputPort(port, 0); }
- vtkAlgorithmOutput* GetInternalAnnotationOutputPort(int port, int conn) VTK_OVERRIDE;
+ vtkAlgorithmOutput* GetInternalAnnotationOutputPort(int port, int conn) override;
protected:
vtkEmptyRepresentation();
- ~vtkEmptyRepresentation() VTK_OVERRIDE;
+ ~vtkEmptyRepresentation() override;
private:
vtkEmptyRepresentation(const vtkEmptyRepresentation&) VTK_DELETE_FUNCTION;
diff --git a/Views/Core/vtkRenderViewBase.h b/Views/Core/vtkRenderViewBase.h
index 38d35d45134f8e59a2d9f698b9e1bc0fb46bb17e..36673514b409215df67b71a5177ccadef75c62ae 100644
--- a/Views/Core/vtkRenderViewBase.h
+++ b/Views/Core/vtkRenderViewBase.h
@@ -51,7 +51,7 @@ class VTKVIEWSCORE_EXPORT vtkRenderViewBase : public vtkView
public:
static vtkRenderViewBase* New();
vtkTypeMacro(vtkRenderViewBase, vtkView);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Gets the renderer for this view.
@@ -103,7 +103,7 @@ public:
protected:
vtkRenderViewBase();
- ~vtkRenderViewBase() VTK_OVERRIDE;
+ ~vtkRenderViewBase() override;
/**
* Called by the view when the renderer is about to render.
diff --git a/Views/Core/vtkView.cxx b/Views/Core/vtkView.cxx
index 4534aa61c83e3439bbe843b27270f81df32c6e0a..aeca78382913fb1bb7244f700d79fed901ead87a 100644
--- a/Views/Core/vtkView.cxx
+++ b/Views/Core/vtkView.cxx
@@ -43,7 +43,7 @@ class vtkView::Command : public vtkCommand
public:
static Command* New() { return new Command(); }
void Execute(vtkObject *caller, unsigned long eventId,
- void *callData) VTK_OVERRIDE
+ void *callData) override
{
if (this->Target)
{
diff --git a/Views/Core/vtkView.h b/Views/Core/vtkView.h
index 7fde84d3a8e90048cbf82147dc5f09d5ca7733b2..67de39d29eaebebfae838a1de0e31a46782178b5 100644
--- a/Views/Core/vtkView.h
+++ b/Views/Core/vtkView.h
@@ -56,7 +56,7 @@ class VTKVIEWSCORE_EXPORT vtkView : public vtkObject
public:
static vtkView *New();
vtkTypeMacro(vtkView, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Adds the representation to the view.
@@ -206,7 +206,7 @@ public:
protected:
vtkView();
- ~vtkView() VTK_OVERRIDE;
+ ~vtkView() override;
/**
* Called to process events.
diff --git a/Views/Core/vtkViewTheme.h b/Views/Core/vtkViewTheme.h
index 616856a202bfb7b18d05c19bb1e97f08b3cbc01f..eafa5e15e32cc38a64fd3f7b563b98b46f91f65c 100644
--- a/Views/Core/vtkViewTheme.h
+++ b/Views/Core/vtkViewTheme.h
@@ -44,7 +44,7 @@ class VTKVIEWSCORE_EXPORT vtkViewTheme : public vtkObject
public:
static vtkViewTheme* New();
vtkTypeMacro(vtkViewTheme, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -292,7 +292,7 @@ public:
protected:
vtkViewTheme();
- ~vtkViewTheme() VTK_OVERRIDE;
+ ~vtkViewTheme() override;
double PointSize;
double LineWidth;
diff --git a/Views/Geovis/vtkGeoView.h b/Views/Geovis/vtkGeoView.h
index a053c2fbed104454eddd06984c3b161ddf2ef88a..bc56b8e4f592c2f5958256be4c5ab005586862b3 100644
--- a/Views/Geovis/vtkGeoView.h
+++ b/Views/Geovis/vtkGeoView.h
@@ -61,7 +61,7 @@ class VTKVIEWSGEOVIS_EXPORT vtkGeoView : public vtkRenderView
public:
static vtkGeoView *New();
vtkTypeMacro(vtkGeoView, vtkRenderView);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Adds an image representation with a simple terrain model using
@@ -72,7 +72,7 @@ public:
/**
* Prepares the view for rendering.
*/
- void PrepareForRendering() VTK_OVERRIDE;
+ void PrepareForRendering() override;
/**
* Rebuild low-res earth source; call after (re)setting origin.
@@ -110,11 +110,11 @@ public:
/**
* Update and render the view.
*/
- void Render() VTK_OVERRIDE;
+ void Render() override;
protected:
vtkGeoView();
- ~vtkGeoView() VTK_OVERRIDE;
+ ~vtkGeoView() override;
vtkGlobeSource* LowResEarthSource;
vtkPolyDataMapper* LowResEarthMapper;
diff --git a/Views/Geovis/vtkGeoView2D.h b/Views/Geovis/vtkGeoView2D.h
index faba8af0e531a5f104e8e6c7a34d01d3f6649e4a..4b8c76b8caa75f3c008f182f4b793278f6435af6 100644
--- a/Views/Geovis/vtkGeoView2D.h
+++ b/Views/Geovis/vtkGeoView2D.h
@@ -55,10 +55,10 @@ class VTKVIEWSGEOVIS_EXPORT vtkGeoView2D : public vtkRenderView
public:
static vtkGeoView2D *New();
vtkTypeMacro(vtkGeoView2D,vtkRenderView);
- void PrintSelf( ostream& os, vtkIndent indent ) VTK_OVERRIDE;
+ void PrintSelf( ostream& os, vtkIndent indent ) override;
vtkGeoView2D();
- ~vtkGeoView2D() VTK_OVERRIDE;
+ ~vtkGeoView2D() override;
vtkGetObjectMacro(Surface, vtkGeoTerrain2D);
virtual void SetSurface(vtkGeoTerrain2D* surf);
@@ -66,23 +66,23 @@ public:
/**
* Returns the transform associated with the surface.
*/
- vtkAbstractTransform* GetTransform() VTK_OVERRIDE;
+ vtkAbstractTransform* GetTransform() override;
/**
* Apply the view theme to this view.
*/
- void ApplyViewTheme(vtkViewTheme* theme) VTK_OVERRIDE;
+ void ApplyViewTheme(vtkViewTheme* theme) override;
/**
* Update and render the view.
*/
- void Render() VTK_OVERRIDE;
+ void Render() override;
protected:
vtkGeoTerrain2D* Surface;
vtkAssembly* Assembly;
- void PrepareForRendering() VTK_OVERRIDE;
+ void PrepareForRendering() override;
private:
vtkGeoView2D(const vtkGeoView2D&) VTK_DELETE_FUNCTION;
diff --git a/Views/Infovis/Testing/Cxx/TestRenderView.cxx b/Views/Infovis/Testing/Cxx/TestRenderView.cxx
index 10b7bafec8af7251a4ebf53731b9255506e7a445..f6aa445827306838bef6eb5337f21486e6dec16c 100644
--- a/Views/Infovis/Testing/Cxx/TestRenderView.cxx
+++ b/Views/Infovis/Testing/Cxx/TestRenderView.cxx
@@ -51,7 +51,7 @@ public:
view->AddObserver(vtkCommand::SelectionChangedEvent, this);
}
- void Execute(vtkObject*, unsigned long, void*) VTK_OVERRIDE
+ void Execute(vtkObject*, unsigned long, void*) override
{
for (unsigned int i = 0; i < this->Views.size(); i++)
{
@@ -60,7 +60,7 @@ public:
}
private:
TestRenderViewUpdater() { }
- ~TestRenderViewUpdater() VTK_OVERRIDE { }
+ ~TestRenderViewUpdater() override { }
std::vector<vtkView*> Views;
};
diff --git a/Views/Infovis/vtkApplyColors.h b/Views/Infovis/vtkApplyColors.h
index 309711fcf939a2c0993b015d6a381050b3b7fdaf..9851f49b74a5548376b4e6d50ea860f978688dbb 100644
--- a/Views/Infovis/vtkApplyColors.h
+++ b/Views/Infovis/vtkApplyColors.h
@@ -88,7 +88,7 @@ class VTKVIEWSINFOVIS_EXPORT vtkApplyColors : public vtkPassInputTypeAlgorithm
public:
static vtkApplyColors *New();
vtkTypeMacro(vtkApplyColors, vtkPassInputTypeAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -252,22 +252,22 @@ public:
/**
* Retrieve the modified time for this filter.
*/
- vtkMTimeType GetMTime() VTK_OVERRIDE;
+ vtkMTimeType GetMTime() override;
protected:
vtkApplyColors();
- ~vtkApplyColors() VTK_OVERRIDE;
+ ~vtkApplyColors() override;
/**
* Convert the vtkGraph into vtkPolyData.
*/
int RequestData(
- vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
/**
* Set the input type of the algorithm to vtkGraph.
*/
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
void ProcessColorArray(
vtkUnsignedCharArray* colorArr,
diff --git a/Views/Infovis/vtkApplyIcons.h b/Views/Infovis/vtkApplyIcons.h
index 4a6ced840e2dd537532b0721826d6d07c6120c6d..24ea2c8b152f7790453d395d69d7055ad72ed2f6 100644
--- a/Views/Infovis/vtkApplyIcons.h
+++ b/Views/Infovis/vtkApplyIcons.h
@@ -72,7 +72,7 @@ class VTKVIEWSINFOVIS_EXPORT vtkApplyIcons : public vtkPassInputTypeAlgorithm
public:
static vtkApplyIcons *New();
vtkTypeMacro(vtkApplyIcons, vtkPassInputTypeAlgorithm);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -168,18 +168,18 @@ public:
protected:
vtkApplyIcons();
- ~vtkApplyIcons() VTK_OVERRIDE;
+ ~vtkApplyIcons() override;
/**
* Convert the vtkGraph into vtkPolyData.
*/
int RequestData(
- vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE;
+ vtkInformation *, vtkInformationVector **, vtkInformationVector *) override;
/**
* Set the input type of the algorithm to vtkGraph.
*/
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
int DefaultIcon;
int SelectedIcon;
diff --git a/Views/Infovis/vtkDendrogramItem.h b/Views/Infovis/vtkDendrogramItem.h
index ee42a42f800cd5abe800c186229748a8b8fb646a..096547bbcbc0189f1a1896b061177ece5a712e5f 100644
--- a/Views/Infovis/vtkDendrogramItem.h
+++ b/Views/Infovis/vtkDendrogramItem.h
@@ -56,7 +56,7 @@ class VTKVIEWSINFOVIS_EXPORT vtkDendrogramItem : public vtkContextItem
public:
static vtkDendrogramItem *New();
vtkTypeMacro(vtkDendrogramItem, vtkContextItem);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
/**
* Set the tree that this item draws. Note that this tree's vertex data
@@ -196,7 +196,7 @@ public:
/**
* Paints the input tree as a dendrogram.
*/
- bool Paint(vtkContext2D *painter) VTK_OVERRIDE;
+ bool Paint(vtkContext2D *painter) override;
//@{
/**
@@ -272,17 +272,17 @@ public:
/**
* Returns true if the transform is interactive, false otherwise.
*/
- bool Hit(const vtkContextMouseEvent &mouse) VTK_OVERRIDE;
+ bool Hit(const vtkContextMouseEvent &mouse) override;
/**
* Collapse or expand a subtree when the user double clicks on an
* internal node.
*/
- bool MouseDoubleClickEvent( const vtkContextMouseEvent &event) VTK_OVERRIDE;
+ bool MouseDoubleClickEvent( const vtkContextMouseEvent &event) override;
protected:
vtkDendrogramItem();
- ~vtkDendrogramItem() VTK_OVERRIDE;
+ ~vtkDendrogramItem() override;
vtkVector2f PositionVector;
float* Position;
diff --git a/Views/Infovis/vtkGraphItem.h b/Views/Infovis/vtkGraphItem.h
index 567c09959d75dd8ab6c137fde6383617ef0b9ac9..34274967a8f72c101f9f24d0dbcc077cb33a9bde 100644
--- a/Views/Infovis/vtkGraphItem.h
+++ b/Views/Infovis/vtkGraphItem.h
@@ -46,7 +46,7 @@ class VTKVIEWSINFOVIS_EXPORT vtkGraphItem : public vtkContextItem
public:
static vtkGraphItem *New();
vtkTypeMacro(vtkGraphItem, vtkContextItem);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
//@{
/**
@@ -76,13 +76,13 @@ public:
protected:
vtkGraphItem();
- ~vtkGraphItem() VTK_OVERRIDE;
+ ~vtkGraphItem() override;
/**
* Paints the graph. This method will call RebuildBuffers()
* if the graph is dirty, then call PaintBuffers().
*/
- bool Paint(vtkContext2D *painter) VTK_OVERRIDE;
+ bool Paint(vtkContext2D *painter) override;
/**
* Builds a cache of data from the graph by calling the virtual functions
@@ -197,18 +197,18 @@ protected:
/**
* Handle mouse events.
*/
- bool MouseMoveEvent(const vtkContextMouseEvent &event) VTK_OVERRIDE;
- bool MouseLeaveEvent(const vtkContextMouseEvent &event) VTK_OVERRIDE;
- bool MouseEnterEvent(const vtkContextMouseEvent &event) VTK_OVERRIDE;
- bool MouseButtonPressEvent(const vtkContextMouseEvent &event) VTK_OVERRIDE;
- bool MouseButtonReleaseEvent(const vtkContextMouseEvent &event) VTK_OVERRIDE;
- bool MouseWheelEvent(const vtkContextMouseEvent &event, int delta) VTK_OVERRIDE;
+ bool MouseMoveEvent(const vtkContextMouseEvent &event) override;
+ bool MouseLeaveEvent(const vtkContextMouseEvent &event) override;
+ bool MouseEnterEvent(const vtkContextMouseEvent &event) override;
+ bool MouseButtonPressEvent(const vtkContextMouseEvent &event) override;
+ bool MouseButtonReleaseEvent(const vtkContextMouseEvent &event) override;
+ bool MouseWheelEvent(const vtkContextMouseEvent &event, int delta) override;
//@}
/**
* Whether this graph item is hit.
*/
- bool Hit(const vtkContextMouseEvent &event) VTK_OVERRIDE;
+ bool Hit(const vtkContextMouseEvent &event) override;
/**
* Change the position of the tooltip based on the vertex hovered.
diff --git a/Views/Infovis/vtkGraphLayoutView.h b/Views/Infovis/vtkGraphLayoutView.h
index 2fd0ceccb684716e067e2b1371aa73f86040f61a..ffea8ebb844e327c11b45c16037db5d48e41c0c5 100644
--- a/Views/Infovis/vtkGraphLayoutView.h
+++ b/Views/Infovis/vtkGraphLayoutView.h
@@ -55,7 +55,7 @@ class VTKVIEWSINFOVIS_EXPORT vtkGraphLayoutView : public vtkRenderView
public:
static vtkGraphLayoutView *New();
vtkTypeMacro(vtkGraphLayoutView, vtkRenderView);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -396,17 +396,17 @@ public:
protected:
vtkGraphLayoutView();
- ~vtkGraphLayoutView() VTK_OVERRIDE;
+ ~vtkGraphLayoutView() override;
//@{
/**
* Overrides behavior in vtkView to create a vtkRenderedGraphRepresentation
* by default.
*/
- vtkDataRepresentation* CreateDefaultRepresentation(vtkAlgorithmOutput* conn) VTK_OVERRIDE;
+ vtkDataRepresentation* CreateDefaultRepresentation(vtkAlgorithmOutput* conn) override;
virtual vtkRenderedGraphRepresentation* GetGraphRepresentation();
// Called to process events. Overrides behavior in vtkRenderView.
- void ProcessEvents(vtkObject* caller, unsigned long eventId, void* callData) VTK_OVERRIDE;
+ void ProcessEvents(vtkObject* caller, unsigned long eventId, void* callData) override;
//@}
private:
diff --git a/Views/Infovis/vtkHeatmapItem.h b/Views/Infovis/vtkHeatmapItem.h
index 610de249d367b15e73d0541fd9f057a89cdfb004..cbe0415e93adc7bdfcae51b8d2a935a78afa5e48 100644
--- a/Views/Infovis/vtkHeatmapItem.h
+++ b/Views/Infovis/vtkHeatmapItem.h
@@ -51,7 +51,7 @@ class VTKVIEWSINFOVIS_EXPORT vtkHeatmapItem : public vtkContextItem
public:
static vtkHeatmapItem *New();
vtkTypeMacro(vtkHeatmapItem, vtkContextItem);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
/**
* Set the table that this item draws. The first column of the table
@@ -146,7 +146,7 @@ public:
/**
* Paints the table as a heatmap.
*/
- bool Paint(vtkContext2D *painter) VTK_OVERRIDE;
+ bool Paint(vtkContext2D *painter) override;
//@{
/**
@@ -171,21 +171,21 @@ public:
/**
* Returns true if the transform is interactive, false otherwise.
*/
- bool Hit(const vtkContextMouseEvent &mouse) VTK_OVERRIDE;
+ bool Hit(const vtkContextMouseEvent &mouse) override;
/**
* Display a tooltip when the user mouses over a cell in the heatmap.
*/
- bool MouseMoveEvent(const vtkContextMouseEvent &event) VTK_OVERRIDE;
+ bool MouseMoveEvent(const vtkContextMouseEvent &event) override;
/**
* Display a legend for a column of data.
*/
- bool MouseDoubleClickEvent(const vtkContextMouseEvent &event) VTK_OVERRIDE;
+ bool MouseDoubleClickEvent(const vtkContextMouseEvent &event) override;
protected:
vtkHeatmapItem();
- ~vtkHeatmapItem() VTK_OVERRIDE;
+ ~vtkHeatmapItem() override;
vtkVector2f PositionVector;
float* Position;
diff --git a/Views/Infovis/vtkHierarchicalGraphPipeline.h b/Views/Infovis/vtkHierarchicalGraphPipeline.h
index 2c91c39e53d50f915e6abbe1b6f58bfcc63bd945..3accb945eb95fe61cb9201e80f4cb638a40cec4a 100644
--- a/Views/Infovis/vtkHierarchicalGraphPipeline.h
+++ b/Views/Infovis/vtkHierarchicalGraphPipeline.h
@@ -55,7 +55,7 @@ class VTKVIEWSINFOVIS_EXPORT vtkHierarchicalGraphPipeline : public vtkObject
public:
static vtkHierarchicalGraphPipeline* New();
vtkTypeMacro(vtkHierarchicalGraphPipeline, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -178,7 +178,7 @@ public:
protected:
vtkHierarchicalGraphPipeline();
- ~vtkHierarchicalGraphPipeline() VTK_OVERRIDE;
+ ~vtkHierarchicalGraphPipeline() override;
vtkApplyColors* ApplyColors;
vtkGraphHierarchicalBundleEdges* Bundle;
diff --git a/Views/Infovis/vtkHierarchicalGraphView.h b/Views/Infovis/vtkHierarchicalGraphView.h
index bf37f4f17a26ac2365a3416d31c3bd3ab73eb48d..17f22460d5ea4b23a006ef95c05142a4e4ebeffe 100644
--- a/Views/Infovis/vtkHierarchicalGraphView.h
+++ b/Views/Infovis/vtkHierarchicalGraphView.h
@@ -51,7 +51,7 @@ class VTKVIEWSINFOVIS_EXPORT vtkHierarchicalGraphView : public vtkGraphLayoutVie
public:
static vtkHierarchicalGraphView *New();
vtkTypeMacro(vtkHierarchicalGraphView, vtkGraphLayoutView);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -129,15 +129,15 @@ public:
protected:
vtkHierarchicalGraphView();
- ~vtkHierarchicalGraphView() VTK_OVERRIDE;
+ ~vtkHierarchicalGraphView() override;
//@{
/**
* Overrides behavior in vtkGraphLayoutView to create a
* vtkRenderedHierarchyRepresentation by default.
*/
- vtkDataRepresentation* CreateDefaultRepresentation(vtkAlgorithmOutput* conn) VTK_OVERRIDE;
- vtkRenderedGraphRepresentation* GetGraphRepresentation() VTK_OVERRIDE;
+ vtkDataRepresentation* CreateDefaultRepresentation(vtkAlgorithmOutput* conn) override;
+ vtkRenderedGraphRepresentation* GetGraphRepresentation() override;
virtual vtkRenderedHierarchyRepresentation* GetHierarchyRepresentation();
//@}
diff --git a/Views/Infovis/vtkIcicleView.h b/Views/Infovis/vtkIcicleView.h
index e819620c0a21a97dede46bfa58c71028ad95e20a..4f0213f1773c4a1ec338ba90cd25817bc611b344 100644
--- a/Views/Infovis/vtkIcicleView.h
+++ b/Views/Infovis/vtkIcicleView.h
@@ -39,7 +39,7 @@ class VTKVIEWSINFOVIS_EXPORT vtkIcicleView : public vtkTreeAreaView
public:
static vtkIcicleView *New();
vtkTypeMacro(vtkIcicleView, vtkTreeAreaView);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -77,7 +77,7 @@ public:
protected:
vtkIcicleView();
- ~vtkIcicleView() VTK_OVERRIDE;
+ ~vtkIcicleView() override;
private:
vtkIcicleView(const vtkIcicleView&) VTK_DELETE_FUNCTION;
diff --git a/Views/Infovis/vtkInteractorStyleAreaSelectHover.h b/Views/Infovis/vtkInteractorStyleAreaSelectHover.h
index 431d9cc85ae589c8958b7ad50db39b61150f739c..17c66fa9842071d8468f5eca37ce2ae22efc26e9 100644
--- a/Views/Infovis/vtkInteractorStyleAreaSelectHover.h
+++ b/Views/Infovis/vtkInteractorStyleAreaSelectHover.h
@@ -50,7 +50,7 @@ class VTKVIEWSINFOVIS_EXPORT vtkInteractorStyleAreaSelectHover : public vtkInter
public:
static vtkInteractorStyleAreaSelectHover* New();
vtkTypeMacro(vtkInteractorStyleAreaSelectHover,vtkInteractorStyleRubberBand2D);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -83,12 +83,12 @@ public:
* Overridden from vtkInteractorStyleImage to provide the desired
* interaction behavior.
*/
- void OnMouseMove() VTK_OVERRIDE;
+ void OnMouseMove() override;
/**
* Set the interactor that this interactor style works with.
*/
- void SetInteractor(vtkRenderWindowInteractor *rwi) VTK_OVERRIDE;
+ void SetInteractor(vtkRenderWindowInteractor *rwi) override;
/**
* Set the color used to highlight the hovered vertex.
@@ -110,7 +110,7 @@ public:
protected:
vtkInteractorStyleAreaSelectHover();
- ~vtkInteractorStyleAreaSelectHover() VTK_OVERRIDE;
+ ~vtkInteractorStyleAreaSelectHover() override;
private:
vtkInteractorStyleAreaSelectHover(const vtkInteractorStyleAreaSelectHover&) VTK_DELETE_FUNCTION;
diff --git a/Views/Infovis/vtkInteractorStyleTreeMapHover.h b/Views/Infovis/vtkInteractorStyleTreeMapHover.h
index e5f4817ccdf2bf818aa977cf66ea3f11b66b8e81..d3e6ae47675f113a8493fe798b85626fa5747c0e 100644
--- a/Views/Infovis/vtkInteractorStyleTreeMapHover.h
+++ b/Views/Infovis/vtkInteractorStyleTreeMapHover.h
@@ -50,7 +50,7 @@ class VTKVIEWSINFOVIS_EXPORT vtkInteractorStyleTreeMapHover : public vtkInteract
public:
static vtkInteractorStyleTreeMapHover* New();
vtkTypeMacro(vtkInteractorStyleTreeMapHover,vtkInteractorStyleImage);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -83,8 +83,8 @@ public:
* Overridden from vtkInteractorStyleImage to provide the desired
* interaction behavior.
*/
- void OnMouseMove() VTK_OVERRIDE;
- void OnLeftButtonUp() VTK_OVERRIDE;
+ void OnMouseMove() override;
+ void OnLeftButtonUp() override;
//@}
//@{
@@ -95,7 +95,7 @@ public:
void HighLightCurrentSelectedItem();
//@}
- void SetInteractor(vtkRenderWindowInteractor *rwi) VTK_OVERRIDE;
+ void SetInteractor(vtkRenderWindowInteractor *rwi) override;
/**
* Set the color used to highlight the hovered vertex.
@@ -125,7 +125,7 @@ public:
protected:
vtkInteractorStyleTreeMapHover();
- ~vtkInteractorStyleTreeMapHover() VTK_OVERRIDE;
+ ~vtkInteractorStyleTreeMapHover() override;
private:
vtkInteractorStyleTreeMapHover(const vtkInteractorStyleTreeMapHover&) VTK_DELETE_FUNCTION;
diff --git a/Views/Infovis/vtkParallelCoordinatesHistogramRepresentation.h b/Views/Infovis/vtkParallelCoordinatesHistogramRepresentation.h
index 18de2d81970f9b629804b579298b66f2042e1a64..78db8900ffc9a4221f61e6a3a6d52a995993b077 100644
--- a/Views/Infovis/vtkParallelCoordinatesHistogramRepresentation.h
+++ b/Views/Infovis/vtkParallelCoordinatesHistogramRepresentation.h
@@ -69,12 +69,12 @@ class VTKVIEWSINFOVIS_EXPORT vtkParallelCoordinatesHistogramRepresentation : pub
public:
static vtkParallelCoordinatesHistogramRepresentation* New();
vtkTypeMacro(vtkParallelCoordinatesHistogramRepresentation, vtkParallelCoordinatesRepresentation);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Apply the theme to this view.
*/
- void ApplyViewTheme(vtkViewTheme* theme) VTK_OVERRIDE;
+ void ApplyViewTheme(vtkViewTheme* theme) override;
//@{
/**
@@ -123,26 +123,26 @@ public:
* Calls superclass swap, and assures that only histograms affected by the
* swap get recomputed.
*/
- int SwapAxisPositions(int position1, int position2) VTK_OVERRIDE;
+ int SwapAxisPositions(int position1, int position2) override;
/**
* Calls the superclass method, and assures that only the two histograms
* affect by this call get recomputed.
*/
- int SetRangeAtPosition(int position, double range[2]) VTK_OVERRIDE;
+ int SetRangeAtPosition(int position, double range[2]) override;
protected:
vtkParallelCoordinatesHistogramRepresentation();
- ~vtkParallelCoordinatesHistogramRepresentation() VTK_OVERRIDE;
+ ~vtkParallelCoordinatesHistogramRepresentation() override;
int RequestData(
vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
- bool AddToView(vtkView* view) VTK_OVERRIDE;
+ bool AddToView(vtkView* view) override;
- bool RemoveFromView(vtkView* view) VTK_OVERRIDE;
+ bool RemoveFromView(vtkView* view) override;
/**
* Flag deciding if histograms will be drawn.
@@ -181,18 +181,18 @@ protected:
* Correctly forwards the superclass call to draw lines to the internal
* PlaceHistogramLineQuads call.
*/
- int PlaceLines(vtkPolyData* polyData, vtkTable* data, vtkIdTypeArray* idsToPlot) VTK_OVERRIDE;
+ int PlaceLines(vtkPolyData* polyData, vtkTable* data, vtkIdTypeArray* idsToPlot) override;
/**
* Correctly forwards the superclass call to draw curves to the internal
* PlaceHistogramLineCurves call.
*/
- int PlaceCurves(vtkPolyData* polyData, vtkTable* data, vtkIdTypeArray* idsToPlot) VTK_OVERRIDE;
+ int PlaceCurves(vtkPolyData* polyData, vtkTable* data, vtkIdTypeArray* idsToPlot) override;
/**
* Draw a selection node referencing the row ids of a table into a poly data object.
*/
- int PlaceSelection(vtkPolyData* polyData, vtkTable* data, vtkSelectionNode* selectionNode) VTK_OVERRIDE;
+ int PlaceSelection(vtkPolyData* polyData, vtkTable* data, vtkSelectionNode* selectionNode) override;
/**
* Take the input 2D histogram images and draw one quad for each bin
@@ -210,8 +210,8 @@ protected:
* Compute the number of axes and their individual ranges, as well
* as histograms if requested.
*/
- int ComputeDataProperties() VTK_OVERRIDE;
- int UpdatePlotProperties(vtkStringArray*) VTK_OVERRIDE;
+ int ComputeDataProperties() override;
+ int UpdatePlotProperties(vtkStringArray*) override;
//@}
/**
diff --git a/Views/Infovis/vtkParallelCoordinatesRepresentation.h b/Views/Infovis/vtkParallelCoordinatesRepresentation.h
index b4a2aa6f32bb81ed41f78e8e95676b5cb0161904..c13c078f9a6604a70d0aa1e9fea7b87f29aed50f 100644
--- a/Views/Infovis/vtkParallelCoordinatesRepresentation.h
+++ b/Views/Infovis/vtkParallelCoordinatesRepresentation.h
@@ -87,14 +87,14 @@ class VTKVIEWSINFOVIS_EXPORT vtkParallelCoordinatesRepresentation : public vtkRe
public:
static vtkParallelCoordinatesRepresentation* New();
vtkTypeMacro(vtkParallelCoordinatesRepresentation, vtkRenderedRepresentation);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Apply the theme to this view. CellColor is used for line coloring
* and titles. EdgeLabelColor is used for axis color. CellOpacity is
* used for line opacity.
*/
- void ApplyViewTheme(vtkViewTheme* theme) VTK_OVERRIDE;
+ void ApplyViewTheme(vtkViewTheme* theme) override;
/**
* Returns the hover text at an x,y location.
@@ -238,22 +238,22 @@ public:
protected:
vtkParallelCoordinatesRepresentation();
- ~vtkParallelCoordinatesRepresentation() VTK_OVERRIDE;
+ ~vtkParallelCoordinatesRepresentation() override;
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
int RequestData(
vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
//@{
/**
* Add/remove the props and actors to/from a view
*/
- bool AddToView(vtkView* view) VTK_OVERRIDE;
- bool RemoveFromView(vtkView* view) VTK_OVERRIDE;
- void PrepareForRendering(vtkRenderView* view) VTK_OVERRIDE;
+ bool AddToView(vtkView* view) override;
+ bool RemoveFromView(vtkView* view) override;
+ void PrepareForRendering(vtkRenderView* view) override;
//@}
/**
@@ -324,7 +324,7 @@ protected:
* Select a set of points using the prescribed operator (add, subtract, etc.) and class
*/
virtual void SelectRows(vtkIdType brushClass, vtkIdType brushOperator, vtkIdTypeArray* rowIds);
- vtkSelection* ConvertSelection(vtkView* view, vtkSelection* selection) VTK_OVERRIDE;
+ vtkSelection* ConvertSelection(vtkView* view, vtkSelection* selection) override;
virtual void BuildInverseSelection();
virtual vtkPolyDataMapper2D* InitializePlotMapper(vtkPolyData* input, vtkActor2D* actor, bool forceStandard=false);
//@}
diff --git a/Views/Infovis/vtkParallelCoordinatesView.h b/Views/Infovis/vtkParallelCoordinatesView.h
index c2067b687296f2ae9c2fb294cd3bd43bc1e70335..60673e1e83ee1fbddf0a0993eb548bcf9a5e73b4 100644
--- a/Views/Infovis/vtkParallelCoordinatesView.h
+++ b/Views/Infovis/vtkParallelCoordinatesView.h
@@ -56,7 +56,7 @@ class VTKVIEWSINFOVIS_EXPORT vtkParallelCoordinatesView : public vtkRenderView
public:
vtkTypeMacro(vtkParallelCoordinatesView, vtkRenderView);
static vtkParallelCoordinatesView *New();
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
enum {VTK_BRUSH_LASSO=0,VTK_BRUSH_ANGLE,VTK_BRUSH_FUNCTION,VTK_BRUSH_AXISTHRESHOLD,VTK_BRUSH_MODECOUNT};
enum {VTK_BRUSHOPERATOR_ADD=0,VTK_BRUSHOPERATOR_SUBTRACT,VTK_BRUSHOPERATOR_INTERSECT,VTK_BRUSHOPERATOR_REPLACE,VTK_BRUSHOPERATOR_MODECOUNT};
@@ -87,11 +87,11 @@ public:
vtkSetMacro(CurrentBrushClass,int);
vtkGetMacro(CurrentBrushClass,int);
- void ApplyViewTheme(vtkViewTheme* theme) VTK_OVERRIDE;
+ void ApplyViewTheme(vtkViewTheme* theme) override;
protected:
vtkParallelCoordinatesView();
- ~vtkParallelCoordinatesView() VTK_OVERRIDE;
+ ~vtkParallelCoordinatesView() override;
int SelectedAxisPosition;
@@ -117,10 +117,10 @@ protected:
vtkTimeStamp WorldBuildTime;
bool RebuildNeeded;
- void ProcessEvents(vtkObject *caller, unsigned long event, void *callData) VTK_OVERRIDE;
- vtkDataRepresentation* CreateDefaultRepresentation(vtkAlgorithmOutput* conn) VTK_OVERRIDE;
+ void ProcessEvents(vtkObject *caller, unsigned long event, void *callData) override;
+ vtkDataRepresentation* CreateDefaultRepresentation(vtkAlgorithmOutput* conn) override;
- void PrepareForRendering() VTK_OVERRIDE;
+ void PrepareForRendering() override;
//@{
/**
diff --git a/Views/Infovis/vtkRenderView.h b/Views/Infovis/vtkRenderView.h
index 84dab6568d2d68b1502a8385a0bf750dd1f16d42..03a369943f2be5c5b08640f9df569798137a7c29 100644
--- a/Views/Infovis/vtkRenderView.h
+++ b/Views/Infovis/vtkRenderView.h
@@ -60,14 +60,14 @@ class VTKVIEWSINFOVIS_EXPORT vtkRenderView : public vtkRenderViewBase
public:
static vtkRenderView* New();
vtkTypeMacro(vtkRenderView, vtkRenderViewBase);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* The render window interactor. Note that this requires special
* handling in order to do correctly - see the notes in the detailed
* description of vtkRenderViewBase.
*/
- void SetInteractor(vtkRenderWindowInteractor *interactor) VTK_OVERRIDE;
+ void SetInteractor(vtkRenderWindowInteractor *interactor) override;
/**
* The interactor style associated with the render view.
@@ -84,7 +84,7 @@ public:
* handling in order to do correctly - see the notes in the detailed
* description of vtkRenderViewBase.
*/
- void SetRenderWindow(vtkRenderWindow *win) VTK_OVERRIDE;
+ void SetRenderWindow(vtkRenderWindow *win) override;
enum
{
@@ -110,12 +110,12 @@ public:
* Updates the representations, then calls Render() on the render window
* associated with this view.
*/
- void Render() VTK_OVERRIDE;
+ void Render() override;
/**
* Applies a view theme to this view.
*/
- void ApplyViewTheme(vtkViewTheme* theme) VTK_OVERRIDE;
+ void ApplyViewTheme(vtkViewTheme* theme) override;
//@{
/**
@@ -245,7 +245,7 @@ public:
protected:
vtkRenderView();
- ~vtkRenderView() VTK_OVERRIDE;
+ ~vtkRenderView() override;
/**
* Called to process events.
@@ -253,7 +253,7 @@ protected:
* This may be overridden by subclasses to process additional events.
*/
void ProcessEvents(vtkObject* caller, unsigned long eventId,
- void* callData) VTK_OVERRIDE;
+ void* callData) override;
/**
* Generates the selection based on the view event and the selection mode.
@@ -264,7 +264,7 @@ protected:
/**
* Called by the view when the renderer is about to render.
*/
- void PrepareForRendering() VTK_OVERRIDE;
+ void PrepareForRendering() override;
/**
* Called in PrepareForRendering to update the hover text.
diff --git a/Views/Infovis/vtkRenderedGraphRepresentation.h b/Views/Infovis/vtkRenderedGraphRepresentation.h
index dba3f9a06d8b4243529ab17b40e36f22ecbc3d4e..149dbb688f3d7a73808426c0d3a640c97bafc475 100644
--- a/Views/Infovis/vtkRenderedGraphRepresentation.h
+++ b/Views/Infovis/vtkRenderedGraphRepresentation.h
@@ -66,7 +66,7 @@ class VTKVIEWSINFOVIS_EXPORT vtkRenderedGraphRepresentation : public vtkRendered
public:
static vtkRenderedGraphRepresentation* New();
vtkTypeMacro(vtkRenderedGraphRepresentation, vtkRenderedRepresentation);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
// ------------------------------------------------------------------------
// Vertex labels
@@ -341,7 +341,7 @@ public:
/**
* Apply a theme to this representation.
*/
- void ApplyViewTheme(vtkViewTheme* theme) VTK_OVERRIDE;
+ void ApplyViewTheme(vtkViewTheme* theme) override;
//@{
/**
@@ -403,21 +403,21 @@ public:
protected:
vtkRenderedGraphRepresentation();
- ~vtkRenderedGraphRepresentation() VTK_OVERRIDE;
+ ~vtkRenderedGraphRepresentation() override;
//@{
/**
* Called by the view to add/remove this representation.
*/
- bool AddToView(vtkView* view) VTK_OVERRIDE;
- bool RemoveFromView(vtkView* view) VTK_OVERRIDE;
+ bool AddToView(vtkView* view) override;
+ bool RemoveFromView(vtkView* view) override;
//@}
- void PrepareForRendering(vtkRenderView* view) VTK_OVERRIDE;
+ void PrepareForRendering(vtkRenderView* view) override;
- vtkSelection* ConvertSelection(vtkView* view, vtkSelection* sel) VTK_OVERRIDE;
+ vtkSelection* ConvertSelection(vtkView* view, vtkSelection* sel) override;
- vtkUnicodeString GetHoverTextInternal(vtkSelection* sel) VTK_OVERRIDE;
+ vtkUnicodeString GetHoverTextInternal(vtkSelection* sel) override;
/**
* Connect inputs to internal pipeline.
@@ -425,7 +425,7 @@ protected:
int RequestData(
vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
//@{
/**
diff --git a/Views/Infovis/vtkRenderedHierarchyRepresentation.h b/Views/Infovis/vtkRenderedHierarchyRepresentation.h
index 2636d7b1f4ad1a5fcc65fbe66a0f96844c4c6d5a..792fcd02b80208a5f49a13f4da3b237acebb9051 100644
--- a/Views/Infovis/vtkRenderedHierarchyRepresentation.h
+++ b/Views/Infovis/vtkRenderedHierarchyRepresentation.h
@@ -34,7 +34,7 @@ class VTKVIEWSINFOVIS_EXPORT vtkRenderedHierarchyRepresentation : public vtkRend
public:
static vtkRenderedHierarchyRepresentation* New();
vtkTypeMacro(vtkRenderedHierarchyRepresentation, vtkRenderedGraphRepresentation);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -111,14 +111,14 @@ public:
protected:
vtkRenderedHierarchyRepresentation();
- ~vtkRenderedHierarchyRepresentation() VTK_OVERRIDE;
+ ~vtkRenderedHierarchyRepresentation() override;
//@{
/**
* Called by the view to add/remove this representation.
*/
- bool AddToView(vtkView* view) VTK_OVERRIDE;
- bool RemoveFromView(vtkView* view) VTK_OVERRIDE;
+ bool AddToView(vtkView* view) override;
+ bool RemoveFromView(vtkView* view) override;
//@}
/**
@@ -126,9 +126,9 @@ protected:
*/
bool ValidIndex(int idx);
- vtkSelection* ConvertSelection(vtkView* view, vtkSelection* sel) VTK_OVERRIDE;
+ vtkSelection* ConvertSelection(vtkView* view, vtkSelection* sel) override;
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
/**
* Sets up the input connections for this representation.
@@ -136,9 +136,9 @@ protected:
int RequestData(
vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
- void ApplyViewTheme(vtkViewTheme* theme) VTK_OVERRIDE;
+ void ApplyViewTheme(vtkViewTheme* theme) override;
class Internals;
Internals* Implementation;
diff --git a/Views/Infovis/vtkRenderedRepresentation.h b/Views/Infovis/vtkRenderedRepresentation.h
index 4dcebe3e589ae1a4d2a7e1d9f3c95e2521ed8c4a..eec53b53eb205b28d05ff577675bed4a2c69354a 100644
--- a/Views/Infovis/vtkRenderedRepresentation.h
+++ b/Views/Infovis/vtkRenderedRepresentation.h
@@ -44,7 +44,7 @@ class VTKVIEWSINFOVIS_EXPORT vtkRenderedRepresentation : public vtkDataRepresent
public:
static vtkRenderedRepresentation* New();
vtkTypeMacro(vtkRenderedRepresentation, vtkDataRepresentation);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -59,7 +59,7 @@ public:
protected:
vtkRenderedRepresentation();
- ~vtkRenderedRepresentation() VTK_OVERRIDE;
+ ~vtkRenderedRepresentation() override;
//@{
/**
diff --git a/Views/Infovis/vtkRenderedSurfaceRepresentation.h b/Views/Infovis/vtkRenderedSurfaceRepresentation.h
index 7e9489411735f47b1a7c347bee894de635242ba0..cf502e4adfa2efc4a4c7ba2966ef80f8307ca86a 100644
--- a/Views/Infovis/vtkRenderedSurfaceRepresentation.h
+++ b/Views/Infovis/vtkRenderedSurfaceRepresentation.h
@@ -51,7 +51,7 @@ class VTKVIEWSINFOVIS_EXPORT vtkRenderedSurfaceRepresentation : public vtkRender
public:
static vtkRenderedSurfaceRepresentation *New();
vtkTypeMacro(vtkRenderedSurfaceRepresentation, vtkRenderedRepresentation);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Sets the color array name
@@ -63,11 +63,11 @@ public:
/**
* Apply a theme to this representation.
*/
- void ApplyViewTheme(vtkViewTheme* theme) VTK_OVERRIDE;
+ void ApplyViewTheme(vtkViewTheme* theme) override;
protected:
vtkRenderedSurfaceRepresentation();
- ~vtkRenderedSurfaceRepresentation() VTK_OVERRIDE;
+ ~vtkRenderedSurfaceRepresentation() override;
/**
* Sets the input pipeline connection to this representation.
@@ -75,31 +75,31 @@ protected:
int RequestData(
vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
/**
* Performs per-render operations.
*/
- void PrepareForRendering(vtkRenderView* view) VTK_OVERRIDE;
+ void PrepareForRendering(vtkRenderView* view) override;
/**
* Adds the representation to the view. This is called from
* vtkView::AddRepresentation().
*/
- bool AddToView(vtkView* view) VTK_OVERRIDE;
+ bool AddToView(vtkView* view) override;
/**
* Removes the representation to the view. This is called from
* vtkView::RemoveRepresentation().
*/
- bool RemoveFromView(vtkView* view) VTK_OVERRIDE;
+ bool RemoveFromView(vtkView* view) override;
/**
* Convert the selection to a type appropriate for sharing with other
* representations through vtkAnnotationLink.
* If the selection cannot be applied to this representation, returns NULL.
*/
- vtkSelection* ConvertSelection(vtkView* view, vtkSelection* selection) VTK_OVERRIDE;
+ vtkSelection* ConvertSelection(vtkView* view, vtkSelection* selection) override;
//@{
/**
diff --git a/Views/Infovis/vtkRenderedTreeAreaRepresentation.h b/Views/Infovis/vtkRenderedTreeAreaRepresentation.h
index 9f2d9dbb4cd8b892ed5cf05942c3adc89005fefe..c05b8a0e9a8852c3ad7e8f66d6519688d33aabb0 100644
--- a/Views/Infovis/vtkRenderedTreeAreaRepresentation.h
+++ b/Views/Infovis/vtkRenderedTreeAreaRepresentation.h
@@ -53,7 +53,7 @@ class VTKVIEWSINFOVIS_EXPORT vtkRenderedTreeAreaRepresentation : public vtkRende
public:
static vtkRenderedTreeAreaRepresentation* New();
vtkTypeMacro(vtkRenderedTreeAreaRepresentation, vtkRenderedRepresentation);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Set the label render mode.
@@ -61,7 +61,7 @@ public:
* and unicode support. Requires VTK_USE_QT to be on.
* FREETYPE - Use standard freetype text rendering.
*/
- void SetLabelRenderMode(int mode) VTK_OVERRIDE;
+ void SetLabelRenderMode(int mode) override;
//@{
/**
@@ -283,7 +283,7 @@ public:
/**
* Apply the theme to this view.
*/
- void ApplyViewTheme(vtkViewTheme* theme) VTK_OVERRIDE;
+ void ApplyViewTheme(vtkViewTheme* theme) override;
//@{
/**
@@ -295,32 +295,32 @@ public:
protected:
vtkRenderedTreeAreaRepresentation();
- ~vtkRenderedTreeAreaRepresentation() VTK_OVERRIDE;
+ ~vtkRenderedTreeAreaRepresentation() override;
//@{
/**
* Called by the view to add/remove this representation.
*/
- bool AddToView(vtkView* view) VTK_OVERRIDE;
- bool RemoveFromView(vtkView* view) VTK_OVERRIDE;
+ bool AddToView(vtkView* view) override;
+ bool RemoveFromView(vtkView* view) override;
//@}
- vtkSelection* ConvertSelection(vtkView* view, vtkSelection* sel) VTK_OVERRIDE;
+ vtkSelection* ConvertSelection(vtkView* view, vtkSelection* sel) override;
- int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
int RequestData(
vtkInformation*,
vtkInformationVector**,
- vtkInformationVector*) VTK_OVERRIDE;
+ vtkInformationVector*) override;
- void PrepareForRendering(vtkRenderView* view) VTK_OVERRIDE;
+ void PrepareForRendering(vtkRenderView* view) override;
bool ValidIndex(int idx);
void UpdateHoverHighlight(vtkView* view, int x, int y);
- vtkUnicodeString GetHoverTextInternal(vtkSelection* sel) VTK_OVERRIDE;
+ vtkUnicodeString GetHoverTextInternal(vtkSelection* sel) override;
vtkSmartPointer<vtkWorldPointPicker> Picker;
vtkSmartPointer<vtkApplyColors> ApplyColors;
diff --git a/Views/Infovis/vtkSCurveSpline.h b/Views/Infovis/vtkSCurveSpline.h
index 8944bf1d6840c17bcaffb850973efe3c265aaa49..a39ba456635c9adc1b8638f702c030eca9872bba 100644
--- a/Views/Infovis/vtkSCurveSpline.h
+++ b/Views/Infovis/vtkSCurveSpline.h
@@ -42,28 +42,28 @@ public:
static vtkSCurveSpline *New();
vtkTypeMacro(vtkSCurveSpline,vtkSpline);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Compute SCurve Splines for each dependent variable
*/
- void Compute () VTK_OVERRIDE;
+ void Compute () override;
/**
* Evaluate a 1D SCurve spline.
*/
- double Evaluate (double t) VTK_OVERRIDE;
+ double Evaluate (double t) override;
/**
* Deep copy of SCurve spline data.
*/
- void DeepCopy(vtkSpline *s) VTK_OVERRIDE;
+ void DeepCopy(vtkSpline *s) override;
vtkSetMacro(NodeWeight,double);
vtkGetMacro(NodeWeight,double);
protected:
vtkSCurveSpline();
- ~vtkSCurveSpline() VTK_OVERRIDE {}
+ ~vtkSCurveSpline() override {}
double NodeWeight;
diff --git a/Views/Infovis/vtkTanglegramItem.h b/Views/Infovis/vtkTanglegramItem.h
index 481b0256a2d6ad3c9e0870c7b98810978fa636f6..a92d1adb2dbcc06cfd630df5c31f54ff8229757b 100644
--- a/Views/Infovis/vtkTanglegramItem.h
+++ b/Views/Infovis/vtkTanglegramItem.h
@@ -45,7 +45,7 @@ class VTKVIEWSINFOVIS_EXPORT vtkTanglegramItem : public vtkContextItem
public:
static vtkTanglegramItem *New();
vtkTypeMacro(vtkTanglegramItem, vtkContextItem);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
/**
* Set the first tree
@@ -139,17 +139,17 @@ public:
/**
* Returns true if the transform is interactive, false otherwise.
*/
- bool Hit(const vtkContextMouseEvent &mouse) VTK_OVERRIDE;
+ bool Hit(const vtkContextMouseEvent &mouse) override;
/**
* Propagate any double click onto the dendrograms to check if any
* subtrees should be collapsed or expanded.
*/
- bool MouseDoubleClickEvent(const vtkContextMouseEvent &event) VTK_OVERRIDE;
+ bool MouseDoubleClickEvent(const vtkContextMouseEvent &event) override;
protected:
vtkTanglegramItem();
- ~vtkTanglegramItem() VTK_OVERRIDE;
+ ~vtkTanglegramItem() override;
/**
* Update the bounds of our two dendrograms.
@@ -201,7 +201,7 @@ protected:
/**
* Paints the tree & associated table as a heatmap.
*/
- bool Paint(vtkContext2D *painter) VTK_OVERRIDE;
+ bool Paint(vtkContext2D *painter) override;
private:
vtkSmartPointer<vtkDendrogramItem> Dendrogram1;
diff --git a/Views/Infovis/vtkTreeAreaView.h b/Views/Infovis/vtkTreeAreaView.h
index 516921c00cfbc4f683f3a367389081fc9c49d34a..2949aa3fe9dcac702243618ac8e27edafe84e72a 100644
--- a/Views/Infovis/vtkTreeAreaView.h
+++ b/Views/Infovis/vtkTreeAreaView.h
@@ -55,7 +55,7 @@ class VTKVIEWSINFOVIS_EXPORT vtkTreeAreaView : public vtkRenderView
public:
static vtkTreeAreaView *New();
vtkTypeMacro(vtkTreeAreaView, vtkRenderView);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
@@ -226,7 +226,7 @@ public:
protected:
vtkTreeAreaView();
- ~vtkTreeAreaView() VTK_OVERRIDE;
+ ~vtkTreeAreaView() override;
//@{
/**
@@ -252,7 +252,7 @@ protected:
* Overrides behavior in vtkView to create a vtkRenderedGraphRepresentation
* by default.
*/
- vtkDataRepresentation* CreateDefaultRepresentation(vtkAlgorithmOutput* conn) VTK_OVERRIDE;
+ vtkDataRepresentation* CreateDefaultRepresentation(vtkAlgorithmOutput* conn) override;
virtual vtkRenderedTreeAreaRepresentation* GetTreeAreaRepresentation();
//@}
diff --git a/Views/Infovis/vtkTreeHeatmapItem.h b/Views/Infovis/vtkTreeHeatmapItem.h
index d5bdb5c32fef51ece262677e693a3c82df005672..d8562cf7fdb8b1649a701b6b7ab91924181d2339 100644
--- a/Views/Infovis/vtkTreeHeatmapItem.h
+++ b/Views/Infovis/vtkTreeHeatmapItem.h
@@ -54,7 +54,7 @@ class VTKVIEWSINFOVIS_EXPORT vtkTreeHeatmapItem : public vtkContextItem
public:
static vtkTreeHeatmapItem *New();
vtkTypeMacro(vtkTreeHeatmapItem, vtkContextItem);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
/**
* Set the tree that this item draws. Note that this tree's vertex data
@@ -190,22 +190,22 @@ public:
/**
* Returns true if the transform is interactive, false otherwise.
*/
- bool Hit(const vtkContextMouseEvent &mouse) VTK_OVERRIDE;
+ bool Hit(const vtkContextMouseEvent &mouse) override;
/**
* Propagate any double click onto the dendrogram to check if any
* subtrees should be collapsed or expanded.
*/
- bool MouseDoubleClickEvent(const vtkContextMouseEvent &event) VTK_OVERRIDE;
+ bool MouseDoubleClickEvent(const vtkContextMouseEvent &event) override;
protected:
vtkTreeHeatmapItem();
- ~vtkTreeHeatmapItem() VTK_OVERRIDE;
+ ~vtkTreeHeatmapItem() override;
/**
* Paints the tree & associated table as a heatmap.
*/
- bool Paint(vtkContext2D *painter) VTK_OVERRIDE;
+ bool Paint(vtkContext2D *painter) override;
/**
* Mark heatmap rows as hidden when a subtree is collapsed.
diff --git a/Views/Infovis/vtkTreeMapView.h b/Views/Infovis/vtkTreeMapView.h
index 2eff21c1089bed6158caa5ac238b705f38c90965..6056743b6015aa2566b8f9c9719a0ae6d869520d 100644
--- a/Views/Infovis/vtkTreeMapView.h
+++ b/Views/Infovis/vtkTreeMapView.h
@@ -42,13 +42,13 @@ class VTKVIEWSINFOVIS_EXPORT vtkTreeMapView : public vtkTreeAreaView
public:
static vtkTreeMapView *New();
vtkTypeMacro(vtkTreeMapView, vtkTreeAreaView);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
* Sets the treemap layout strategy
*/
- void SetLayoutStrategy(vtkAreaLayoutStrategy* s) VTK_OVERRIDE;
+ void SetLayoutStrategy(vtkAreaLayoutStrategy* s) override;
virtual void SetLayoutStrategy(const char* name);
virtual void SetLayoutStrategyToBox();
virtual void SetLayoutStrategyToSliceAndDice();
@@ -66,7 +66,7 @@ public:
protected:
vtkTreeMapView();
- ~vtkTreeMapView() VTK_OVERRIDE;
+ ~vtkTreeMapView() override;
vtkSmartPointer<vtkBoxLayoutStrategy> BoxLayout;
vtkSmartPointer<vtkSliceAndDiceLayoutStrategy> SliceAndDiceLayout;
diff --git a/Views/Infovis/vtkTreeRingView.h b/Views/Infovis/vtkTreeRingView.h
index f6cfde1c0ceb922538ced23e6dddb9e5b8f36f15..44262f66c1d659305fc5bb9d525149710fa3ad5f 100644
--- a/Views/Infovis/vtkTreeRingView.h
+++ b/Views/Infovis/vtkTreeRingView.h
@@ -47,7 +47,7 @@ class VTKVIEWSINFOVIS_EXPORT vtkTreeRingView : public vtkTreeAreaView
public:
static vtkTreeRingView *New();
vtkTypeMacro(vtkTreeRingView, vtkTreeAreaView);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Set the root angles for laying out the hierarchy.
@@ -91,7 +91,7 @@ public:
protected:
vtkTreeRingView();
- ~vtkTreeRingView() VTK_OVERRIDE;
+ ~vtkTreeRingView() override;
private:
vtkTreeRingView(const vtkTreeRingView&) VTK_DELETE_FUNCTION;
diff --git a/Views/Infovis/vtkViewUpdater.cxx b/Views/Infovis/vtkViewUpdater.cxx
index baa8aff21acf0bdb709ea2441e75b3f90f9497a5..59aa8ec7924e227055c56f0be62ecb7b86294699 100644
--- a/Views/Infovis/vtkViewUpdater.cxx
+++ b/Views/Infovis/vtkViewUpdater.cxx
@@ -35,7 +35,7 @@ class vtkViewUpdater::vtkViewUpdaterInternals : public vtkCommand
{
public:
- void Execute(vtkObject*, unsigned long, void*) VTK_OVERRIDE
+ void Execute(vtkObject*, unsigned long, void*) override
{
for (unsigned int i = 0; i < this->Views.size(); ++i)
{
diff --git a/Views/Infovis/vtkViewUpdater.h b/Views/Infovis/vtkViewUpdater.h
index 0c6b9679669fa64d75d3e29d109d12042badfb38..cdbba8b52d9edc1d2f0a05351dbb1e646d3dd729 100644
--- a/Views/Infovis/vtkViewUpdater.h
+++ b/Views/Infovis/vtkViewUpdater.h
@@ -42,7 +42,7 @@ class VTKVIEWSINFOVIS_EXPORT vtkViewUpdater : public vtkObject
public:
static vtkViewUpdater *New();
vtkTypeMacro(vtkViewUpdater, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
void AddView(vtkView* view);
void RemoveView(vtkView* view);
@@ -51,7 +51,7 @@ public:
protected:
vtkViewUpdater();
- ~vtkViewUpdater() VTK_OVERRIDE;
+ ~vtkViewUpdater() override;
private:
vtkViewUpdater(const vtkViewUpdater&) VTK_DELETE_FUNCTION;
diff --git a/Views/Qt/vtkQtAnnotationView.h b/Views/Qt/vtkQtAnnotationView.h
index 3af92b5eb298cc8d926c80903c1ebe31788ae5c4..94845b22b2b73b23ddb6de6d4fdae6e0de6f9a96 100644
--- a/Views/Qt/vtkQtAnnotationView.h
+++ b/Views/Qt/vtkQtAnnotationView.h
@@ -48,7 +48,7 @@ Q_OBJECT
public:
static vtkQtAnnotationView *New();
vtkTypeMacro(vtkQtAnnotationView, vtkQtView);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Get the main container of this view (a QWidget).
@@ -56,16 +56,16 @@ public:
* to GetWidget(): something like this
* this->ui->box->layout()->addWidget(this->View->GetWidget());
*/
- QWidget* GetWidget() VTK_OVERRIDE;
+ QWidget* GetWidget() override;
/**
* Updates the view.
*/
- void Update() VTK_OVERRIDE;
+ void Update() override;
protected:
vtkQtAnnotationView();
- ~vtkQtAnnotationView() VTK_OVERRIDE;
+ ~vtkQtAnnotationView() override;
private slots:
void slotQtSelectionChanged(const QItemSelection&,const QItemSelection&);
diff --git a/Views/Qt/vtkQtListView.h b/Views/Qt/vtkQtListView.h
index 2a88cfe18e98da67a8737086552f1f85a20c3f22..f22b6b49349291b6d18c3568c938fb19e0427243 100644
--- a/Views/Qt/vtkQtListView.h
+++ b/Views/Qt/vtkQtListView.h
@@ -53,7 +53,7 @@ Q_OBJECT
public:
static vtkQtListView *New();
vtkTypeMacro(vtkQtListView, vtkQtView);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Get the main container of this view (a QWidget).
@@ -61,7 +61,7 @@ public:
* to GetWidget(): something like this
* this->ui->box->layout()->addWidget(this->View->GetWidget());
*/
- QWidget* GetWidget() VTK_OVERRIDE;
+ QWidget* GetWidget() override;
enum
{
@@ -137,19 +137,19 @@ public:
void SetIconArrayName(const char* name);
//@}
- void ApplyViewTheme(vtkViewTheme* theme) VTK_OVERRIDE;
+ void ApplyViewTheme(vtkViewTheme* theme) override;
/**
* Updates the view.
*/
- void Update() VTK_OVERRIDE;
+ void Update() override;
protected:
vtkQtListView();
- ~vtkQtListView() VTK_OVERRIDE;
+ ~vtkQtListView() override;
- void AddRepresentationInternal(vtkDataRepresentation* rep) VTK_OVERRIDE;
- void RemoveRepresentationInternal(vtkDataRepresentation* rep) VTK_OVERRIDE;
+ void AddRepresentationInternal(vtkDataRepresentation* rep) override;
+ void RemoveRepresentationInternal(vtkDataRepresentation* rep) override;
private slots:
void slotQtSelectionChanged(const QItemSelection&,const QItemSelection&);
diff --git a/Views/Qt/vtkQtRecordView.h b/Views/Qt/vtkQtRecordView.h
index 3033dd10ae9becfd4cb65b988c53ce52f9e17332..8cd8259bcf12ecee5097c3f4d94ddc73de745d23 100644
--- a/Views/Qt/vtkQtRecordView.h
+++ b/Views/Qt/vtkQtRecordView.h
@@ -49,7 +49,7 @@ Q_OBJECT
public:
static vtkQtRecordView *New();
vtkTypeMacro(vtkQtRecordView, vtkQtView);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Get the main container of this view (a QWidget).
@@ -57,7 +57,7 @@ public:
* to GetWidget(): something like this
* this->ui->box->layout()->addWidget(this->View->GetWidget());
*/
- QWidget* GetWidget() VTK_OVERRIDE;
+ QWidget* GetWidget() override;
enum
{
@@ -84,15 +84,15 @@ public:
/**
* Updates the view.
*/
- void Update() VTK_OVERRIDE;
+ void Update() override;
protected:
vtkQtRecordView();
- ~vtkQtRecordView() VTK_OVERRIDE;
+ ~vtkQtRecordView() override;
- void AddRepresentationInternal(vtkDataRepresentation* rep) VTK_OVERRIDE;
- void RemoveRepresentationInternal(vtkDataRepresentation* rep) VTK_OVERRIDE;
+ void AddRepresentationInternal(vtkDataRepresentation* rep) override;
+ void RemoveRepresentationInternal(vtkDataRepresentation* rep) override;
vtkSmartPointer<vtkDataObjectToTable> DataObjectToTable;
diff --git a/Views/Qt/vtkQtTableRepresentation.h b/Views/Qt/vtkQtTableRepresentation.h
index e3909ef9d0199c55072ad8a45fca1e72b0c1b0c9..0ba9a8b95c98ac99b98a561af6c71c9a494cac40 100644
--- a/Views/Qt/vtkQtTableRepresentation.h
+++ b/Views/Qt/vtkQtTableRepresentation.h
@@ -65,7 +65,7 @@ class VTKVIEWSQT_EXPORT vtkQtTableRepresentation : public vtkDataRepresentation
{
public:
vtkTypeMacro(vtkQtTableRepresentation, vtkDataRepresentation);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
//@{
/**
@@ -105,7 +105,7 @@ public:
protected:
vtkQtTableRepresentation();
- ~vtkQtTableRepresentation() VTK_OVERRIDE;
+ ~vtkQtTableRepresentation() override;
/**
* Update the table representation
@@ -128,7 +128,7 @@ public:
*/
int RequestData(vtkInformation* request,
vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) VTK_OVERRIDE;
+ vtkInformationVector* outputVector) override;
virtual void ResetModel();
virtual void CreateSeriesColors();
diff --git a/Views/Qt/vtkQtTableView.h b/Views/Qt/vtkQtTableView.h
index 9aa309ad93413004811b6e5859800d0685fcfd00..2f244bc7844d14b76219d5df58422ba4c6b14e31 100644
--- a/Views/Qt/vtkQtTableView.h
+++ b/Views/Qt/vtkQtTableView.h
@@ -54,7 +54,7 @@ Q_OBJECT
public:
static vtkQtTableView *New();
vtkTypeMacro(vtkQtTableView, vtkQtView);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Get the main container of this view (a QWidget).
@@ -62,7 +62,7 @@ public:
* to GetWidget(): something like this
* this->ui->box->layout()->addWidget(this->View->GetWidget());
*/
- QWidget* GetWidget() VTK_OVERRIDE;
+ QWidget* GetWidget() override;
/**
* Have the view show/hide its column headers
@@ -157,7 +157,7 @@ public:
/**
* Updates the view.
*/
- void Update() VTK_OVERRIDE;
+ void Update() override;
//@{
/**
@@ -179,7 +179,7 @@ public:
/**
* Apply a view theme to this view.
*/
- void ApplyViewTheme(vtkViewTheme* theme) VTK_OVERRIDE;
+ void ApplyViewTheme(vtkViewTheme* theme) override;
enum
{
@@ -214,10 +214,10 @@ public:
protected:
vtkQtTableView();
- ~vtkQtTableView() VTK_OVERRIDE;
+ ~vtkQtTableView() override;
- void AddRepresentationInternal(vtkDataRepresentation* rep) VTK_OVERRIDE;
- void RemoveRepresentationInternal(vtkDataRepresentation* rep) VTK_OVERRIDE;
+ void AddRepresentationInternal(vtkDataRepresentation* rep) override;
+ void RemoveRepresentationInternal(vtkDataRepresentation* rep) override;
private slots:
void slotQtSelectionChanged(const QItemSelection&,const QItemSelection&);
diff --git a/Views/Qt/vtkQtTreeView.h b/Views/Qt/vtkQtTreeView.h
index 00a206a6fb1aab6e0e78af05c6d61e2e20d7b151..1da3879eba5b9e9c019ee6121de7c6f8761763ec 100644
--- a/Views/Qt/vtkQtTreeView.h
+++ b/Views/Qt/vtkQtTreeView.h
@@ -63,7 +63,7 @@ signals:
public:
static vtkQtTreeView *New();
vtkTypeMacro(vtkQtTreeView, vtkQtView);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Get the main container of this view (a QWidget).
@@ -71,7 +71,7 @@ public:
* to GetWidget(): something like this
* this->ui->box->layout()->addWidget(this->View->GetWidget());
*/
- QWidget* GetWidget() VTK_OVERRIDE;
+ QWidget* GetWidget() override;
/**
* Have the view show/hide its column headers (default is ON)
@@ -163,7 +163,7 @@ public:
/**
* Updates the view.
*/
- void Update() VTK_OVERRIDE;
+ void Update() override;
/**
* Set item delegate to something custom
@@ -187,14 +187,14 @@ public:
vtkBooleanMacro(ColorByArray, bool);
//@}
- void ApplyViewTheme(vtkViewTheme* theme) VTK_OVERRIDE;
+ void ApplyViewTheme(vtkViewTheme* theme) override;
protected:
vtkQtTreeView();
- ~vtkQtTreeView() VTK_OVERRIDE;
+ ~vtkQtTreeView() override;
- void AddRepresentationInternal(vtkDataRepresentation* rep) VTK_OVERRIDE;
- void RemoveRepresentationInternal(vtkDataRepresentation* rep) VTK_OVERRIDE;
+ void AddRepresentationInternal(vtkDataRepresentation* rep) override;
+ void RemoveRepresentationInternal(vtkDataRepresentation* rep) override;
private slots:
void slotQtSelectionChanged(const QItemSelection&,const QItemSelection&);
diff --git a/Views/Qt/vtkQtView.h b/Views/Qt/vtkQtView.h
index 798f899e52cd333a227d825fefbb2ee3518c67a2..2885b67490a4463651640228076425de77e9fe28 100644
--- a/Views/Qt/vtkQtView.h
+++ b/Views/Qt/vtkQtView.h
@@ -34,7 +34,7 @@ Q_OBJECT
public:
vtkTypeMacro(vtkQtView, vtkView);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Get the main container of this view (a QWidget).
@@ -66,7 +66,7 @@ public:
protected:
vtkQtView();
- ~vtkQtView() VTK_OVERRIDE;
+ ~vtkQtView() override;
private:
vtkQtView(const vtkQtView&) VTK_DELETE_FUNCTION;
diff --git a/Web/Core/vtkDataEncoder.h b/Web/Core/vtkDataEncoder.h
index 7286a45cc935cafeca52155276faff7822d64b71..2328f5b98f2cbdc9a865bd3dd573928868ef638a 100644
--- a/Web/Core/vtkDataEncoder.h
+++ b/Web/Core/vtkDataEncoder.h
@@ -45,7 +45,7 @@ class VTKWEBCORE_EXPORT vtkDataEncoder : public vtkObject
public:
static vtkDataEncoder* New();
vtkTypeMacro(vtkDataEncoder, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Re-initializes the encoder. This will abort any on going encoding threads
diff --git a/Web/Core/vtkObjectIdMap.h b/Web/Core/vtkObjectIdMap.h
index f531ea93f7da81e0d3a8105203464fdabd86e54a..a8222020e64ceed77bbadfd22865d2c2b975d029 100644
--- a/Web/Core/vtkObjectIdMap.h
+++ b/Web/Core/vtkObjectIdMap.h
@@ -29,7 +29,7 @@ class VTKWEBCORE_EXPORT vtkObjectIdMap : public vtkObject
public:
static vtkObjectIdMap* New();
vtkTypeMacro(vtkObjectIdMap, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Retrieve a unique identifier for the given object or generate a new one
diff --git a/Web/Core/vtkWebApplication.h b/Web/Core/vtkWebApplication.h
index 47c536dbe826b1278b183373e283bb78c19f27ee..ec69a86aaa082e83ebb617bbdbac3df01fe5a43e 100644
--- a/Web/Core/vtkWebApplication.h
+++ b/Web/Core/vtkWebApplication.h
@@ -38,7 +38,7 @@ class VTKWEBCORE_EXPORT vtkWebApplication : public vtkObject
public:
static vtkWebApplication* New();
vtkTypeMacro(vtkWebApplication, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
diff --git a/Web/Core/vtkWebInteractionEvent.h b/Web/Core/vtkWebInteractionEvent.h
index 3fb17271731969c91a683c9e7c43a5fece544fb8..3dffe0cd72e53ccd643631ff9d45d681c7a10543 100644
--- a/Web/Core/vtkWebInteractionEvent.h
+++ b/Web/Core/vtkWebInteractionEvent.h
@@ -29,7 +29,7 @@ class VTKWEBCORE_EXPORT vtkWebInteractionEvent : public vtkObject
public:
static vtkWebInteractionEvent* New();
vtkTypeMacro(vtkWebInteractionEvent, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
enum MouseButton
{
diff --git a/Web/Core/vtkWebUtilities.h b/Web/Core/vtkWebUtilities.h
index 9f99db80c9c6a4f28dc9047d0a4fdc93e120f6b6..a55640c82a5f127bd49fb6d16c8ed8c4039699a7 100644
--- a/Web/Core/vtkWebUtilities.h
+++ b/Web/Core/vtkWebUtilities.h
@@ -34,7 +34,7 @@ class VTKWEBCORE_EXPORT vtkWebUtilities : public vtkObject
public:
static vtkWebUtilities* New();
vtkTypeMacro(vtkWebUtilities, vtkObject);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
static std::string WriteAttributesToJavaScript(int field_type, vtkDataSet*);
static std::string WriteAttributeHeadersToJavaScript(
diff --git a/Web/WebGLExporter/vtkPVWebGLExporter.h b/Web/WebGLExporter/vtkPVWebGLExporter.h
index 65aba7db7a6009d7a203cac4259c52eaec8d0852..06ba3b02a6156606dd42b329e1d48d76b3024619 100644
--- a/Web/WebGLExporter/vtkPVWebGLExporter.h
+++ b/Web/WebGLExporter/vtkPVWebGLExporter.h
@@ -23,7 +23,7 @@ class VTKWEBGLEXPORTER_EXPORT vtkPVWebGLExporter : public vtkExporter
public:
static vtkPVWebGLExporter *New();
vtkTypeMacro(vtkPVWebGLExporter,vtkExporter);
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
// Description:
// Specify the name of the VRML file to write.
@@ -34,7 +34,7 @@ protected:
vtkPVWebGLExporter();
~vtkPVWebGLExporter() override;
- void WriteData() VTK_OVERRIDE;
+ void WriteData() override;
char *FileName;
diff --git a/Web/WebGLExporter/vtkWebGLDataSet.h b/Web/WebGLExporter/vtkWebGLDataSet.h
index f9eb4f8a51465c1113d9e0633b71166ff69d62ba..647ba3e5f0884abf338d2543148508d45ea62a47 100644
--- a/Web/WebGLExporter/vtkWebGLDataSet.h
+++ b/Web/WebGLExporter/vtkWebGLDataSet.h
@@ -32,7 +32,7 @@ class VTKWEBGLEXPORTER_EXPORT vtkWebGLDataSet : public vtkObject
public:
static vtkWebGLDataSet* New();
vtkTypeMacro(vtkWebGLDataSet, vtkObject)
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
void SetVertices(float* v, int size);
void SetIndexes(short* i, int size);
diff --git a/Web/WebGLExporter/vtkWebGLExporter.h b/Web/WebGLExporter/vtkWebGLExporter.h
index 1d4f063f140fdcc857837570f7dae368e3d8d34e..a513758be11945367e28c7c556b118da6741dc2b 100644
--- a/Web/WebGLExporter/vtkWebGLExporter.h
+++ b/Web/WebGLExporter/vtkWebGLExporter.h
@@ -49,7 +49,7 @@ class VTKWEBGLEXPORTER_EXPORT vtkWebGLExporter : public vtkObject
public:
static vtkWebGLExporter* New();
vtkTypeMacro(vtkWebGLExporter, vtkObject)
- void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
diff --git a/Web/WebGLExporter/vtkWebGLObject.h b/Web/WebGLExporter/vtkWebGLObject.h
index 26e92e524a07a86afa2542423a1cc3324f1c5365..e7e830e580c7a9a77b97fc0e71cda1545b064b20 100644
--- a/Web/WebGLExporter/vtkWebGLObject.h
+++ b/Web/WebGLExporter/vtkWebGLObject.h
@@ -40,7 +40,7 @@ class VTKWEBGLEXPORTER_EXPORT vtkWebGLObject : public vtkObject
public:
static vtkWebGLObject* New();
vtkTypeMacro(vtkWebGLObject, vtkObject)
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
virtual void GenerateBinaryData();
virtual unsigned char* GetBinaryData(int part);
diff --git a/Web/WebGLExporter/vtkWebGLPolyData.h b/Web/WebGLExporter/vtkWebGLPolyData.h
index 98cab22c023d1d71b30b517c6ab6b1df18f11dea..35ea27e490276550cbc3e11bfb671cdf57d6acd1 100644
--- a/Web/WebGLExporter/vtkWebGLPolyData.h
+++ b/Web/WebGLExporter/vtkWebGLPolyData.h
@@ -36,12 +36,12 @@ class VTKWEBGLEXPORTER_EXPORT vtkWebGLPolyData : public vtkWebGLObject
public:
static vtkWebGLPolyData* New();
vtkTypeMacro(vtkWebGLPolyData, vtkWebGLObject);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
- void GenerateBinaryData() VTK_OVERRIDE;
- unsigned char* GetBinaryData(int part) VTK_OVERRIDE;
- int GetBinarySize(int part) VTK_OVERRIDE;
- int GetNumberOfParts() VTK_OVERRIDE;
+ void GenerateBinaryData() override;
+ unsigned char* GetBinaryData(int part) override;
+ int GetBinarySize(int part) override;
+ int GetNumberOfParts() override;
void GetPoints(vtkTriangleFilter* polydata, vtkActor* actor, int maxSize);
diff --git a/Web/WebGLExporter/vtkWebGLWidget.h b/Web/WebGLExporter/vtkWebGLWidget.h
index a33ad25213c716960839b75e2f7a6efe7dbd6502..3a01bd59fd8ac7cc4cf23e4a4bd6d9ae1df48578 100644
--- a/Web/WebGLExporter/vtkWebGLWidget.h
+++ b/Web/WebGLExporter/vtkWebGLWidget.h
@@ -33,12 +33,12 @@ class VTKWEBGLEXPORTER_EXPORT vtkWebGLWidget : public vtkWebGLObject
public:
static vtkWebGLWidget* New();
vtkTypeMacro(vtkWebGLWidget, vtkWebGLObject);
- void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
+ void PrintSelf(ostream &os, vtkIndent indent) override;
- void GenerateBinaryData() VTK_OVERRIDE;
- unsigned char* GetBinaryData(int part) VTK_OVERRIDE;
- int GetBinarySize(int part) VTK_OVERRIDE;
- int GetNumberOfParts() VTK_OVERRIDE;
+ void GenerateBinaryData() override;
+ unsigned char* GetBinaryData(int part) override;
+ int GetBinarySize(int part) override;
+ int GetNumberOfParts() override;
void GetDataFromColorMap(vtkActor2D* actor);
diff --git a/Wrapping/PythonCore/vtkPythonCommand.h b/Wrapping/PythonCore/vtkPythonCommand.h
index 004664a66fc00c071fd944d77ed0717e7a7e406b..7a9138e88492e6ed921118fde3d5c27ce9816ba9 100644
--- a/Wrapping/PythonCore/vtkPythonCommand.h
+++ b/Wrapping/PythonCore/vtkPythonCommand.h
@@ -30,7 +30,7 @@ public:
void SetObject(PyObject *o);
void SetThreadState(PyThreadState *ts);
- void Execute(vtkObject *ptr, unsigned long eventtype, void *callData) VTK_OVERRIDE;
+ void Execute(vtkObject *ptr, unsigned long eventtype, void *callData) override;
PyObject *obj;
PyThreadState *ThreadState;