X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/ede91934442fd804d7b818971a44e3ad795cb01f..96f8ba7ed42706e7d875ffd0dac3f62ec4c43ba5:/projects/stargazer/users_impl.h diff --git a/projects/stargazer/users_impl.h b/projects/stargazer/users_impl.h index 966487df..f0b8ae25 100644 --- a/projects/stargazer/users_impl.h +++ b/projects/stargazer/users_impl.h @@ -36,19 +36,18 @@ $Author: faust $ #include #include -#include "os_int.h" - -#include "store.h" -#include "settings.h" -#include "users.h" -#include "user.h" -#include "user_impl.h" -#include "tariffs.h" -#include "stg_logger.h" -#include "notifer.h" +#include "stg/os_int.h" +#include "stg/store.h" +#include "stg/users.h" +#include "stg/user.h" +#include "stg/tariffs.h" +#include "stg/logger.h" +#include "stg/notifer.h" +#include "stg/noncopyable.h" #include "actions.h" -#include "noncopyable.h" #include "eventloop.h" +#include "settings_impl.h" +#include "user_impl.h" const int userDeleteDelayTime = 120; @@ -92,7 +91,7 @@ class USERS_IMPL : private NONCOPYABLE, public USERS { friend class PROPERTY_NOTIFER_IP_AFTER; public: - USERS_IMPL(SETTINGS * s, STORE * store, TARIFFS * tariffs, const ADMIN & sysAdmin); + USERS_IMPL(SETTINGS_IMPL * s, STORE * store, TARIFFS * tariffs, const ADMIN * sysAdmin); virtual ~USERS_IMPL(); int FindByName(const std::string & login, USER_PTR * user); @@ -105,8 +104,8 @@ public: void AddNotifierUserDel(NOTIFIER_BASE *); void DelNotifierUserDel(NOTIFIER_BASE *); - int Add(const std::string & login, const ADMIN & admin); - void Del(const std::string & login, const ADMIN & admin); + int Add(const std::string & login, const ADMIN * admin); + void Del(const std::string & login, const ADMIN * admin); int ReadUsers(); int GetUserNum() const; @@ -151,10 +150,10 @@ private: std::map ipIndex; std::map loginIndex; - SETTINGS * settings; + SETTINGS_IMPL * settings; TARIFFS * tariffs; STORE * store; - const ADMIN & sysAdmin; + const ADMIN * sysAdmin; STG_LOGGER & WriteServLog; bool nonstop;