Merge remote-tracking branch 'github/master'

[stg.git] / projects / stargazer / users_impl.h

diff --git a/projects/stargazer/users_impl.h b/projects/stargazer/users_impl.h
index b5a37063079c14d1af26cc545b5cdbbefe8faddc..07c0e8ab9264a161166d26203bfe810fe2575475 100644 (file)
--- a/projects/stargazer/users_impl.h
+++ b/projects/stargazer/users_impl.h
@@ -20,7 +20,14 @@
 
 #pragma once
 
 
 #pragma once
 

-#include <pthread.h>
+#include "settings_impl.h"
+#include "user_impl.h"
+#include "stg/store.h"
+#include "stg/users.h"
+#include "stg/user.h"
+#include "stg/tariffs.h"
+#include "stg/logger.h"
+#include "stg/noncopyable.h"

 
 #include <string>
 #include <map>
 
 #include <string>
 #include <map>


@@ -34,16 +41,6 @@
 #include <ctime>
 #include <cstdint>
 
 #include <ctime>
 #include <cstdint>
 

-#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 "settings_impl.h"
-#include "user_impl.h"
-

 namespace STG
 {
 
 namespace STG
 {
 


@@ -52,7 +49,6 @@ const int userDeleteDelayTime = 120;
 typedef std::list<UserImpl>::iterator user_iter;
 typedef std::list<UserImpl>::const_iterator const_user_iter;
 
 typedef std::list<UserImpl>::iterator user_iter;
 typedef std::list<UserImpl>::const_iterator const_user_iter;
 

-class UsersImpl;

 //-----------------------------------------------------------------------------
 struct USER_TO_DEL {
 USER_TO_DEL()
 //-----------------------------------------------------------------------------
 struct USER_TO_DEL {
 USER_TO_DEL()


@@ -66,9 +62,6 @@ time_t  delTime;
 //-----------------------------------------------------------------------------
 class UsersImpl : public Users
 {
 //-----------------------------------------------------------------------------
 class UsersImpl : public Users
 {

-    friend class PROPERTY_NOTIFER_IP_BEFORE;
-    friend class PROPERTY_NOTIFER_IP_AFTER;
-

     public:
         using UserImplPtr = UserImpl*;
 
     public:
         using UserImplPtr = UserImpl*;
 


@@ -83,9 +76,9 @@ class UsersImpl : public Users
         bool            TariffInUse(const std::string & tariffName) const override;
 
         template <typename F>
         bool            TariffInUse(const std::string & tariffName) const override;
 
         template <typename F>

-        auto            onUserImplAdd(F&& f) { return m_onAddImplCallbacks.add(std::forward<F>(f)); }
+        auto            onImplAdd(F&& f) { return m_onAddImplCallbacks.add(std::forward<F>(f)); }

         template <typename F>
         template <typename F>

-        auto            onUserImplDel(F&& f) { return m_onDelImplCallbacks.add(std::forward<F>(f)); }
+        auto            onImplDel(F&& f) { return m_onDelImplCallbacks.add(std::forward<F>(f)); }

 
         int             Add(const std::string & login, const Admin * admin) override;
         void            Del(const std::string & login, const Admin * admin) override;
 
         int             Add(const std::string & login, const Admin * admin) override;
         void            Del(const std::string & login, const Admin * admin) override;