Merge remote-tracking branch 'github/master'

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

diff --git a/projects/stargazer/plugins/configuration/sgconfig/parser_server_info.h b/projects/stargazer/plugins/configuration/sgconfig/parser_server_info.h
index 2aabf47327b6f67a9095c8771f76078005d2c081..9bfe8f9980acb3ebe1ec1e993ea522e3ca936682 100644 (file)
--- a/projects/stargazer/plugins/configuration/sgconfig/parser_server_info.h
+++ b/projects/stargazer/plugins/configuration/sgconfig/parser_server_info.h
@@ -19,39 +19,58 @@
  *    Author : Maxim Mamontov <faust@stargazer.dp.ua>
  */
 
  *    Author : Maxim Mamontov <faust@stargazer.dp.ua>
  */
 

-#ifndef __STG_SGCONFIG_PARSER_SERVER_INFO_H__
-#define __STG_SGCONFIG_PARSER_SERVER_INFO_H__
+#pragma once

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

-class ADMIN;
+#include "stg/common.h"

 
 namespace STG
 {
 
 namespace STG
 {

+
+class Admin;
+struct Settings;
+class Users;
+class Tariffs;
+

 namespace PARSER
 {
 
 class GET_SERVER_INFO: public BASE_PARSER {
     public:
 namespace PARSER
 {
 
 class GET_SERVER_INFO: public BASE_PARSER {
     public:

-        GET_SERVER_INFO(const ADMIN & admin,
-                        const SETTINGS & settings,
-                        const USERS & users,
-                        const TARIFFS & tariffs)
-            : BASE_PARSER(admin, "GetServerInfo"),
+        class FACTORY : public BASE_PARSER::FACTORY
+        {
+            public:
+                FACTORY(const Settings & settings, const Users & users, const Tariffs & tariffs)
+                    : m_settings(settings), m_users(users), m_tariffs(tariffs) {}
+                BASE_PARSER * create(const Admin & admin) override { return new GET_SERVER_INFO(admin, m_settings, m_users, m_tariffs); }
+                static void Register(REGISTRY & registry, const Settings & settings, const Users & users, const Tariffs & tariffs)
+                { registry[ToLower(tag)] = new FACTORY(settings, users, tariffs); }
+            private:
+                const Settings & m_settings;
+                const Users & m_users;
+                const Tariffs & m_tariffs;
+        };
+
+        static const char * tag;
+
+        GET_SERVER_INFO(const Admin & admin,
+                        const Settings & settings,
+                        const Users & users,
+                        const Tariffs & tariffs)
+            : BASE_PARSER(admin, tag),

               m_settings(settings),
               m_users(users),
               m_tariffs(tariffs)
         {}
 
     private:
               m_settings(settings),
               m_users(users),
               m_tariffs(tariffs)
         {}
 
     private:

-        const SETTINGS & m_settings;
-        const USERS & m_users;
-        const TARIFFS & m_tariffs;
+        const Settings & m_settings;
+        const Users & m_users;
+        const Tariffs & m_tariffs;

 
 

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

 };
 
 }
 }
 };
 
 }
 }

-
-#endif