X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/22cb2560274e05e6490cf964cbbeb74a1991c642..2196a3a0cdc5384c082febb7f4aa5994cc7d80db:/projects/stargazer/plugins/configuration/sgconfig/parser_users.h?ds=sidebyside

diff --git a/projects/stargazer/plugins/configuration/sgconfig/parser_users.h b/projects/stargazer/plugins/configuration/sgconfig/parser_users.h
index cbf25915..d1e36e8f 100644
--- a/projects/stargazer/plugins/configuration/sgconfig/parser_users.h
+++ b/projects/stargazer/plugins/configuration/sgconfig/parser_users.h
@@ -19,26 +19,26 @@
  *    Author : Maxim Mamontov <faust@stargazer.dp.ua>
  */
 
-#ifndef __STG_SGCONFIG_PARSER_USERS_H__
-#define __STG_SGCONFIG_PARSER_USERS_H__
+#pragma once
 
 #include "parser.h"
 
 #include "stg/user_conf.h"
 #include "stg/user_stat.h"
 #include "stg/common.h"
-#include "stg/resetable.h"
 
 #include <string>
-
-class USERS;
-class USER;
-class TARIFFS;
-class ADMIN;
-class STORE;
+#include <optional>
 
 namespace STG
 {
+
+class Users;
+class User;
+class Tariffs;
+class Admin;
+struct Store;
+
 namespace PARSER
 {
 
@@ -48,26 +48,26 @@ class GET_USERS: public BASE_PARSER
         class FACTORY : public BASE_PARSER::FACTORY
         {
             public:
-                explicit FACTORY(USERS & users) : m_users(users) {}
-                virtual BASE_PARSER * create(const ADMIN & admin) { return new GET_USERS(admin, m_users); }
-                static void Register(REGISTRY & registry, USERS & users)
+                explicit FACTORY(Users & users) : m_users(users) {}
+                BASE_PARSER * create(const Admin & admin) override { return new GET_USERS(admin, m_users); }
+                static void Register(REGISTRY & registry, Users & users)
                 { registry[ToLower(tag)] = new FACTORY(users); }
             private:
-                USERS & m_users;
+                Users & m_users;
         };
 
         static const char * tag;
 
-        GET_USERS(const ADMIN & admin, USERS & users)
+        GET_USERS(const Admin & admin, Users & users)
             : BASE_PARSER(admin, tag), m_users(users),
               m_lastUserUpdateTime(0) {}
-        int Start(void * data, const char * el, const char ** attr);
+        int Start(void * data, const char * el, const char ** attr) override;
 
     private:
-        USERS & m_users;
+        Users & m_users;
         time_t m_lastUserUpdateTime;
 
-        void CreateAnswer();
+        void CreateAnswer() override;
 };
 
 class GET_USER: public BASE_PARSER
@@ -76,25 +76,25 @@ class GET_USER: public BASE_PARSER
         class FACTORY : public BASE_PARSER::FACTORY
         {
             public:
-                explicit FACTORY(const USERS & users) : m_users(users) {}
-                virtual BASE_PARSER * create(const ADMIN & admin) { return new GET_USER(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 GET_USER(admin, m_users); }
+                static void Register(REGISTRY & registry, const Users & users)
                 { registry[ToLower(tag)] = new FACTORY(users); }
             private:
-                const USERS & m_users;
+                const Users & m_users;
         };
 
         static const char * tag;
 
-        GET_USER(const ADMIN & admin, const USERS & users)
+        GET_USER(const Admin & admin, const 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:
-        const USERS & m_users;
+        const Users & m_users;
         std::string m_login;
 
-        void CreateAnswer();
+        void CreateAnswer() override;
 };
 
 class ADD_USER: public BASE_PARSER
@@ -103,25 +103,25 @@ class ADD_USER: public BASE_PARSER
         class FACTORY : public BASE_PARSER::FACTORY
         {
             public:
-                explicit FACTORY(USERS & users) : m_users(users) {}
-                virtual BASE_PARSER * create(const ADMIN & admin) { return new ADD_USER(admin, m_users); }
-                static void Register(REGISTRY & registry, USERS & users)
+                explicit FACTORY(Users & users) : m_users(users) {}
+                BASE_PARSER * create(const Admin & admin) override { return new ADD_USER(admin, m_users); }
+                static void Register(REGISTRY & registry, Users & users)
                 { registry[ToLower(tag)] = new FACTORY(users); }
             private:
-                USERS & m_users;
+                Users & m_users;
         };
 
         static const char * tag;
 
-        ADD_USER(const ADMIN & admin, USERS & users)
+        ADD_USER(const Admin & admin, 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:
-        USERS & m_users;
+        Users & m_users;
         std::string m_login;
 
-        void CreateAnswer();
+        void CreateAnswer() override;
 };
 
 class CHG_USER: public BASE_PARSER
@@ -130,44 +130,44 @@ class CHG_USER: public BASE_PARSER
         class FACTORY : public BASE_PARSER::FACTORY
         {
             public:
-                FACTORY(USERS & users, STORE & store, const TARIFFS & tariffs)
+                FACTORY(Users & users, Store & store, const Tariffs & tariffs)
                     : m_users(users), m_store(store), m_tariffs(tariffs)
                 {}
-                virtual BASE_PARSER * create(const ADMIN & admin) { return new CHG_USER(admin, m_users, m_store, m_tariffs); }
-                static void Register(REGISTRY & registry, USERS & users, STORE & store, const TARIFFS & tariffs)
+                BASE_PARSER * create(const Admin & admin) override { return new CHG_USER(admin, m_users, m_store, m_tariffs); }
+                static void Register(REGISTRY & registry, Users & users, Store & store, const Tariffs & tariffs)
                 { registry[ToLower(tag)] = new FACTORY(users, store, tariffs); }
             private:
-                USERS & m_users;
-                STORE & m_store;
-                const TARIFFS & m_tariffs;
+                Users & m_users;
+                Store & m_store;
+                const Tariffs & m_tariffs;
         };
 
         static const char * tag;
 
-        CHG_USER(const ADMIN & admin, USERS & users,
-                 STORE & store, const TARIFFS & tariffs)
+        CHG_USER(const Admin & admin, Users & users,
+                 Store & store, const Tariffs & tariffs)
             : BASE_PARSER(admin, tag),
               m_users(users),
               m_store(store),
               m_tariffs(tariffs),
               m_cashMustBeAdded(false) {}
 
-        int Start(void * data, const char * el, const char ** attr);
+        int Start(void * data, const char * el, const char ** attr) override;
 
     private:
-        USERS & m_users;
-        STORE & m_store;
-        const TARIFFS & m_tariffs;
-        USER_STAT_RES m_usr;
-        USER_CONF_RES m_ucr;
-        RESETABLE<uint64_t> m_upr[DIR_NUM];
-        RESETABLE<uint64_t> m_downr[DIR_NUM];
+        Users & m_users;
+        Store & m_store;
+        const Tariffs & m_tariffs;
+        UserStatOpt m_usr;
+        UserConfOpt m_ucr;
+        std::optional<uint64_t> m_upr[DIR_NUM];
+        std::optional<uint64_t> m_downr[DIR_NUM];
         std::string m_cashMsg;
         std::string m_login;
         bool m_cashMustBeAdded;
 
         int ApplyChanges();
-        void CreateAnswer();
+        void CreateAnswer() override;
 };
 
 class DEL_USER: public BASE_PARSER
@@ -176,27 +176,27 @@ class DEL_USER: public BASE_PARSER
         class FACTORY : public BASE_PARSER::FACTORY
         {
             public:
-                explicit FACTORY(USERS & users) : m_users(users) {}
-                virtual BASE_PARSER * create(const ADMIN & admin) { return new DEL_USER(admin, m_users); }
-                static void Register(REGISTRY & registry, USERS & users)
+                explicit FACTORY(Users & users) : m_users(users) {}
+                BASE_PARSER * create(const Admin & admin) override { return new DEL_USER(admin, m_users); }
+                static void Register(REGISTRY & registry, Users & users)
                 { registry[ToLower(tag)] = new FACTORY(users); }
             private:
-                USERS & m_users;
+                Users & m_users;
         };
 
         static const char * tag;
 
-        DEL_USER(const ADMIN & admin, USERS & users)
+        DEL_USER(const Admin & admin, Users & users)
             : BASE_PARSER(admin, tag), m_users(users), res(0), u(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:
-        USERS & m_users;
+        Users & m_users;
         int res;
-        USER * u;
+        User * u;
 
-        void CreateAnswer();
+        void CreateAnswer() override;
 };
 
 class CHECK_USER: public BASE_PARSER
@@ -205,29 +205,27 @@ class CHECK_USER: public BASE_PARSER
         class FACTORY : public BASE_PARSER::FACTORY
         {
             public:
-                explicit FACTORY(const USERS & users) : m_users(users) {}
-                virtual BASE_PARSER * create(const ADMIN & admin) { return new CHECK_USER(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 CHECK_USER(admin, m_users); }
+                static void Register(REGISTRY & registry, const Users & users)
                 { registry[ToLower(tag)] = new FACTORY(users); }
             private:
-                const USERS & m_users;
+                const Users & m_users;
         };
 
         static const char * tag;
 
-        CHECK_USER(const ADMIN & admin, const USERS & users)
+        CHECK_USER(const Admin & admin, const Users & users)
             : BASE_PARSER(admin, tag), m_users(users) {}
-        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:
-        const USERS & m_users;
+        const Users & m_users;
 
         void CreateAnswer(const char * error);
-        void CreateAnswer() {} // dummy
+        void CreateAnswer() override {} // dummy
 };
 
 } // namespace PARSER
 } // namespace STG
-
-#endif