Some fixes to compile against ParaView master.

[modules/gui.git] / src / SVTK / SVTK_DeviceActor.h

diff --git a/src/SVTK/SVTK_DeviceActor.h b/src/SVTK/SVTK_DeviceActor.h
index d9471c8c9b85952f861a9a91c0b34407eceee4c5..a2749d030b96c755a8a3458f6c0cafc3c38c772e 100644 (file)
--- a/src/SVTK/SVTK_DeviceActor.h
+++ b/src/SVTK/SVTK_DeviceActor.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2015  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2022  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -46,7 +46,7 @@ class vtkDataSet;
 class vtkShrinkFilter;
 class vtkFeatureEdges;
 class VTKViewer_DataSetMapper;
-class vtkPassThroughFilter;
+class vtkPassThrough;
 class vtkAlgorithmOutput;
 
 #ifdef WIN32
@@ -56,7 +56,7 @@ class vtkAlgorithmOutput;
 class SVTK_EXPORT SVTK_DeviceActor: public vtkLODActor
 {
  public:
-  vtkTypeMacro(SVTK_DeviceActor,vtkLODActor);
+  vtkTypeMacro(SVTK_DeviceActor,vtkLODActor)
 
   static
   SVTK_DeviceActor* 
@@ -90,20 +90,20 @@ class SVTK_EXPORT SVTK_DeviceActor: public vtkLODActor
   /** @name For selection mapping purpose */
   //@{
   virtual
-  int
-  GetNodeObjId(int theVtkID);
+  vtkIdType
+  GetNodeObjId(vtkIdType theVtkID);
 
   virtual
   double* 
-  GetNodeCoord(int theObjID);
+  GetNodeCoord(vtkIdType theObjID);
 
   virtual
-  int
-  GetElemObjId(int theVtkID);
+  vtkIdType
+  GetElemObjId(vtkIdType theVtkID);
 
   virtual
   vtkCell* 
-  GetElemCell(int theObjID);
+  GetElemCell(vtkIdType theObjID);
 
   //! To provide VTK to Object and backward mapping
   virtual 
@@ -112,7 +112,7 @@ class SVTK_EXPORT SVTK_DeviceActor: public vtkLODActor
   //@}
 
   virtual 
-  unsigned long int 
+  vtkMTimeType
   GetMTime();
 
   /** @name For shrink mamnagement purpose */
@@ -279,7 +279,7 @@ class SVTK_EXPORT SVTK_DeviceActor: public vtkLODActor
 
   VTKViewer_GeometryFilter *myGeomFilter;
   VTKViewer_TransformFilter *myTransformFilter;
-  std::vector<vtkPassThroughFilter*> myPassFilter;
+  std::vector<vtkPassThrough*> myPassFilter;
   vtkShrinkFilter* myShrinkFilter;
   vtkFeatureEdges* myFeatureEdges;
   VTKViewer_DataSetMapper* myMapper;