Ticket 37. The if-else construction and conf.ReadString() function call added for

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

diff --git a/projects/stargazer/settings_impl.cpp b/projects/stargazer/settings_impl.cpp
index a50a0a657ec708f37accbc0d5adfa7ab1d3ad218..c1a3951c2841017305a8ae30e820a355e0940cb8 100644 (file)
--- a/projects/stargazer/settings_impl.cpp
+++ b/projects/stargazer/settings_impl.cpp
@@ -99,36 +99,36 @@ SETTINGS_IMPL::SETTINGS_IMPL(const SETTINGS_IMPL & rval)
 {
 }
 //-----------------------------------------------------------------------------
-SETTINGS_IMPL & SETTINGS_IMPL::operator=(const SETTINGS_IMPL & set)
+SETTINGS_IMPL & SETTINGS_IMPL::operator=(const SETTINGS_IMPL & rhs)
 {
-    modulesPath = set.modulesPath;
-    dirName = set.dirName;
-    confDir = set.confDir;
-    scriptsDir = set.scriptsDir;
-    rules = set.rules;
-    logFile = set.logFile;
-    pidFile = set.pidFile;
-    monitorDir = set.monitorDir;
-    scriptParams = set.scriptParams;
-    monitoring = set.monitoring;
-    detailStatWritePeriod = set.detailStatWritePeriod;
-    statWritePeriod = set.statWritePeriod;
-    stgExecMsgKey = set.stgExecMsgKey;
-    executersNum = set.executersNum;
-    fullFee = set.fullFee;
-    dayFee = set.dayFee;
-    dayResetTraff = set.dayResetTraff;
-    spreadFee = set.spreadFee;
-    freeMbAllowInet = set.freeMbAllowInet;
-    dayFeeIsLastDay = set.dayFeeIsLastDay;
-    writeFreeMbTraffCost = set.writeFreeMbTraffCost;
-    showFeeInCash = set.showFeeInCash;
-    messageTimeout = set.messageTimeout;
-    feeChargeType = set.feeChargeType;
-    reconnectOnTariffChange = set.reconnectOnTariffChange;
-
-    modulesSettings = set.modulesSettings;
-    storeModuleSettings = set.storeModuleSettings;
+    modulesPath = rhs.modulesPath;
+    dirName = rhs.dirName;
+    confDir = rhs.confDir;
+    scriptsDir = rhs.scriptsDir;
+    rules = rhs.rules;
+    logFile = rhs.logFile;
+    pidFile = rhs.pidFile;
+    monitorDir = rhs.monitorDir;
+    scriptParams = rhs.scriptParams;
+    monitoring = rhs.monitoring;
+    detailStatWritePeriod = rhs.detailStatWritePeriod;
+    statWritePeriod = rhs.statWritePeriod;
+    stgExecMsgKey = rhs.stgExecMsgKey;
+    executersNum = rhs.executersNum;
+    fullFee = rhs.fullFee;
+    dayFee = rhs.dayFee;
+    dayResetTraff = rhs.dayResetTraff;
+    spreadFee = rhs.spreadFee;
+    freeMbAllowInet = rhs.freeMbAllowInet;
+    dayFeeIsLastDay = rhs.dayFeeIsLastDay;
+    writeFreeMbTraffCost = rhs.writeFreeMbTraffCost;
+    showFeeInCash = rhs.showFeeInCash;
+    messageTimeout = rhs.messageTimeout;
+    feeChargeType = rhs.feeChargeType;
+    reconnectOnTariffChange = rhs.reconnectOnTariffChange;
+
+    modulesSettings = rhs.modulesSettings;
+    storeModuleSettings = rhs.storeModuleSettings;
     return *this;
 }
 //-----------------------------------------------------------------------------