...

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

diff --git a/lib/cpPlugins/Interface/DataObject.h b/lib/cpPlugins/Interface/DataObject.h
index 46682197b81eee9b3bae03f355965dec90b18e20..e2d79ffcc16ba3313d4b50b2b1e4e7f26759a60e 100644 (file)
--- a/lib/cpPlugins/Interface/DataObject.h
+++ b/lib/cpPlugins/Interface/DataObject.h
@@ -3,10 +3,6 @@
 
 #include <cpPlugins/Interface/Object.h>
 
-#include <itkObject.h>
-#include <vtkSmartPointer.h>
-#include <vtkObject.h>
-
 namespace cpPlugins
 {
   namespace Interface
@@ -26,8 +22,9 @@ namespace cpPlugins
       typedef itk::SmartPointer< const Self > ConstPointer;
 
     public:
+      itkNewMacro( Self );
       itkTypeMacro( DataObject, Object );
-      cpPlugins_Id_Macro( DataObject, "BasicObject" );
+      cpPlugins_Id_Macro( DataObject, BasicObject );
 
     public:
       ProcessObject* GetSource( );
@@ -36,18 +33,6 @@ namespace cpPlugins
 
       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( );
@@ -58,17 +43,13 @@ namespace cpPlugins
       Self& operator=( const Self& );
 
     protected:
-      itk::Object::Pointer         m_ITKObject;
-      vtkSmartPointer< vtkObject > m_VTKObject;
-      ProcessObject*               m_Source;
+      ProcessObject* m_Source;
     };
 
   } // ecapseman
 
 } // ecapseman
 
-#include <cpPlugins/Interface/DataObject.hxx>
-
 #endif // __CPPLUGINS__INTERFACE__DATAOBJECT__H__
 
 // eof - $RCSfile$