X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcpPlugins%2FInterface%2FDataObject.h;h=aad997708c5a8df08947efb2065d76f2e1be2e06;hb=4f6c47b5d9994cd1bbb601bfe8bc087a0a619e72;hp=cc8d8bfe60a66ce81cfce5f54d988a45f06b5912;hpb=2361f4f97631e09d88d8a5510a369817dcaa19db;p=cpPlugins.git

diff --git a/lib/cpPlugins/Interface/DataObject.h b/lib/cpPlugins/Interface/DataObject.h
index cc8d8bf..aad9977 100644
--- 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/cpPlugins_Export.h>
+#include <cpPlugins/Interface/cpPlugins_Interface_Export.h>
 #include <cpPlugins/Interface/Object.h>
 
-#define ITK_MANUAL_INSTANTIATION
 #include <itkDataObject.h>
 
 namespace cpPlugins
@@ -17,7 +16,7 @@ namespace cpPlugins
   {
     /**
      */
-    class cpPlugins_EXPORT DataObject
+    class cpPlugins_Interface_EXPORT DataObject
       : public Object
     {
     public:
@@ -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