...

[cpPlugins.git] / plugins / IO / ImageReader.h

diff --git a/plugins/IO/ImageReader.h b/plugins/IO/ImageReader.h
index 6b2392a291a96c38c51eb8586e947ce168cc101a..2f43f66cffa2aee067bf1c8f197c68d7912a6c67 100644 (file)
--- a/plugins/IO/ImageReader.h
+++ b/plugins/IO/ImageReader.h
@@ -1,57 +1,33 @@
-#ifndef __CPPLUGINSIO__IMAGEREADER__H__
-#define __CPPLUGINSIO__IMAGEREADER__H__
+#ifndef __cpPluginsIO__ImageReader__h__
+#define __cpPluginsIO__ImageReader__h__
 
-#include <plugins/IO/cpPluginsIO_Export.h>
-#include <cpPlugins/ProcessObject.h>
+#include <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 );
+      inline bool _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& );
+      inline bool _GD1( itk::ImageIOBase* io );
   };
 
 } // ecapseman
 
-#endif // __CPPLUGINS__IO__IMAGEREADER__H__
+#endif // __cpPluginsIO__ImageReader__h__
 
 // eof - $RCSfile$