MAC compilation issues solved... Now some tests please

[cpPlugins.git] / lib / cpPlugins / Interface / Mesh.h

diff --git a/lib/cpPlugins/Interface/Mesh.h b/lib/cpPlugins/Interface/Mesh.h
index c934f33b09f3322909252b48d05ef98927b8bfc5..4d1f8fd3494a0146cb1b92398a578d66d373c5ce 100644 (file)
--- a/lib/cpPlugins/Interface/Mesh.h
+++ b/lib/cpPlugins/Interface/Mesh.h
@@ -1,10 +1,10 @@
 #ifndef __CPPLUGINS__INTERFACE__MESH__H__
 #define __CPPLUGINS__INTERFACE__MESH__H__
 
-#include <cpPlugins/Interface/cpPlugins_Interface_Export.h>
 #include <cpPlugins/Interface/DataObject.h>
 
-class vtkPolyData;
+// Some forward declarations
+class vtkObject;
 
 namespace cpPlugins
 {
@@ -24,25 +24,19 @@ namespace cpPlugins
     public:
       itkNewMacro( Self );
       itkTypeMacro( Mesh, DataObject );
+      cpPlugins_Id_Macro( Mesh, DataObject );
 
     public:
-      template< class M >
-        inline void SetITKMesh( itk::DataObject* object );
-
-      template< class M >
-        inline M* GetITKMesh( );
-
-      template< class M >
-        inline const M* GetITKMesh( ) const;
-
-      virtual void SetVTKMesh( vtkPolyData* mesh );
-      virtual vtkPolyData* GetVTKMesh( );
-      virtual const vtkPolyData* GetVTKMesh( ) const;
+      virtual void SetITK( itk::LightObject* o );
+      virtual void SetVTK( vtkObjectBase* o );
 
     protected:
       Mesh( );
       virtual ~Mesh( );
 
+      template< class M >
+        inline void _ITK_2_VTK( itk::LightObject* o );
+
     private:
       // Purposely not implemented
       Mesh( const Self& );