X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcpPlugins%2FInterface%2FDataObject.h;h=e2d79ffcc16ba3313d4b50b2b1e4e7f26759a60e;hb=35d769c683c10f5c18d17a3e423d89f5b30a5b77;hp=3347b64d1ad4312784056b01bb1b838a5239f10e;hpb=d1d816d1eaf980d5cd266798b8f7a0bbb089a383;p=cpPlugins.git

diff --git a/lib/cpPlugins/Interface/DataObject.h b/lib/cpPlugins/Interface/DataObject.h
index 3347b64..e2d79ff 100644
--- a/lib/cpPlugins/Interface/DataObject.h
+++ b/lib/cpPlugins/Interface/DataObject.h
@@ -1,18 +1,15 @@
 #ifndef __CPPLUGINS__INTERFACE__DATAOBJECT__H__
 #define __CPPLUGINS__INTERFACE__DATAOBJECT__H__
 
-#include <cpPlugins/Interface/cpPlugins_Interface_Export.h>
 #include <cpPlugins/Interface/Object.h>
 
-#include <itkObject.h>
-
-#include <vtkSmartPointer.h>
-#include <vtkObject.h>
-
 namespace cpPlugins
 {
   namespace Interface
   {
+    // Some forward declarations
+    class ProcessObject;
+
     /**
      */
     class cpPlugins_Interface_EXPORT DataObject
@@ -25,27 +22,17 @@ namespace cpPlugins
       typedef itk::SmartPointer< const Self > ConstPointer;
 
     public:
+      itkNewMacro( Self );
       itkTypeMacro( DataObject, Object );
+      cpPlugins_Id_Macro( DataObject, BasicObject );
 
     public:
-      Object* GetSource( );
-      const Object* GetSource( ) const;
-      void SetSource( Object* src );
+      ProcessObject* GetSource( );
+      const ProcessObject* GetSource( ) const;
+      void SetSource( ProcessObject* src );
 
       void DisconnectPipeline( );
 
-      template< class T >
-        inline T* GetITK( );
-
-      template< class T >
-        inline const T* GetITK( ) const;
-
-      template< class T >
-        inline T* GetVTK( );
-
-      template< class T >
-        inline const T* GetVTK( ) const;
-
     protected:
       DataObject( );
       virtual ~DataObject( );
@@ -56,17 +43,13 @@ namespace cpPlugins
       Self& operator=( const Self& );
 
     protected:
-      itk::Object::Pointer         m_ITKObject;
-      vtkSmartPointer< vtkObject > m_VTKObject;
-      Object::Pointer              m_Source;
+      ProcessObject* m_Source;
     };
 
   } // ecapseman
 
 } // ecapseman
 
-#include <cpPlugins/Interface/DataObject.hxx>
-
 #endif // __CPPLUGINS__INTERFACE__DATAOBJECT__H__
 
 // eof - $RCSfile$