Adding and connecting users separated in main

[stg.git] / projects / stargazer / plugins / configuration / sgconfig / stgconfig.cpp

diff --git a/projects/stargazer/plugins/configuration/sgconfig/stgconfig.cpp b/projects/stargazer/plugins/configuration/sgconfig/stgconfig.cpp
index d2ad12b79d2944e5234210cc9e1a6a276448ecac..9ffbc94963e6e4f049d29b27fad153cd529b17ae 100644 (file)
--- a/projects/stargazer/plugins/configuration/sgconfig/stgconfig.cpp
+++ b/projects/stargazer/plugins/configuration/sgconfig/stgconfig.cpp
@@ -2,10 +2,12 @@
 #include <unistd.h>
 #include <signal.h>
 
 #include <unistd.h>
 #include <signal.h>
 

+#include <algorithm>
+
+#include "stg/tariffs.h"
+#include "stg/admins.h"
+#include "stg/users.h"

 #include "stgconfig.h"
 #include "stgconfig.h"

-#include "../../../tariffs.h"
-#include "../../../admins.h"
-#include "../../../users.h"

 
 class STGCONFIG_CREATOR
 {
 
 class STGCONFIG_CREATOR
 {


@@ -39,12 +41,12 @@ STG_CONFIG_SETTINGS::STG_CONFIG_SETTINGS()
 {
 }
 //-----------------------------------------------------------------------------
 {
 }
 //-----------------------------------------------------------------------------

-const string& STG_CONFIG_SETTINGS::GetStrError() const
+const std::string & STG_CONFIG_SETTINGS::GetStrError() const

 {
 return errorStr;
 }
 //-----------------------------------------------------------------------------
 {
 return errorStr;
 }
 //-----------------------------------------------------------------------------

-int STG_CONFIG_SETTINGS::ParseIntInRange(const string & str, int min, int max, int * val)
+int STG_CONFIG_SETTINGS::ParseIntInRange(const std::string & str, int min, int max, int * val)

 {
 if (str2x(str.c_str(), *val))
     {
 {
 if (str2x(str.c_str(), *val))
     {


@@ -66,7 +68,7 @@ PARAM_VALUE pv;
 vector<PARAM_VALUE>::const_iterator pvi;
 ///////////////////////////
 pv.param = "Port";
 vector<PARAM_VALUE>::const_iterator pvi;
 ///////////////////////////
 pv.param = "Port";

-pvi = find(s.moduleParams.begin(), s.moduleParams.end(), pv);
+pvi = std::find(s.moduleParams.begin(), s.moduleParams.end(), pv);

 if (pvi == s.moduleParams.end())
     {
     errorStr = "Parameter \'Port\' not found.";
 if (pvi == s.moduleParams.end())
     {
     errorStr = "Parameter \'Port\' not found.";


@@ -91,14 +93,14 @@ return port;
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------

-BASE_PLUGIN * GetPlugin()
+PLUGIN * GetPlugin()

 {
 return stgc.GetPlugin();
 }
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 {
 return stgc.GetPlugin();
 }
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------

-const string STG_CONFIG::GetVersion() const
+const std::string STG_CONFIG::GetVersion() const

 {
 return "Stg configurator v.0.08";
 }
 {
 return "Stg configurator v.0.08";
 }


@@ -129,7 +131,7 @@ void STG_CONFIG::SetAdmins(ADMINS * a)
 admins = a;
 }
 //-----------------------------------------------------------------------------
 admins = a;
 }
 //-----------------------------------------------------------------------------

-void STG_CONFIG::SetStore(BASE_STORE * s)
+void STG_CONFIG::SetStore(STORE * s)

 {
 store = s;
 }
 {
 store = s;
 }


@@ -152,7 +154,7 @@ if (ret)
 return ret;
 }
 //-----------------------------------------------------------------------------
 return ret;
 }
 //-----------------------------------------------------------------------------

-const string & STG_CONFIG::GetStrError() const
+const std::string & STG_CONFIG::GetStrError() const

 {
 return errorStr;
 }
 {
 return errorStr;
 }