From: Naffanya <naffanya@naffanya.(none)>
Date: Mon, 17 Mar 2014 16:16:19 +0000 (+0200)
Subject: Rename 'new tariff' to 'next tariff' and remove conversion std::string to char* in... 
X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/9421e4b0be3a6a59e93ad092e3904b3ff8092e84?ds=sidebyside;hp=-c

Rename 'new tariff' to 'next tariff' and remove conversion std::string to char* in rscript.cpp in function call GetParamValue
---

9421e4b0be3a6a59e93ad092e3904b3ff8092e84
diff --git a/projects/stargazer/plugins/other/rscript/rscript.cpp b/projects/stargazer/plugins/other/rscript/rscript.cpp
index 4a9e8d32..17b86c67 100644
--- 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;
-    if (it->c_str() == "tariffName") 
+    if (*it == "tariffName") 
         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 + " ";
diff --git a/projects/stargazer/user_property.cpp b/projects/stargazer/user_property.cpp
index a0c974bc..aaa0c780 100644
--- 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),
-      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),