More on parameters simplification

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

diff --git a/lib/cpPlugins/Interface/ProcessObject.h b/lib/cpPlugins/Interface/ProcessObject.h
index f4c80ae21a7fcf712406b4adc88e3a2f23f47603..a9779282c8a59e37973504e1ec04730a4bf2a5ae 100644 (file)
--- a/lib/cpPlugins/Interface/ProcessObject.h
+++ b/lib/cpPlugins/Interface/ProcessObject.h
@@ -1,12 +1,11 @@
 #ifndef __CPPLUGINS__INTERFACE__PROCESSOBJECT__H__
 #define __CPPLUGINS__INTERFACE__PROCESSOBJECT__H__
 
-#include <map>
-#include <string>
 #include <itkProcessObject.h>
 #include <cpPlugins/Interface/cpPlugins_Interface_Export.h>
 #include <cpPlugins/Interface/Object.h>
 #include <cpPlugins/Interface/DataObject.h>
+#include <cpPlugins/Interface/Parameters.h>
 
 namespace cpPlugins
 {
@@ -23,17 +22,14 @@ namespace cpPlugins
       typedef itk::SmartPointer< Self >       Pointer;
       typedef itk::SmartPointer< const Self > ConstPointer;
 
-      typedef std::pair< std::string, std::string > TParameter;
-      typedef std::map< std::string, TParameter >   TParameters;
-
     public:
       itkTypeMacro( ProcessObject, Object );
 
     public:
       virtual std::string GetClassName( ) const;
       virtual std::string GetClassType( ) const;
-      virtual const TParameters& GetDefaultParameters( ) const;
-      virtual void SetParameters( const TParameters& params );
+      virtual const Parameters& GetDefaultParameters( ) const;
+      virtual void SetParameters( const Parameters& params );
 
       virtual unsigned int GetNumberOfInputs( ) const;
       virtual unsigned int GetNumberOfOutputs( ) const;
@@ -72,8 +68,8 @@ namespace cpPlugins
 
     protected:
       itk::ProcessObject::Pointer m_RealProcessObject;
-      TParameters m_DefaultParameters;
-      TParameters m_Parameters;
+      Parameters m_DefaultParameters;
+      Parameters m_Parameters;
 
       std::vector< DataObject::Pointer > m_Inputs;
       std::vector< DataObject::Pointer > m_Outputs;