Add iconv for 'note', 'email', 'address' and 'group'

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

diff --git a/projects/stargazer/admins_impl.h b/projects/stargazer/admins_impl.h
index c40f2659f46dce24810e544a8d69e923986ca0d2..170f3a4f3cb74a01ea9fcbb648fc5b94fe4ab6a7 100644 (file)
--- a/projects/stargazer/admins_impl.h
+++ b/projects/stargazer/admins_impl.h
@@ -36,21 +36,21 @@
 #include <list>
 #include <map>
 
 #include <list>
 #include <map>
 

-#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 "admin_impl.h"

-#include "stg_locker.h"
-#include "store.h"
-#include "noncopyable.h"

 
 class ADMINS_IMPL : private NONCOPYABLE, public ADMINS {
 public:
     ADMINS_IMPL(STORE * st);
     virtual ~ADMINS_IMPL() {}
 
 
 class ADMINS_IMPL : private NONCOPYABLE, public ADMINS {
 public:
     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 string & login, const ADMIN * admin);
+    int           Del(const 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; }
     void          PrintAdmins() const;
     const ADMIN * GetSysAdmin() const { return &stg; }
     const ADMIN * GetNoAdmin() const { return &noAdmin; }


@@ -58,7 +58,7 @@ public:
     bool          AdminExists(const std::string & login) const;
     bool          AdminCorrect(const std::string & login,
                                const std::string & password,
     bool          AdminExists(const std::string & login) const;
     bool          AdminCorrect(const std::string & login,
                                const std::string & password,

-                               ADMIN * admin) const;
+                               ADMIN ** admin);

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