Small refactoring in RESETABLE.

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

diff --git a/projects/stargazer/admins_impl.h b/projects/stargazer/admins_impl.h
index 2ec9912913fcb8235cc9a73c4f1f146d8a4a6330..48435b75d56f49c5a58c9b2aeb78fb82aa62382d 100644 (file)
--- a/projects/stargazer/admins_impl.h
+++ b/projects/stargazer/admins_impl.h
@@ -42,6 +42,7 @@
 #include "stg/locker.h"
 #include "stg/store.h"
 #include "stg/noncopyable.h"
 #include "stg/locker.h"
 #include "stg/store.h"
 #include "stg/noncopyable.h"

+#include "stg/logger.h"

 #include "admin_impl.h"
 
 class ADMINS_IMPL : private NONCOPYABLE, public ADMINS {
 #include "admin_impl.h"
 
 class ADMINS_IMPL : private NONCOPYABLE, public ADMINS {


@@ -55,22 +56,27 @@ public:
     void          PrintAdmins() const;
     const ADMIN * GetSysAdmin() const { return &stg; }
     const ADMIN * GetNoAdmin() const { return &noAdmin; }
     void          PrintAdmins() const;
     const ADMIN * GetSysAdmin() const { return &stg; }
     const ADMIN * GetNoAdmin() const { return &noAdmin; }

-    bool          FindAdmin(const std::string & l, ADMIN ** admin);
-    bool          AdminExists(const std::string & login) const;
-    bool          AdminCorrect(const std::string & login,
-                               const std::string & password,
-                               ADMIN ** admin);
+    bool          Find(const std::string & l, ADMIN ** admin);
+    bool          Exists(const std::string & login) const;
+    bool          Correct(const std::string & login,
+                          const std::string & password,
+                          ADMIN ** admin);

     const std::string & GetStrError() const { return strError; }
 
     const std::string & GetStrError() const { return strError; }
 

+    size_t        Count() const { return data.size(); }
+

     int OpenSearch() const;
     int SearchNext(int, ADMIN_CONF * ac) const;
     int CloseSearch(int) const;
 
 private:
     int OpenSearch() const;
     int SearchNext(int, ADMIN_CONF * ac) const;
     int CloseSearch(int) const;
 
 private:

-    typedef list<ADMIN_IMPL>::iterator admin_iter;
-    typedef list<ADMIN_IMPL>::const_iterator const_admin_iter;
+    ADMINS_IMPL(const ADMINS_IMPL & rvalue);
+    ADMINS_IMPL & operator=(const ADMINS_IMPL & rvalue);
+
+    typedef std::list<ADMIN_IMPL>::iterator admin_iter;
+    typedef std::list<ADMIN_IMPL>::const_iterator const_admin_iter;

 
 

-    int             ReadAdmins();
+    int             Read();

 
     ADMIN_IMPL              stg;
     ADMIN_IMPL              noAdmin;
 
     ADMIN_IMPL              stg;
     ADMIN_IMPL              noAdmin;