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 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 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) vtkAOSArrayNewInstanceMacro(vtkAngularPeriodicDataArray) 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* New(); vtkTemplateTypeMacro(vtkArrayIteratorTemplate, 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(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(array), size, save); } void SetVoidArray(void *array, vtkIdType size, int save, - int vtkNotUsed(deleteMethod)) VTK_OVERRIDE + int vtkNotUsed(deleteMethod)) override { this->SetArray(static_cast(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 public: static vtkDenseArray* New(); vtkTemplateTypeMacro(vtkDenseArray, vtkTypedArray) - 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(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* 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 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 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 . 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, 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 public: vtkTemplateTypeMacro(vtkSparseArray, vtkTypedArray) static vtkSparseArray* 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 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(sizeof(vtkStdString::value_type)); } + int GetElementComponentSize() override { return static_cast(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(array), size, save); } void SetVoidArray(void* array, vtkIdType size, int save, - int vtkNotUsed(deleteMethod)) VTK_OVERRIDE + int vtkNotUsed(deleteMethod)) override { this->SetArray(static_cast(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. */ - 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* New() { VTK_STANDARD_NEW_BODY(vtkTestDataArray); } - 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(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(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 && resultChildIndex>=0 && this->ChildIndexChildIndex; @@ -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 && childGetNumberOfChildren() - void ToChild(int child) VTK_OVERRIDE + void ToChild(int child) override { assert("pre: not_leaf" && !CurrentIsLeaf()); assert("pre: valid_child" && child>=0 && childGetNumberOfChildren()); @@ -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 *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 *o=vtkCompactHyperOctreeCursor::SafeDownCast(other); @@ -365,7 +365,7 @@ public: // uniform grid of 1<=0 && d=0 && result<(1<=0 && dGetDimension()); @@ -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<=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 *result = vtkCompactHyperOctreeCursor::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* octree = vtkCompactHyperOctree::SafeDownCast(src); @@ -710,7 +710,7 @@ public: } //--------------------------------------------------------------------------- - vtkIdType GetNumberOfLeaves() VTK_OVERRIDE + vtkIdType GetNumberOfLeaves() override { return static_cast(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(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* New(); //--------------------------------------------------------------------------- - void SetTree( vtkHyperTree* tree ) VTK_OVERRIDE + void SetTree( vtkHyperTree* tree ) override { this->Tree = vtkCompactHyperTree::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( 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* 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 *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* 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* result = vtkCompactHyperTreeCursor::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( this->ParentIndex.size() ); } //--------------------------------------------------------------------------- - vtkIdType GetNumberOfNodes() VTK_OVERRIDE + vtkIdType GetNumberOfNodes() override { return this->NumberOfNodes; } //--------------------------------------------------------------------------- - vtkIdType GetNumberOfLeaves() VTK_OVERRIDE + vtkIdType GetNumberOfLeaves() override { return static_cast( 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( 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( 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 ) * 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* 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* 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,vtkGeometricCursor); //--------------------------------------------------------------------------- - 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* 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* New(); //--------------------------------------------------------------------------- - ~vtkVonNeumannSuperCursor() VTK_OVERRIDE + ~vtkVonNeumannSuperCursor() override { if ( this->Cursors ) { @@ -662,7 +662,7 @@ public: } //--------------------------------------------------------------------------- - vtkHyperTreeGridCursor* Clone() VTK_OVERRIDE + vtkHyperTreeGridCursor* Clone() override { // Call superclass vtkVonNeumannSuperCursor* 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* New(); //--------------------------------------------------------------------------- - ~vtkMooreSuperCursor() VTK_OVERRIDE + ~vtkMooreSuperCursor() override { if ( this->Cursors ) { @@ -1127,7 +1127,7 @@ public: } //--------------------------------------------------------------------------- - vtkHyperTreeGridCursor* Clone() VTK_OVERRIDE + vtkHyperTreeGridCursor* Clone() override { // Call superclass vtkMooreSuperCursor* 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=0 && childGetNumberOfChildren() */ - 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 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 ThisType; static vtkMappedUnstructuredGridCellIterator *New(); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; void SetMappedUnstructuredGrid( vtkMappedUnstructuredGrid *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 *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(this->InternalIdx) < this->DataBlocks->size()? (*this->DataBlocks)[this->InternalIdx].Index : 0; } - bool IsDone() VTK_OVERRIDE { return static_cast(this->InternalIdx) >= this->DataBlocks->size();} + bool IsDone() override { return static_cast(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 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())<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 Executives; std::vector 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 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 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 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 >& 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 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 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(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(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(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(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(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/vtkPlane