Some syntax simplifations

[cpPlugins.git] / lib / cpPlugins / Plugins / ImageReader.h

diff --git a/lib/cpPlugins/Plugins/ImageReader.h b/lib/cpPlugins/Plugins/ImageReader.h
index 6110c928f276cdfee78234b139ebcebea20298d6..b16cf0ea34002b77a5d1b28cf6bab9f89bdbf997 100644 (file)
--- a/lib/cpPlugins/Plugins/ImageReader.h
+++ b/lib/cpPlugins/Plugins/ImageReader.h
@@ -1,7 +1,8 @@
 #ifndef __CPPLUGINS__PLUGINS__IMAGEREADER__H__
 #define __CPPLUGINS__PLUGINS__IMAGEREADER__H__
 
-#include <cpPlugins/Interface/SourceObject.h>
+#include <cpPlugins/Plugins/cpPlugins_Export.h>
+#include <cpPlugins/Interface/ImageSource.h>
 #include <itkProcessObject.h>
 
 namespace cpPlugins
@@ -10,38 +11,45 @@ namespace cpPlugins
   {
     /**
      */
-    class ImageReader
-      : public cpPlugins::Interface::SourceObject
+    class cpPlugins_EXPORT ImageReader
+      : public cpPlugins::Interface::ImageSource
     {
     public:
-      typedef ImageReader                        Self;
-      typedef cpPlugins::Interface::SourceObject Superclass;
+      typedef ImageReader                       Self;
+      typedef cpPlugins::Interface::ImageSource Superclass;
+      typedef itk::SmartPointer< Self >         Pointer;
+      typedef itk::SmartPointer< const Self >   ConstPointer;
 
       typedef Superclass::TParameter  TParameter;
       typedef Superclass::TParameters TParameters;
 
     public:
-      ImageReader( );
-      virtual ~ImageReader( );
+      itkNewMacro( Self );
+      itkTypeMacro( ImageReader, cpPluginsInterfaceImageSource );
 
+    public:
       virtual std::string GetClassName( ) const;
 
     protected:
+      ImageReader( );
+      virtual ~ImageReader( );
 
-      virtual bool _GenerateData( );
+      virtual std::string _GenerateData( );
 
       template< unsigned int D >
-      bool _GenerateData0( );
+      std::string _GD0( );
 
       template< class P, unsigned int D >
-      bool _GenerateData1( );
+      std::string _GD1( );
 
-    protected:
-      itk::ProcessObject::Pointer m_Reader;
+    private:
+      // Purposely not implemented
+      ImageReader( const Self& );
+      Self& operator=( const Self& );
     };
 
     // ---------------------------------------------------------------------
-    PLUMA_INHERIT_PROVIDER( ImageReader, cpPlugins::Interface::Object );
+    CPPLUGINS_INHERIT_PROVIDER( ImageReader );
 
   } // ecapseman