Merge remote-tracking branch 'github/master'

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

diff --git a/projects/stargazer/plugins/configuration/sgconfig/parser_user_info.h b/projects/stargazer/plugins/configuration/sgconfig/parser_user_info.h
index 39211a76f2925ca58d96e6fe0d509f7f3d728adf..f9e04823a726079fb30491e552adeaf3eda0eee1 100644 (file)
--- a/projects/stargazer/plugins/configuration/sgconfig/parser_user_info.h
+++ b/projects/stargazer/plugins/configuration/sgconfig/parser_user_info.h
@@ -18,17 +18,19 @@
  *    Author : Maxim Mamontov <faust@stargazer.dp.ua>
  */
 
-#ifndef __STG_PARSER_USER_INFO_H__
-#define __STG_PARSER_USER_INFO_H__
+#pragma once
 
 #include "parser.h"
 
-#include <string>
+#include "stg/common.h"
 
-class USERS;
+#include <string>
 
 namespace STG
 {
+
+class Users;
+
 namespace PARSER
 {
 
@@ -38,27 +40,26 @@ class USER_INFO : public BASE_PARSER
         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 USER_INFO(m_admin, m_users); }
+                explicit FACTORY(const Users & users) : m_users(users) {}
+                BASE_PARSER * create(const Admin & admin) override { return new USER_INFO(admin, m_users); }
+                static void Register(REGISTRY & registry, const Users & users)
+                { registry[ToLower(tag)] = new FACTORY(users); }
             private:
-                const ADMIN & m_admin;
-                const USERS & m_users;
+                const Users & m_users;
         };
 
-        USER_INFO(const ADMIN & admin, const USERS & users)
-            : BASE_PARSER(admin, "GetUserInfo"), m_users(users) {}
-        int Start(void * data, const char * el, const char ** attr);
+        static const char * tag;
+
+        USER_INFO(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:
-        const USERS & m_users;
+        const Users & m_users;
         std::string m_login;
 
-        void CreateAnswer();
+        void CreateAnswer() override;
 };
 
 } // namespace PARSER
 } // namespace STG
-
-#endif