Fix compilation.

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

diff --git a/projects/sgconf/corps.cpp b/projects/sgconf/corps.cpp
index 4bd436dd2f56676e09e165fb4c78a2563d04b8ba..2dd0ffff89a9d51820df0c5354096e771fb59300 100644 (file)
--- a/projects/sgconf/corps.cpp
+++ b/projects/sgconf/corps.cpp
@@ -2,6 +2,7 @@
 
 #include "api_action.h"
 #include "options.h"
+#include "makeproto.h"
 #include "config.h"
 #include "utils.h"
 
@@ -24,7 +25,7 @@ if (level == 0)
 return dash ? std::string(level * 4 - 2, ' ') + "- " : std::string(level * 4, ' ');
 }
 
-void PrintCorp(const STG::GET_CORP::INFO & info, size_t level = 0)
+void PrintCorp(const STG::GetCorp::Info & info, size_t level = 0)
 {
 std::cout << Indent(level, true) << "name: " << info.name << "\n"
           << Indent(level)       << "cash: " << info.cash << "\n";
@@ -51,7 +52,7 @@ std::cout << "Success.\n";
 
 void GetCorpsCallback(bool result,
                       const std::string & reason,
-                      const std::vector<STG::GET_CORP::INFO> & info,
+                      const std::vector<STG::GetCorp::Info> & info,
                       void * /*data*/)
 {
 if (!result)
@@ -66,7 +67,7 @@ for (size_t i = 0; i < info.size(); ++i)
 
 void GetCorpCallback(bool result,
                      const std::string & reason,
-                     const STG::GET_CORP::INFO & info,
+                     const STG::GetCorp::Info & info,
                      void * /*data*/)
 {
 if (!result)
@@ -81,71 +82,41 @@ bool GetCorpsFunction(const SGCONF::CONFIG & config,
                       const std::string & /*arg*/,
                       const std::map<std::string, std::string> & /*options*/)
 {
-STG::SERVCONF proto(config.server.data(),
-                    config.port.data(),
-                    config.localAddress.data(),
-                    config.localPort.data(),
-                    config.userName.data(),
-                    config.userPass.data());
-return proto.GetCorporations(GetCorpsCallback, NULL) == STG::st_ok;
+return makeProto(config).GetCorporations(GetCorpsCallback, NULL) == STG::st_ok;
 }
 
 bool GetCorpFunction(const SGCONF::CONFIG & config,
                      const std::string & arg,
                      const std::map<std::string, std::string> & /*options*/)
 {
-STG::SERVCONF proto(config.server.data(),
-                    config.port.data(),
-                    config.localAddress.data(),
-                    config.localPort.data(),
-                    config.userName.data(),
-                    config.userPass.data());
-return proto.GetCorp(arg, GetCorpCallback, NULL) == STG::st_ok;
+return makeProto(config).GetCorp(arg, GetCorpCallback, NULL) == STG::st_ok;
 }
 
 bool DelCorpFunction(const SGCONF::CONFIG & config,
                      const std::string & arg,
                      const std::map<std::string, std::string> & /*options*/)
 {
-STG::SERVCONF proto(config.server.data(),
-                    config.port.data(),
-                    config.localAddress.data(),
-                    config.localPort.data(),
-                    config.userName.data(),
-                    config.userPass.data());
-return proto.DelCorp(arg, SimpleCallback, NULL) == STG::st_ok;
+return makeProto(config).DelCorp(arg, SimpleCallback, NULL) == STG::st_ok;
 }
 
 bool AddCorpFunction(const SGCONF::CONFIG & config,
                      const std::string & arg,
                      const std::map<std::string, std::string> & options)
 {
-CORP_CONF_RES conf;
+STG::CorpConfOpt conf;
 conf.name = arg;
 SGCONF::MaybeSet(options, "cash", conf.cash);
-STG::SERVCONF proto(config.server.data(),
-                    config.port.data(),
-                    config.localAddress.data(),
-                    config.localPort.data(),
-                    config.userName.data(),
-                    config.userPass.data());
-return proto.AddCorp(arg, conf, SimpleCallback, NULL) == STG::st_ok;
+return makeProto(config).AddCorp(arg, conf, SimpleCallback, NULL) == STG::st_ok;
 }
 
 bool ChgCorpFunction(const SGCONF::CONFIG & config,
                      const std::string & arg,
                      const std::map<std::string, std::string> & options)
 {
-CORP_CONF_RES conf;
+STG::CorpConfOpt conf;
 conf.name = arg;
 SGCONF::MaybeSet(options, "cash", conf.cash);
-STG::SERVCONF proto(config.server.data(),
-                    config.port.data(),
-                    config.localAddress.data(),
-                    config.localPort.data(),
-                    config.userName.data(),
-                    config.userPass.data());
-return proto.ChgCorp(conf, SimpleCallback, NULL) == STG::st_ok;
+return makeProto(config).ChgCorp(conf, SimpleCallback, NULL) == STG::st_ok;
 }
 
 } // namespace anonymous