X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/c8c881a0df9e718e364af741695f165d6bb3e529..e3c5fe3cce7be5d2b48bfcf11a1de20ca12fc7e0:/projects/stargazer/settings_impl.cpp?ds=sidebyside diff --git a/projects/stargazer/settings_impl.cpp b/projects/stargazer/settings_impl.cpp index ca343bd5..c1a3951c 100644 --- a/projects/stargazer/settings_impl.cpp +++ b/projects/stargazer/settings_impl.cpp @@ -99,39 +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) { - if (&set == this) - return *this; - - 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; } //-----------------------------------------------------------------------------