...

[cpPlugins.git] / lib / cpPlugins / Interface / BaseProcessObjects.h

diff --git a/lib/cpPlugins/Interface/BaseProcessObjects.h b/lib/cpPlugins/Interface/BaseProcessObjects.h
index d76d8b6a548f857af187d4bce61a8f993c84feed..a120b8446398233ca6a964161fb9ce0c2cc7b79d 100644 (file)
--- a/lib/cpPlugins/Interface/BaseProcessObjects.h
+++ b/lib/cpPlugins/Interface/BaseProcessObjects.h
@@ -5,32 +5,29 @@
 #include <cpPlugins/Interface/ProcessObject.h>
 
 // -------------------------------------------------------------------------
-#define cpPlugins_Define_ProcessObject( O, S )                  \
-  class cpPlugins_Interface_EXPORT O                            \
-    : public S                                                  \
-  {                                                             \
-  public:                                                       \
-    typedef O                               Self;               \
-    typedef S                               Superclass;         \
-    typedef itk::SmartPointer< Self >       Pointer;            \
-    typedef itk::SmartPointer< const Self > ConstPointer;       \
-  public:                                                       \
-    itkTypeMacro( O, S );                                       \
-  protected:                                                    \
-    O( );                                                       \
-    virtual ~O( );                                              \
-  private:                                                      \
-    O( const Self& );                                           \
-    Self& operator=( const Self& );                             \
+#define cpPlugins_Define_ProcessObject( O, S )                          \
+  class cpPlugins_Interface_EXPORT O                                    \
+    : public S                                                          \
+  {                                                                     \
+  public:                                                               \
+    typedef O                               Self;                       \
+    typedef S                               Superclass;                 \
+    typedef itk::SmartPointer< Self >       Pointer;                    \
+    typedef itk::SmartPointer< const Self > ConstPointer;               \
+  public:                                                               \
+    itkTypeMacro( O, S );                                               \
+    cpPlugins_Id_Macro( cpPlugins::Interface::O, ProcessObject );       \
+  protected:                                                            \
+    O( );                                                               \
+    virtual ~O( );                                                      \
+  private:                                                              \
+    O( const Self& );                                                   \
+    Self& operator=( const Self& );                                     \
   }
 
 // -------------------------------------------------------------------------
 #define cpPlugins_Code_ProcessObject( O )               \
-  cpPlugins::Interface::O::O( ) : Superclass( )         \
-  {                                                     \
-    this->m_ClassName = "cpPlugins::Interface::#O";     \
-    this->m_ClassCategory = "#O";                       \
-  }                                                     \
+  cpPlugins::Interface::O::O( ) : Superclass( ) { }     \
   cpPlugins::Interface::O::~O( ) { }
 
 // -------------------------------------------------------------------------
@@ -51,7 +48,7 @@
 // -------------------------------------------------------------------------
 #define cpPlugins_ArrayVectorImage_Demangle( A, T, DI, DA, I, O, R, F ) \
   if( ( O = I->GetITK< itk::VectorImage< A< T, DA >, DI > >( ) ) != NULL ) \
-    R = this->F< itk::VectorImage< A< T, DA >, DI > >( O )
+   r = this->F< itk::VectorImage< A< T, DA >, DI > >( O )
 
 // -------------------------------------------------------------------------
 #define cpPlugins_Image_Demangle_AllScalarTypes( D, I, O, R, F )        \