X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcpPlugins%2FInterface%2FDataObject.h;h=e2d79ffcc16ba3313d4b50b2b1e4e7f26759a60e;hb=1b600247da314fe62d007ca8a0ce24d0006931f4;hp=3f561a2a23e40c9ab1d464c161fe2390e9627140;hpb=2e68bf3e3a3433d77adbc67cebc17fd5cb0111f6;p=cpPlugins.git

diff --git a/lib/cpPlugins/Interface/DataObject.h b/lib/cpPlugins/Interface/DataObject.h
index 3f561a2..e2d79ff 100644
--- a/lib/cpPlugins/Interface/DataObject.h
+++ b/lib/cpPlugins/Interface/DataObject.h
@@ -1,16 +1,13 @@
 #ifndef __CPPLUGINS__INTERFACE__DATAOBJECT__H__
 #define __CPPLUGINS__INTERFACE__DATAOBJECT__H__
 
-#include <map>
-#include <string>
-#include <itkDataObject.h>
-#include <cpPlugins/Interface/cpPlugins_Interface_Export.h>
 #include <cpPlugins/Interface/Object.h>
 
 namespace cpPlugins
 {
   namespace Interface
   {
+    // Some forward declarations
     class ProcessObject;
 
     /**
@@ -19,26 +16,34 @@ namespace cpPlugins
       : public Object
     {
     public:
-      typedef DataObject Self;
-      typedef Object     Superclass;
+      typedef DataObject                      Self;
+      typedef Object                          Superclass;
+      typedef itk::SmartPointer< Self >       Pointer;
+      typedef itk::SmartPointer< const Self > ConstPointer;
 
     public:
-      DataObject( );
-      virtual ~DataObject( );
-
-      virtual std::string GetClassName( ) const;
+      itkNewMacro( Self );
+      itkTypeMacro( DataObject, Object );
+      cpPlugins_Id_Macro( DataObject, BasicObject );
 
-      itk::DataObject* GetDataObject( ) const;
-      virtual void SetDataObject( itk::DataObject* dobj );
-
-      ProcessObject* GetSource( ) const;
+    public:
+      ProcessObject* GetSource( );
+      const ProcessObject* GetSource( ) const;
       void SetSource( ProcessObject* src );
 
       void DisconnectPipeline( );
 
     protected:
-      itk::DataObject::Pointer m_DataObject;
-      ProcessObject*           m_Source;
+      DataObject( );
+      virtual ~DataObject( );
+
+    private:
+      // Purposely not implemented
+      DataObject( const Self& );
+      Self& operator=( const Self& );
+
+    protected:
+      ProcessObject* m_Source;
     };
 
   } // ecapseman