X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=plugins%2FIO%2FImageReader.h;h=8c6945bb174b7757d01aaa87663b2eb9ba8def45;hb=bfc16201a35d40fb90f8a354307dca5942fc0fcd;hp=6b2392a291a96c38c51eb8586e947ce168cc101a;hpb=201c5026430f9bcc33f9db6a39f5d03db096c860;p=cpPlugins.git

diff --git a/plugins/IO/ImageReader.h b/plugins/IO/ImageReader.h
index 6b2392a..8c6945b 100644
--- a/plugins/IO/ImageReader.h
+++ b/plugins/IO/ImageReader.h
@@ -1,53 +1,29 @@
 #ifndef __CPPLUGINSIO__IMAGEREADER__H__
 #define __CPPLUGINSIO__IMAGEREADER__H__
 
-#include <plugins/IO/cpPluginsIO_Export.h>
-#include <cpPlugins/ProcessObject.h>
+#include <plugins/cpPluginsIO_Export.h>
+#include <cpPlugins/BaseObjects/ProcessObject.h>
 
-namespace itk
-{
-  class ImageIOBase;
-}
+namespace itk { class ImageIOBase; }
 
 namespace cpPluginsIO
 {
   /**
    */
   class cpPluginsIO_EXPORT ImageReader
-    : public cpPlugins::ProcessObject
+    : public cpPlugins::BaseObjects::ProcessObject
   {
-    cpPluginsObject;
-  public:
-    typedef ImageReader                     Self;
-    typedef cpPlugins::ProcessObject        Superclass;
-    typedef itk::SmartPointer< Self >       Pointer;
-    typedef itk::SmartPointer< const Self > ConstPointer;
-
-  public:
-    itkNewMacro( Self );
-    itkTypeMacro( ImageReader, cpPlugins::ProcessObject );
-    cpPlugins_Id_Macro( ImageReader, IO );
+    cpPluginsObject( ImageReader, cpPlugins::BaseObjects::ProcessObject, IO );
 
   public:
-    // Qt dialog creation
-    virtual QDialog* CreateQDialog( ) ITK_OVERRIDE;
+    virtual QDialog* CreateQDialog( ) cpPlugins_OVERRIDE;
 
   protected:
-    ImageReader( );
-    virtual ~ImageReader( );
-
-    virtual void _GenerateData( ) ITK_OVERRIDE;
-
     template< unsigned int _Dim >
       inline void _GD0( itk::ImageIOBase* io );
 
     template< class _TPixel, unsigned int _Dim >
       inline void _GD1( itk::ImageIOBase* io );
-
-  private:
-    // Purposely not implemented
-    ImageReader( const Self& );
-    Self& operator=( const Self& );
   };
 
 } // ecapseman