Rename 'new tariff' to 'next tariff' and remove conversion std::string to char* in...

diff --git a/projects/stargazer/plugins/other/rscript/rscript.cpp b/projects/stargazer/plugins/other/rscript/rscript.cpp
index 4a9e8d32920108ce0dd325e2946effc7c9cedd36..17b86c671aef0d1d70005b04e0f7f2546ab573b9 100644 (file)
--- a/projects/stargazer/plugins/other/rscript/rscript.cpp
+++ b/projects/stargazer/plugins/other/rscript/rscript.cpp
@@ -430,10 +430,10 @@ for(it = rsSettings.GetUserParams().begin();
     ++it)
     {
     std::string parameter;
     ++it)
     {
     std::string parameter;

-    if (it->c_str() == "tariffName") 
+    if (*it == "tariffName") 

         parameter = rsu.user->GetParamValue("tariff");
     else 
         parameter = rsu.user->GetParamValue("tariff");
     else 

-        parameter = rsu.user->GetParamValue(it->c_str());
+        parameter = rsu.user->GetParamValue(*it);

     if (params.length() + parameter.length() > RS_PARAMS_LEN - 1)
         break;
     params += parameter + " ";
     if (params.length() + parameter.length() > RS_PARAMS_LEN - 1)
         break;
     params += parameter + " ";

diff --git a/projects/stargazer/user_property.cpp b/projects/stargazer/user_property.cpp
index a0c974bc2f71c086bd77461ad5267c5053fba443..aaa0c78041ff5f52ed99f7a6b2431db557098ca8 100644 (file)
--- a/projects/stargazer/user_property.cpp
+++ b/projects/stargazer/user_property.cpp
@@ -18,7 +18,7 @@ USER_PROPERTIES::USER_PROPERTIES(const std::string & sd)
       disabledDetailStat(conf.disabledDetailStat, "DisabledDetailStat", false, false, GetStgLogger(), sd, properties),
       alwaysOnline(conf.alwaysOnline, "alwaysOnline", false, false, GetStgLogger(), sd, properties),
       tariffName  (conf.tariffName,   "tariff",       false, false, GetStgLogger(), sd, properties),
       disabledDetailStat(conf.disabledDetailStat, "DisabledDetailStat", false, false, GetStgLogger(), sd, properties),
       alwaysOnline(conf.alwaysOnline, "alwaysOnline", false, false, GetStgLogger(), sd, properties),
       tariffName  (conf.tariffName,   "tariff",       false, false, GetStgLogger(), sd, properties),

-      nextTariff  (conf.nextTariff,   "new tariff",   false, false, GetStgLogger(), sd, properties),
+      nextTariff  (conf.nextTariff,   "next tariff",   false, false, GetStgLogger(), sd, properties),

       address     (conf.address,      "address",      false, false, GetStgLogger(), sd, properties),
       note        (conf.note,         "note",         false, false, GetStgLogger(), sd, properties),
       group       (conf.group,        "group",        false, false, GetStgLogger(), sd, properties),
       address     (conf.address,      "address",      false, false, GetStgLogger(), sd, properties),
       note        (conf.note,         "note",         false, false, GetStgLogger(), sd, properties),
       group       (conf.group,        "group",        false, false, GetStgLogger(), sd, properties),