X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/4844bbe6135addc1ffdc33ed0576aebea0153e6d..d12e0d85ae649d5c903a61c1150f4e6c48f96309:/projects/stargazer/admin_impl.cpp?ds=sidebyside diff --git a/projects/stargazer/admin_impl.cpp b/projects/stargazer/admin_impl.cpp index 7f1b301f..9788cec4 100644 --- a/projects/stargazer/admin_impl.cpp +++ b/projects/stargazer/admin_impl.cpp @@ -29,69 +29,53 @@ */ #include "admin_impl.h" + #include "stg/common.h" //----------------------------------------------------------------------------- ADMIN_IMPL::ADMIN_IMPL() - : ADMIN(), - conf(), - ip(0), - WriteServLog(GetStgLogger()) + : ip(0) { } //----------------------------------------------------------------------------- ADMIN_IMPL::ADMIN_IMPL(const ADMIN_CONF & ac) - : ADMIN(), - conf(ac), - ip(0), - WriteServLog(GetStgLogger()) + : conf(ac), + ip(0) { } //----------------------------------------------------------------------------- ADMIN_IMPL::ADMIN_IMPL(const PRIV & priv, const std::string & login, const std::string & password) - : ADMIN(), - conf(priv, login, password), - ip(0), - WriteServLog(GetStgLogger()) -{ -} -//----------------------------------------------------------------------------- -ADMIN & ADMIN_IMPL::operator=(const ADMIN & adm) + : conf(priv, login, password), + ip(0) { -if (&adm == this) - return *this; - -conf = adm.GetConf(); -ip = adm.GetIP(); -return *this; } //----------------------------------------------------------------------------- -ADMIN & ADMIN_IMPL::operator=(const ADMIN_CONF & ac) +ADMIN_IMPL & ADMIN_IMPL::operator=(const ADMIN_CONF & ac) { conf = ac; return *this; } //----------------------------------------------------------------------------- -bool ADMIN_IMPL::operator==(const ADMIN & rhs) const +bool ADMIN_IMPL::operator==(const ADMIN_IMPL & rhs) const { -return conf.login == rhs.GetLogin(); +return conf.login == rhs.conf.login; } //----------------------------------------------------------------------------- -bool ADMIN_IMPL::operator!=(const ADMIN & rhs) const +bool ADMIN_IMPL::operator!=(const ADMIN_IMPL & rhs) const { -return conf.login != rhs.GetLogin(); +return conf.login != rhs.conf.login; } //----------------------------------------------------------------------------- -bool ADMIN_IMPL::operator<(const ADMIN & rhs) const +bool ADMIN_IMPL::operator<(const ADMIN_IMPL & rhs) const { -return conf.login < rhs.GetLogin(); +return conf.login < rhs.conf.login; } //----------------------------------------------------------------------------- -bool ADMIN_IMPL::operator<=(const ADMIN & rhs) const +bool ADMIN_IMPL::operator<=(const ADMIN_IMPL & rhs) const { -return conf.login <= rhs.GetLogin(); +return conf.login <= rhs.conf.login; } //----------------------------------------------------------------------------- std::string ADMIN_IMPL::GetIPStr() const