Merge branch 'stg-2.409' into stg-2.409-radius

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

diff --git a/projects/stargazer/admin_impl.h b/projects/stargazer/admin_impl.h
index 69f384201f9a9440f31539c025b8f74075c8e9e1..22ffa0710573099fe66feb7f07053058233ecbf1 100644 (file)
--- a/projects/stargazer/admin_impl.h
+++ b/projects/stargazer/admin_impl.h
@@ -31,44 +31,41 @@
 #ifndef ADMIN_IMPL_H
 #define ADMIN_IMPL_H
 
 #ifndef ADMIN_IMPL_H
 #define ADMIN_IMPL_H
 

-#include <string>
-

 #include "stg/admin.h"
 #include "stg/os_int.h"
 #include "stg/admin_conf.h"
 #include "stg/admin.h"
 #include "stg/os_int.h"
 #include "stg/admin_conf.h"

-#include "stg/stg_logger.h"
+
+#include <string>

 
 class ADMIN_IMPL : public ADMIN {
 public:
       ADMIN_IMPL();
 
 class ADMIN_IMPL : public ADMIN {
 public:
       ADMIN_IMPL();

-      ADMIN_IMPL(const ADMIN_CONF & ac);
+      explicit ADMIN_IMPL(const ADMIN_CONF & ac);

       ADMIN_IMPL(const PRIV & priv,
       ADMIN_IMPL(const PRIV & priv,

-            const std::string & login,
-            const std::string & password);
-      virtual ~ADMIN_IMPL() {};
+                 const std::string & login,
+                 const std::string & password);
+      virtual ~ADMIN_IMPL() {}

 
 

-      ADMIN & operator=(const ADMIN &);
-      ADMIN & operator=(const ADMIN_CONF &);
-      bool         operator==(const ADMIN & rhs) const;
-      bool         operator!=(const ADMIN & rhs) const;
-      bool         operator<(const ADMIN & rhs) const;
-      bool         operator<=(const ADMIN & rhs) const;
+      ADMIN_IMPL & operator=(const ADMIN_CONF &);
+      bool         operator==(const ADMIN_IMPL & rhs) const;
+      bool         operator!=(const ADMIN_IMPL & rhs) const;
+      bool         operator<(const ADMIN_IMPL & rhs) const;
+      bool         operator<=(const ADMIN_IMPL & rhs) const;

 
 

-      const std::string & GetPassword() const { return conf.password; };
-      const std::string & GetLogin() const { return conf.login; };
-      PRIV const *        GetPriv() const { return &conf.priv; };
-      uint16_t            GetPrivAsInt() const { return conf.priv.ToInt(); };
-      const ADMIN_CONF &  GetConf() const { return conf; };
+      const std::string & GetPassword() const { return conf.password; }
+      const std::string & GetLogin() const { return conf.login; }
+      PRIV const *        GetPriv() const { return &conf.priv; }
+      uint32_t            GetPrivAsInt() const { return conf.priv.ToInt(); }
+      const ADMIN_CONF &  GetConf() const { return conf; }

       void                Print() const;
       void                Print() const;

-      uint32_t            GetIP() const { return ip; };
+      uint32_t            GetIP() const { return ip; }

       std::string         GetIPStr() const;
       std::string         GetIPStr() const;

-      void                SetIP(uint32_t ip) { ADMIN_IMPL::ip = ip; };
+      void                SetIP(uint32_t v) { ip = v; }

       const std::string   GetLogStr() const;
 
 private:
       ADMIN_CONF        conf;
       uint32_t          ip;
       const std::string   GetLogStr() const;
 
 private:
       ADMIN_CONF        conf;
       uint32_t          ip;

-      STG_LOGGER &      WriteServLog;

 };
 
 #endif
 };
 
 #endif