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 ae7292891d2b1cfccb226a596f9c7bff1b1459eb..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/cpPlugins_Export.h>
 #include <cpPlugins/Interface/DataObject.h>
 
-class vtkPolyData;
+// Some forward declarations
+class vtkObject;
 
 namespace cpPlugins
 {
@@ -12,7 +12,7 @@ namespace cpPlugins
   {
     /**
      */
-    class cpPlugins_EXPORT Mesh
+    class cpPlugins_Interface_EXPORT Mesh
       : public DataObject
     {
     public:
@@ -24,29 +24,18 @@ namespace cpPlugins
     public:
       itkNewMacro( Self );
       itkTypeMacro( Mesh, DataObject );
+      cpPlugins_Id_Macro( Mesh, DataObject );
 
     public:
-      virtual void SetITKDataObject( itk::DataObject* o );
-      virtual void SetVTKDataObject( vtkDataObject* o );
-
-      vtkPolyData* GetVTKPolyData( );
-      const vtkPolyData* GetVTKPolyData( ) const;
+      virtual void SetITK( itk::LightObject* o );
+      virtual void SetVTK( vtkObjectBase* o );
 
     protected:
       Mesh( );
       virtual ~Mesh( );
 
-      template< unsigned int D >
-        void _ITK_2_VTK_0( itk::DataObject* o );
-
-      template< class P, unsigned int D >
-        void _ITK_2_VTK_1( itk::DataObject* o );
-
-      template< unsigned int D >
-        void _VTK_2_ITK_0( itk::DataObject* o );
-
-      template< class P, unsigned int D >
-        void _VTK_2_ITK_1( itk::DataObject* o );
+      template< class M >
+        inline void _ITK_2_VTK( itk::LightObject* o );
 
     private:
       // Purposely not implemented
@@ -58,6 +47,8 @@ namespace cpPlugins
 
 } // ecapseman
 
+#include <cpPlugins/Interface/Mesh.hxx>
+
 #endif // __CPPLUGINS__INTERFACE__MESH__H__
 
 // eof - $RCSfile$