Use std::lock_guard instead of STG_LOCKER.

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

diff --git a/projects/stargazer/plugins/configuration/sgconfig/parser_message.h b/projects/stargazer/plugins/configuration/sgconfig/parser_message.h
index 6a5f8f4e6ce098b17b973eda35d2c83abb538403..7ab3628ddabd7d8ebeff01f6bcfdf433370364ea 100644 (file)
--- a/projects/stargazer/plugins/configuration/sgconfig/parser_message.h
+++ b/projects/stargazer/plugins/configuration/sgconfig/parser_message.h
@@ -19,21 +19,22 @@
  *    Author : Maxim Mamontov <faust@stargazer.dp.ua>
  */
 
  *    Author : Maxim Mamontov <faust@stargazer.dp.ua>
  */
 

-#ifndef __STG_SGCONFIG_PARSER_SEND_MESSAGE_H__
-#define __STG_SGCONFIG_PARSER_SEND_MESSAGE_H__
+#pragma once

 
 #include "parser.h"
 
 #include "stg/message.h"
 
 #include "parser.h"
 
 #include "stg/message.h"

+#include "stg/common.h"

 
 #include <vector>
 #include <string>
 
 
 #include <vector>
 #include <string>
 

-class USERS;
-class USER;
-

 namespace STG
 {
 namespace STG
 {

+
+class Users;
+class User;
+

 namespace PARSER
 {
 
 namespace PARSER
 {
 


@@ -43,33 +44,31 @@ class SEND_MESSAGE: public BASE_PARSER
         class FACTORY : public BASE_PARSER::FACTORY
         {
             public:
         class FACTORY : public BASE_PARSER::FACTORY
         {
             public:

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

             private:
             private:

-                USERS & m_users;
+                Users & m_users;

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

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

             : BASE_PARSER(admin, tag), m_users(users), m_result(res_ok), m_user(NULL) {}
             : BASE_PARSER(admin, tag), m_users(users), m_result(res_ok), m_user(NULL) {}

-        int Start(void *data, const char *el, const char **attr);
-        int End(void *data, const char *el);
+        int Start(void *data, const char *el, const char **attr) override;
+        int End(void *data, const char *el) override;

 
     private:
 
     private:

-        USERS & m_users;
+        Users & m_users;

         std::vector<std::string> m_logins;
         enum { res_ok, res_params_error, res_unknown } m_result;
         std::vector<std::string> m_logins;
         enum { res_ok, res_params_error, res_unknown } m_result;

-        STG_MSG m_msg;
-        USER * m_user;
+        STG::Message m_msg;
+        User * m_user;

 
         int ParseLogins(const char * logins);
 
         int ParseLogins(const char * logins);

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

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

-
-#endif