Some syntax simplifations

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

diff --git a/lib/cpPlugins/Plugins/MeshReader.h b/lib/cpPlugins/Plugins/MeshReader.h
index 968c4ac5ae536c10291f4f719780aa54308f7487..f16f843926e296fae4f81b33055e8ad658c00c7c 100644 (file)
--- a/lib/cpPlugins/Plugins/MeshReader.h
+++ b/lib/cpPlugins/Plugins/MeshReader.h
@@ -2,7 +2,7 @@
 #define __CPPLUGINS__PLUGINS__MESHREADER__H__
 
 #include <cpPlugins/Plugins/cpPlugins_Export.h>
-#include <cpPlugins/Interface/SourceObject.h>
+#include <cpPlugins/Interface/MeshSource.h>
 #include <itkProcessObject.h>
 
 namespace cpPlugins
@@ -12,22 +12,28 @@ namespace cpPlugins
     /**
      */
     class cpPlugins_EXPORT MeshReader
-      : public cpPlugins::Interface::SourceObject
+      : public cpPlugins::Interface::MeshSource
     {
     public:
-      typedef MeshReader                         Self;
-      typedef cpPlugins::Interface::SourceObject Superclass;
+      typedef MeshReader                       Self;
+      typedef cpPlugins::Interface::MeshSource Superclass;
+      typedef itk::SmartPointer< Self >        Pointer;
+      typedef itk::SmartPointer< const Self >  ConstPointer;
 
       typedef Superclass::TParameter  TParameter;
       typedef Superclass::TParameters TParameters;
 
     public:
-      MeshReader( );
-      virtual ~MeshReader( );
+      itkNewMacro( Self );
+      itkTypeMacro( MeshReader, cpPluginsInterfaceMeshSource );
 
+    public:
       virtual std::string GetClassName( ) const;
 
     protected:
+      MeshReader( );
+      virtual ~MeshReader( );
+
       virtual std::string _GenerateData( );
 
       template< unsigned int D >
@@ -36,12 +42,14 @@ namespace cpPlugins
       template< class P, unsigned int D >
         std::string _GD1( );
 
-    protected:
-      itk::ProcessObject::Pointer m_Reader;
+    private:
+      // Purposely not implemented
+      MeshReader( const Self& );
+      Self& operator=( const Self& );
     };
 
     // ---------------------------------------------------------------------
-    PLUMA_INHERIT_PROVIDER( MeshReader, cpPlugins::Interface::Object );
+    CPPLUGINS_INHERIT_PROVIDER( MeshReader );
 
   } // ecapseman