MPR finished

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

diff --git a/lib/cpPlugins/Interface/Object.h b/lib/cpPlugins/Interface/Object.h
index c4a0bfba7bcb84e499728c58bf1b9046f754964c..03eb2ae1f912047a88153ad96031f91a7bb4e480 100644 (file)
--- a/lib/cpPlugins/Interface/Object.h
+++ b/lib/cpPlugins/Interface/Object.h
@@ -1,62 +1,12 @@
 #ifndef __CPPLUGINS__INTERFACE__OBJECT__H__
 #define __CPPLUGINS__INTERFACE__OBJECT__H__
 
-#include <string>
-#include <Pluma/Pluma.hpp>
-#include <cpPlugins/Interface/cpPlugins_Interface_Export.h>
+#include <cpPlugins/Interface/Macros.h>
 
+#include <string>
 #include <itkObject.h>
 #include <itkObjectFactory.h>
 
-// -------------------------------------------------------------------------
-#define CPPLUGINS_PROVIDER_HEADER_BEGIN( TYPE )                 \
-  class cpPlugins_Interface_EXPORT TYPE##Provider               \
-    : public pluma::Provider                                    \
-  {                                                             \
-private:                                                        \
-    friend class pluma::Pluma;                                  \
-    static const unsigned int PLUMA_INTERFACE_VERSION;          \
-    static const unsigned int PLUMA_INTERFACE_LOWEST_VERSION;   \
-    static const std::string PLUMA_PROVIDER_TYPE;               \
-    std::string plumaGetType( ) const                           \
-    { return( PLUMA_PROVIDER_TYPE ); }                          \
-public:                                                         \
-    unsigned int getVersion( ) const                            \
-    { return( PLUMA_INTERFACE_VERSION ); }
-
-// -------------------------------------------------------------------------
-#define CPPLUGINS_PROVIDER_HEADER_END };
-
-// -------------------------------------------------------------------------
-#define CPPLUGINS_PROVIDER_HEADER( TYPE )               \
-  CPPLUGINS_PROVIDER_HEADER_BEGIN( TYPE )               \
-  virtual TYPE::Pointer create( ) const = 0;            \
-  CPPLUGINS_PROVIDER_HEADER_END
-
-// -------------------------------------------------------------------------
-#define CPPLUGINS_PROVIDER_SOURCE( TYPE, Version, LowestVersion )       \
-  PLUMA_PROVIDER_SOURCE( TYPE, Version, LowestVersion )
-
-// -------------------------------------------------------------------------
-#define CPPLUGINS_INHERIT_PROVIDER( TYPE )                              \
-  class TYPE##Provider                                                  \
-    : public cpPlugins::Interface::ObjectProvider                       \
-  {                                                                     \
-  public:                                                               \
-    cpPlugins::Interface::Object::Pointer create( ) const               \
-    {                                                                   \
-      TYPE::Pointer a = TYPE::New( );                                   \
-      cpPlugins::Interface::Object::Pointer b = a.GetPointer( );        \
-      return( b );                                                      \
-    }                                                                   \
-  };
-
-// -------------------------------------------------------------------------
-#define cpPlugins_Id_Macro( name, category )                            \
-  public:                                                               \
-  virtual std::string GetClassName( ) { return( #name ); }              \
-  virtual std::string GetClassCategory( ) { return( category ); }
-
 namespace cpPlugins
 {
   namespace Interface
@@ -75,7 +25,7 @@ namespace cpPlugins
     public:
       itkNewMacro( Self );
       itkTypeMacro( Object, itkObject );
-      cpPlugins_Id_Macro( cpPlugins::Interface::Object, "BaseObject" );
+      cpPlugins_Id_Macro( Object, "BaseObject" );
 
       itkGetStringMacro( Name );
       itkSetStringMacro( Name );
@@ -93,11 +43,6 @@ namespace cpPlugins
       std::string m_Name;
     };
 
-    /**
-     * Plugin provider
-     */
-    CPPLUGINS_PROVIDER_HEADER( Object );
-
   } // ecapseman
 
 } // ecapseman