Merge remote-tracking branch 'origin/master' into ticket

[stg.git] / projects / sgconf / api_action.cpp

diff --git a/projects/sgconf/api_action.cpp b/projects/sgconf/api_action.cpp
index 1ff0e5967915faa0c9a9c678dc3737081986bbee..d5b1e8e65089b668f0b42c033d47a5f2e627487a 100644 (file)
--- a/projects/sgconf/api_action.cpp
+++ b/projects/sgconf/api_action.cpp
@@ -1,8 +1,9 @@
 #include "api_action.h"
 
+#include "actions.h"
 #include "parser_state.h"
 
-SGCONF::PARSER_STATE SGCONF::API_ACTION::Parse(int argc, char ** argv)
+SGCONF::PARSER_STATE SGCONF::API_ACTION::Parse(int argc, char ** argv, void * /*data*/)
 {
 PARSER_STATE state(false, argc, argv);
 if (!m_argument.empty())
@@ -15,7 +16,25 @@ if (!m_argument.empty())
     --state.argc;
     ++state.argv;
     }
-m_suboptions.Parse(state.argc, state.argv);
+state = m_suboptions.Parse(state.argc, state.argv, &m_params);
 m_commands.Add(m_funPtr, m_argument, m_params);
 return state;
 }
+
+SGCONF::API_ACTION::API_ACTION(COMMANDS & commands,
+                               const std::string & paramDescription,
+                               bool needArgument,
+                               const std::vector<PARAM> & params,
+                               API_FUNCTION funPtr)
+    : m_commands(commands),
+      m_description(paramDescription),
+      m_argument(needArgument ? "1" : ""), // Hack
+      m_funPtr(funPtr)
+{
+std::vector<PARAM>::const_iterator it(params.begin());
+while (it != params.end())
+    {
+    m_suboptions.Add(it->name, MakeKVAction(it->name, it->shortDescr), it->longDescr);
+    ++it;
+    }
+}