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 76153f573e512acade527ff4003c6417cf74144e..f9e04823a726079fb30491e552adeaf3eda0eee1 100644 (file)
--- a/projects/stargazer/plugins/configuration/sgconfig/parser_user_info.h
+++ b/projects/stargazer/plugins/configuration/sgconfig/parser_user_info.h
@@ -18,8 +18,7 @@
  *    Author : Maxim Mamontov <faust@stargazer.dp.ua>
  */
 
  *    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 "parser.h"
 


@@ -27,10 +26,11 @@
 
 #include <string>
 
 
 #include <string>
 

-class USERS;
-

 namespace STG
 {
 namespace STG
 {

+
+class Users;
+

 namespace PARSER
 {
 
 namespace PARSER
 {
 


@@ -40,28 +40,26 @@ class USER_INFO : public BASE_PARSER
         class FACTORY : public BASE_PARSER::FACTORY
         {
             public:
         class FACTORY : public BASE_PARSER::FACTORY
         {
             public:

-                FACTORY(const USERS & users) : m_users(users) {}
-                virtual BASE_PARSER * create(const ADMIN & admin) { return new USER_INFO(admin, m_users); }
-                static void Register(REGISTRY & registry, const USERS & 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:
                 { registry[ToLower(tag)] = new FACTORY(users); }
             private:

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

         };
 
         static const char * tag;
 
         };
 
         static const char * tag;
 

-        USER_INFO(const ADMIN & admin, const USERS & users)
+        USER_INFO(const Admin & admin, const Users & users)

             : BASE_PARSER(admin, tag), m_users(users) {}
             : BASE_PARSER(admin, tag), m_users(users) {}

-        int Start(void * data, const char * el, const char ** attr);
+        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