Merge remote-tracking branch 'github/master'

[stg.git] / projects / stargazer / plugins / configuration / sgconfig / parser_auth_by.h

diff --git a/projects/stargazer/plugins/configuration/sgconfig/parser_auth_by.h b/projects/stargazer/plugins/configuration/sgconfig/parser_auth_by.h
index 61d25e4da6df2dd74f62d0a36d19c8ed2b683244..bb159c906742a7a77614535f97d14ad50a8b8b5e 100644 (file)
--- a/projects/stargazer/plugins/configuration/sgconfig/parser_auth_by.h
+++ b/projects/stargazer/plugins/configuration/sgconfig/parser_auth_by.h
@@ -18,18 +18,20 @@
  *    Author : Maxim Mamontov <faust@stargazer.dp.ua>
  */
 
  *    Author : Maxim Mamontov <faust@stargazer.dp.ua>
  */
 

-#ifndef __STG_PARSER_AUTH_BY_H__
-#define __STG_PARSER_AUTH_BY_H__
+#pragma once

 
 #include "parser.h"
 
 
 #include "parser.h"
 

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

 
 

-class ADMIN;
-class USERS;
+#include <string>

 
 namespace STG
 {
 
 namespace STG
 {

+
+class Admin;
+class Users;
+

 namespace PARSER
 {
 
 namespace PARSER
 {
 


@@ -39,27 +41,26 @@ class AUTH_BY : public BASE_PARSER
         class FACTORY : public BASE_PARSER::FACTORY
         {
             public:
         class FACTORY : public BASE_PARSER::FACTORY
         {
             public:

-                FACTORY(const ADMIN & admin, const USERS & users)
-                    : m_admin(admin), m_users(users)
-                {}
-                virtual BASE_PARSER * create() { return new AUTH_BY(m_admin, m_users); }
+                explicit FACTORY(const Users & users) : m_users(users) {}
+                BASE_PARSER * create(const Admin & admin) override { return new AUTH_BY(admin, m_users); }
+                static void Register(REGISTRY & registry, const Users & users)
+                { registry[ToLower(tag)] = new FACTORY(users); }

             private:
             private:

-                const ADMIN & m_admin;
-                const USERS & m_users;
+                const Users & m_users;

         };
 
         };
 

-        AUTH_BY(const ADMIN & admin, const USERS & users)
-            : BASE_PARSER(admin, "GetUserAuthBy"), m_users(users) {}
-        int Start(void * data, const char * el, const char ** attr);
+        static const char * tag;
+
+        AUTH_BY(const Admin & admin, const Users & users)
+            : BASE_PARSER(admin, tag), m_users(users) {}
+        int Start(void * data, const char * el, const char ** attr) override;

 
     private:
 
     private:

-        const USERS & m_users;
+        const Users & m_users;

         std::string m_login;
 
         std::string m_login;
 

-        void CreateAnswer();
+        void CreateAnswer() override;

 };
 
 } // namespace PARSER
 } // namespace STG
 };
 
 } // namespace PARSER
 } // namespace STG

-
-#endif