Allowed to build on Darwin.

[stg.git] / projects / stargazer / user_property.cpp

diff --git a/projects/stargazer/user_property.cpp b/projects/stargazer/user_property.cpp
index a94b60a4215d22b1e10bc520e286ef866124822d..c8b589172a95a3380848770d3f6c78457d9ccbe3 100644 (file)
--- a/projects/stargazer/user_property.cpp
+++ b/projects/stargazer/user_property.cpp
@@ -4,22 +4,21 @@ USER_PROPERTIES::USER_PROPERTIES(const std::string & sd)
     : stat(),
       conf(),
       cash            (stat.cash,             "cash",             false, true, GetStgLogger(), sd, properties),
     : stat(),
       conf(),
       cash            (stat.cash,             "cash",             false, true, GetStgLogger(), sd, properties),

-      up              (stat.up,               "upload",           false, true, GetStgLogger(), sd, properties),
-      down            (stat.down,             "download",         false, true, GetStgLogger(), sd, properties),
+      up              (stat.monthUp,          "upload",           false, true, GetStgLogger(), sd, properties),
+      down            (stat.monthDown,        "download",         false, true, GetStgLogger(), sd, properties),

       lastCashAdd     (stat.lastCashAdd,      "lastCashAdd",      false, true, GetStgLogger(), sd, properties),
       passiveTime     (stat.passiveTime,      "passiveTime",      false, true, GetStgLogger(), sd, properties),
       lastCashAddTime (stat.lastCashAddTime,  "lastCashAddTime",  false, true, GetStgLogger(), sd, properties),
       freeMb          (stat.freeMb,           "freeMb",           false, true, GetStgLogger(), sd, properties),
       lastActivityTime(stat.lastActivityTime, "lastActivityTime", false, true, GetStgLogger(), sd, properties),
 
       lastCashAdd     (stat.lastCashAdd,      "lastCashAdd",      false, true, GetStgLogger(), sd, properties),
       passiveTime     (stat.passiveTime,      "passiveTime",      false, true, GetStgLogger(), sd, properties),
       lastCashAddTime (stat.lastCashAddTime,  "lastCashAddTime",  false, true, GetStgLogger(), sd, properties),
       freeMb          (stat.freeMb,           "freeMb",           false, true, GetStgLogger(), sd, properties),
       lastActivityTime(stat.lastActivityTime, "lastActivityTime", false, true, GetStgLogger(), sd, properties),
 

-

       password    (conf.password,     "password",     true,  false, GetStgLogger(), sd, properties),
       passive     (conf.passive,      "passive",      false, false, GetStgLogger(), sd, properties),
       disabled    (conf.disabled,     "disabled",     false, false, GetStgLogger(), sd, properties),
       disabledDetailStat(conf.disabledDetailStat, "DisabledDetailStat", false, false, GetStgLogger(), sd, properties),
       alwaysOnline(conf.alwaysOnline, "alwaysOnline", false, false, GetStgLogger(), sd, properties),
       password    (conf.password,     "password",     true,  false, GetStgLogger(), sd, properties),
       passive     (conf.passive,      "passive",      false, false, GetStgLogger(), sd, properties),
       disabled    (conf.disabled,     "disabled",     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),
+      tariffName  (conf.tariffName,   "tariffName",   false, false, GetStgLogger(), sd, properties),
+      nextTariff  (conf.nextTariff,   "nextTariff",   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),