X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/6f7160dd027c8ce7e2760aa369768ba39ab80181..82ede2a92a721d1c8f0e3fd109a2594f2096306e:/projects/stargazer/admins_impl.h

diff --git a/projects/stargazer/admins_impl.h b/projects/stargazer/admins_impl.h
index 8318fc21..2ec99129 100644
--- a/projects/stargazer/admins_impl.h
+++ b/projects/stargazer/admins_impl.h
@@ -32,33 +32,35 @@
 #define ADMINS_IMPL_H
 
 #include <pthread.h>
+
 #include <list>
 #include <map>
+#include <string>
 
-#include "admins.h"
-#include "admin.h"
+#include "stg/admins.h"
+#include "stg/admin.h"
+#include "stg/locker.h"
+#include "stg/store.h"
+#include "stg/noncopyable.h"
 #include "admin_impl.h"
-#include "stg_locker.h"
-#include "base_store.h"
-#include "noncopyable.h"
 
 class ADMINS_IMPL : private NONCOPYABLE, public ADMINS {
 public:
-    ADMINS_IMPL(BASE_STORE * st);
-    virtual ~ADMINS_IMPL() {};
+    ADMINS_IMPL(STORE * st);
+    virtual ~ADMINS_IMPL() {}
 
-    int           Add(const string & login, const ADMIN & admin);
-    int           Del(const string & login, const ADMIN & admin);
-    int           Change(const ADMIN_CONF & ac, const ADMIN & admin);
+    int           Add(const std::string & login, const ADMIN * admin);
+    int           Del(const std::string & login, const ADMIN * admin);
+    int           Change(const ADMIN_CONF & ac, const ADMIN * admin);
     void          PrintAdmins() const;
-    const ADMIN * GetSysAdmin() const { return &stg; };
-    const ADMIN * GetNoAdmin() const { return &noAdmin; };
+    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) const;
-    const std::string & GetStrError() const { return strError; };
+                               ADMIN ** admin);
+    const std::string & GetStrError() const { return strError; }
 
     int OpenSearch() const;
     int SearchNext(int, ADMIN_CONF * ac) const;
@@ -70,14 +72,15 @@ private:
 
     int             ReadAdmins();
 
-    ADMIN_IMPL           stg;
-    ADMIN_IMPL           noAdmin;
-    list<ADMIN_IMPL>     data;
-    BASE_STORE *    store;
-    STG_LOGGER &    WriteServLog;
-    mutable map<int, const_admin_iter> searchDescriptors;
-    mutable unsigned int handle;
+    ADMIN_IMPL              stg;
+    ADMIN_IMPL              noAdmin;
+    std::list<ADMIN_IMPL>   data;
+    STORE *                 store;
+    STG_LOGGER &            WriteServLog;
+    mutable std::map<int, const_admin_iter> searchDescriptors;
+    mutable unsigned int    handle;
     mutable pthread_mutex_t mutex;
-    std::string     strError;
+    std::string             strError;
 };
+
 #endif