X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/d8845c7819caac09b95c4cdf1e8d48cc1cb1b7a6..90b793eb07dc190eeb1144a1da079de760d17c36:/projects/stargazer/plugins/configuration/sgconfig/parser_admins.h

diff --git a/projects/stargazer/plugins/configuration/sgconfig/parser_admins.h b/projects/stargazer/plugins/configuration/sgconfig/parser_admins.h
index 70ae0274..4a6924bd 100644
--- a/projects/stargazer/plugins/configuration/sgconfig/parser_admins.h
+++ b/projects/stargazer/plugins/configuration/sgconfig/parser_admins.h
@@ -19,21 +19,21 @@
  *    Author : Maxim Mamontov <faust@stargazer.dp.ua>
  */
 
-#ifndef __STG_SGCONFIG_PARSER_ADMINS_H__
-#define __STG_SGCONFIG_PARSER_ADMINS_H__
+#pragma once
 
 #include "parser.h"
 
 #include "stg/common.h"
-#include "stg/resetable.h"
 
 #include <string>
-
-class ADMINS;
-class ADMIN;
+#include <optional>
 
 namespace STG
 {
+
+struct Admins;
+struct Admin;
+
 namespace PARSER
 {
 
@@ -43,23 +43,23 @@ class GET_ADMINS: public BASE_PARSER
         class FACTORY : public BASE_PARSER::FACTORY
         {
             public:
-                explicit FACTORY(const ADMINS & admins) : m_admins(admins) {}
-                virtual BASE_PARSER * create(const ADMIN & admin) { return new GET_ADMINS(admin, m_admins); }
-                static void Register(REGISTRY & registry, const ADMINS & admins)
+                explicit FACTORY(const Admins & admins) : m_admins(admins) {}
+                BASE_PARSER * create(const Admin & admin) override { return new GET_ADMINS(admin, m_admins); }
+                static void Register(REGISTRY & registry, const Admins & admins)
                 { registry[ToLower(tag)] = new FACTORY(admins); }
             private:
-                const ADMINS & m_admins;
+                const Admins & m_admins;
         };
 
         static const char * tag;
 
-        GET_ADMINS(const ADMIN & admin, const ADMINS & admins)
+        GET_ADMINS(const Admin & admin, const Admins & admins)
             : BASE_PARSER(admin, tag), m_admins(admins) {}
 
     private:
-        const ADMINS & m_admins;
+        const Admins & m_admins;
 
-        void CreateAnswer();
+        void CreateAnswer() override;
 };
 
 class ADD_ADMIN: public BASE_PARSER
@@ -68,25 +68,25 @@ class ADD_ADMIN: public BASE_PARSER
         class FACTORY : public BASE_PARSER::FACTORY
         {
             public:
-                explicit FACTORY(ADMINS & admins) : m_admins(admins) {}
-                virtual BASE_PARSER * create(const ADMIN & admin) { return new ADD_ADMIN(admin, m_admins); }
-                static void Register(REGISTRY & registry, ADMINS & admins)
+                explicit FACTORY(Admins & admins) : m_admins(admins) {}
+                BASE_PARSER * create(const Admin & admin) override { return new ADD_ADMIN(admin, m_admins); }
+                static void Register(REGISTRY & registry, Admins & admins)
                 { registry[ToLower(tag)] = new FACTORY(admins); }
             private:
-                ADMINS & m_admins;
+                Admins & m_admins;
         };
 
         static const char * tag;
 
-        ADD_ADMIN(const ADMIN & admin, ADMINS & admins)
+        ADD_ADMIN(const Admin & admin, Admins & admins)
             : BASE_PARSER(admin, tag), m_admins(admins) {}
-        int Start(void * data, const char * el, const char ** attr);
+        int Start(void * data, const char * el, const char ** attr) override;
 
     private:
         std::string m_admin;
-        ADMINS & m_admins;
+        Admins & m_admins;
 
-        void CreateAnswer();
+        void CreateAnswer() override;
 };
 
 class DEL_ADMIN: public BASE_PARSER
@@ -95,25 +95,25 @@ class DEL_ADMIN: public BASE_PARSER
         class FACTORY : public BASE_PARSER::FACTORY
         {
             public:
-                explicit FACTORY(ADMINS & admins) : m_admins(admins) {}
-                virtual BASE_PARSER * create(const ADMIN & admin) { return new DEL_ADMIN(admin, m_admins); }
-                static void Register(REGISTRY & registry, ADMINS & admins)
+                explicit FACTORY(Admins & admins) : m_admins(admins) {}
+                BASE_PARSER * create(const Admin & admin) override { return new DEL_ADMIN(admin, m_admins); }
+                static void Register(REGISTRY & registry, Admins & admins)
                 { registry[ToLower(tag)] = new FACTORY(admins); }
             private:
-                ADMINS & m_admins;
+                Admins & m_admins;
         };
 
         static const char * tag;
 
-        DEL_ADMIN(const ADMIN & admin, ADMINS & admins)
+        DEL_ADMIN(const Admin & admin, Admins & admins)
             : BASE_PARSER(admin, tag), m_admins(admins) {}
-        int Start(void * data, const char * el, const char ** attr);
+        int Start(void * data, const char * el, const char ** attr) override;
 
     private:
         std::string m_admin;
-        ADMINS & m_admins;
+        Admins & m_admins;
 
-        void CreateAnswer();
+        void CreateAnswer() override;
 };
 
 class CHG_ADMIN: public BASE_PARSER
@@ -122,30 +122,28 @@ class CHG_ADMIN: public BASE_PARSER
         class FACTORY : public BASE_PARSER::FACTORY
         {
             public:
-                explicit FACTORY(ADMINS & admins) : m_admins(admins) {}
-                virtual BASE_PARSER * create(const ADMIN & admin) { return new CHG_ADMIN(admin, m_admins); }
-                static void Register(REGISTRY & registry, ADMINS & admins)
+                explicit FACTORY(Admins & admins) : m_admins(admins) {}
+                BASE_PARSER * create(const Admin & admin) override { return new CHG_ADMIN(admin, m_admins); }
+                static void Register(REGISTRY & registry, Admins & admins)
                 { registry[ToLower(tag)] = new FACTORY(admins); }
             private:
-                ADMINS & m_admins;
+                Admins & m_admins;
         };
 
         static const char * tag;
 
-        CHG_ADMIN(const ADMIN & admin, ADMINS & admins)
+        CHG_ADMIN(const Admin & admin, Admins & admins)
             : BASE_PARSER(admin, tag), m_admins(admins) {}
-        int Start(void * data, const char * el, const char ** attr);
+        int Start(void * data, const char * el, const char ** attr) override;
 
     private:
         std::string login;
-        RESETABLE<std::string> password;
-        RESETABLE<std::string> privAsString;
-        ADMINS & m_admins;
+        std::optional<std::string> password;
+        std::optional<std::string> privAsString;
+        Admins & m_admins;
 
-        void CreateAnswer();
+        void CreateAnswer() override;
 };
 
 } // namespace PARSER
 } // namespace STG
-
-#endif