From 055a66f0a236a7646387e58f79b914fc8ca40ed9 Mon Sep 17 00:00:00 2001 From: Charles PIGNEROL <> Date: Tue, 18 Nov 2025 13:17:55 +0100 Subject: [PATCH] Fast VTK 9 porting --- src/QtVtkComponents/QtVtkMgx3DApplication.cpp | 1 + .../protected/VtkComponents/vtkECMAreaPicker.h | 4 ++-- .../VtkComponents/vtkECMExtractSelectedFrustum.h | 14 +++++++------- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/QtVtkComponents/QtVtkMgx3DApplication.cpp b/src/QtVtkComponents/QtVtkMgx3DApplication.cpp index 58cd9709..79346342 100644 --- a/src/QtVtkComponents/QtVtkMgx3DApplication.cpp +++ b/src/QtVtkComponents/QtVtkMgx3DApplication.cpp @@ -24,6 +24,7 @@ #include #include #include +#include #include using namespace std; diff --git a/src/VtkComponents/protected/VtkComponents/vtkECMAreaPicker.h b/src/VtkComponents/protected/VtkComponents/vtkECMAreaPicker.h index 09b21230..501b0a0a 100644 --- a/src/VtkComponents/protected/VtkComponents/vtkECMAreaPicker.h +++ b/src/VtkComponents/protected/VtkComponents/vtkECMAreaPicker.h @@ -173,8 +173,8 @@ class VTKRENDERINGCORE_EXPORT vtkECMAreaPicker : public vtkAbstractPropPicker double Y1; private: - vtkECMAreaPicker(const vtkECMAreaPicker&) VTK_DELETE_FUNCTION; - void operator=(const vtkECMAreaPicker&) VTK_DELETE_FUNCTION; + vtkECMAreaPicker(const vtkECMAreaPicker&); + void operator=(const vtkECMAreaPicker&); }; #endif diff --git a/src/VtkComponents/protected/VtkComponents/vtkECMExtractSelectedFrustum.h b/src/VtkComponents/protected/VtkComponents/vtkECMExtractSelectedFrustum.h index 8f4b90d7..afd093fd 100644 --- a/src/VtkComponents/protected/VtkComponents/vtkECMExtractSelectedFrustum.h +++ b/src/VtkComponents/protected/VtkComponents/vtkECMExtractSelectedFrustum.h @@ -63,12 +63,12 @@ class VTKFILTERSGENERAL_EXPORT vtkECMExtractSelectedFrustum : public vtkExtractS public: static vtkECMExtractSelectedFrustum *New(); vtkTypeMacro(vtkECMExtractSelectedFrustum, vtkExtractSelectionBase); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent); /** * Return the MTime taking into account changes to the Frustum */ - vtkMTimeType GetMTime() VTK_OVERRIDE; + vtkMTimeType GetMTime(); //@{ /** @@ -151,16 +151,16 @@ class VTKFILTERSGENERAL_EXPORT vtkECMExtractSelectedFrustum : public vtkExtractS protected: vtkECMExtractSelectedFrustum(vtkPlanes *f=NULL); - ~vtkECMExtractSelectedFrustum() VTK_OVERRIDE; + ~vtkECMExtractSelectedFrustum(); // sets up output dataset int RequestDataObject(vtkInformation* request, vtkInformationVector** inputVector, - vtkInformationVector* outputVector) VTK_OVERRIDE; + vtkInformationVector* outputVector); //execution int RequestData(vtkInformation *, - vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE; + vtkInformationVector **, vtkInformationVector *); int ABoxFrustumIsect(double bounds[], vtkCell *cell); int FrustumClipPolygon(int nverts, double *ivlist, double *wvlist, double *ovlist); @@ -193,8 +193,8 @@ class VTKFILTERSGENERAL_EXPORT vtkECMExtractSelectedFrustum : public vtkExtractS int ShowBounds; private: - vtkECMExtractSelectedFrustum(const vtkECMExtractSelectedFrustum&) VTK_DELETE_FUNCTION; - void operator=(const vtkECMExtractSelectedFrustum&) VTK_DELETE_FUNCTION; + vtkECMExtractSelectedFrustum(const vtkECMExtractSelectedFrustum&); + void operator=(const vtkECMExtractSelectedFrustum&); };