Widget integration (step 2/6). WARNING: IT DOES NOT COMPILE YETgit shortlog !

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

diff --git a/lib/cpPlugins/Interface/DataObject.h b/lib/cpPlugins/Interface/DataObject.h
index e61da5cbef4f04b82e41afccb1e092008795cd63..aad997708c5a8df08947efb2065d76f2e1be2e06 100644 (file)
--- a/lib/cpPlugins/Interface/DataObject.h
+++ b/lib/cpPlugins/Interface/DataObject.h
@@ -3,12 +3,11 @@
 
 #include <map>
 #include <string>
-#include <vtkDataObject.h>
+#include <vtkObject.h>
 #include <vtkSmartPointer.h>
 #include <cpPlugins/Interface/cpPlugins_Interface_Export.h>
 #include <cpPlugins/Interface/Object.h>
 
-#define ITK_MANUAL_INSTANTIATION
 #include <itkDataObject.h>
 
 namespace cpPlugins
@@ -30,14 +29,6 @@ namespace cpPlugins
       itkTypeMacro( DataObject, Object );
 
     public:
-      virtual itk::DataObject* GetITKDataObject( );
-      virtual const itk::DataObject* GetITKDataObject( ) const;
-      virtual void SetITKDataObject( itk::DataObject* o ) = 0;
-
-      virtual vtkDataObject* GetVTKDataObject( );
-      virtual const vtkDataObject* GetVTKDataObject( ) const;
-      virtual void SetVTKDataObject( vtkDataObject* o ) = 0;
-
       Object* GetSource( );
       const Object* GetSource( ) const;
       void SetSource( Object* src );
@@ -54,9 +45,9 @@ namespace cpPlugins
       Self& operator=( const Self& );
 
     protected:
-      itk::DataObject::Pointer         m_ITKObject;
-      vtkSmartPointer< vtkDataObject > m_VTKObject;
-      Object::Pointer                  m_Source;
+      itk::DataObject::Pointer     m_ITKObject;
+      vtkSmartPointer< vtkObject > m_VTKObject;
+      Object::Pointer              m_Source;
     };
 
   } // ecapseman