Fix build on Darwin.

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

diff --git a/projects/stargazer/plugins/configuration/sgconfig/parser_tariffs.h b/projects/stargazer/plugins/configuration/sgconfig/parser_tariffs.h
index 5dad5eff1902b37f1953c3fa1ffdd1ed92fe4513..c1adaac9ab6fce7a9a1b4e806460363903035f35 100644 (file)
--- a/projects/stargazer/plugins/configuration/sgconfig/parser_tariffs.h
+++ b/projects/stargazer/plugins/configuration/sgconfig/parser_tariffs.h
@@ -19,21 +19,22 @@
  *    Author : Maxim Mamontov <faust@stargazer.dp.ua>
  */
 
  *    Author : Maxim Mamontov <faust@stargazer.dp.ua>
  */
 

-#ifndef __STG_SGCONFIG_PARSER_TARIFFS_H__
-#define __STG_SGCONFIG_PARSER_TARIFFS_H__
+#pragma once

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

+#include "stg/common.h"

 
 #include <string>
 
 
 #include <string>
 

-class TARIFFS;
-class USERS;
-class ADMIN;
-

 namespace STG
 {
 namespace STG
 {

+
+class Tariffs;
+class Users;
+class Admin;
+

 namespace PARSER
 {
 
 namespace PARSER
 {
 


@@ -43,23 +44,23 @@ class GET_TARIFFS: public BASE_PARSER
         class FACTORY : public BASE_PARSER::FACTORY
         {
             public:
         class FACTORY : public BASE_PARSER::FACTORY
         {
             public:

-                FACTORY(const TARIFFS & tariffs) : m_tariffs(tariffs) {}
-                virtual BASE_PARSER * create(const ADMIN & admin) { return new GET_TARIFFS(admin, m_tariffs); }
-                static void Register(REGISTRY & registry, const TARIFFS & tariffs)
-                { registry[tag] = new FACTORY(tariffs); }
+                explicit FACTORY(const Tariffs & tariffs) : m_tariffs(tariffs) {}
+                BASE_PARSER * create(const Admin & admin) override { return new GET_TARIFFS(admin, m_tariffs); }
+                static void Register(REGISTRY & registry, const Tariffs & tariffs)
+                { registry[ToLower(tag)] = new FACTORY(tariffs); }

             private:
             private:

-                const TARIFFS & m_tariffs;
+                const Tariffs & m_tariffs;

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

-        GET_TARIFFS(const ADMIN & admin, const TARIFFS & tariffs)
+        GET_TARIFFS(const Admin & admin, const Tariffs & tariffs)

             : BASE_PARSER(admin, tag), m_tariffs(tariffs) {}
 
     private:
             : BASE_PARSER(admin, tag), m_tariffs(tariffs) {}
 
     private:

-        const TARIFFS & m_tariffs;
+        const Tariffs & m_tariffs;

 
 

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

 };
 
 class ADD_TARIFF: public BASE_PARSER
 };
 
 class ADD_TARIFF: public BASE_PARSER


@@ -68,25 +69,25 @@ class ADD_TARIFF: public BASE_PARSER
         class FACTORY : public BASE_PARSER::FACTORY
         {
             public:
         class FACTORY : public BASE_PARSER::FACTORY
         {
             public:

-                FACTORY(TARIFFS & tariffs) : m_tariffs(tariffs) {}
-                virtual BASE_PARSER * create(const ADMIN & admin) { return new ADD_TARIFF(admin, m_tariffs); }
-                static void Register(REGISTRY & registry, TARIFFS & tariffs)
-                { registry[tag] = new FACTORY(tariffs); }
+                explicit FACTORY(Tariffs & tariffs) : m_tariffs(tariffs) {}
+                BASE_PARSER * create(const Admin & admin) override { return new ADD_TARIFF(admin, m_tariffs); }
+                static void Register(REGISTRY & registry, Tariffs & tariffs)
+                { registry[ToLower(tag)] = new FACTORY(tariffs); }

             private:
             private:

-                TARIFFS & m_tariffs;
+                Tariffs & m_tariffs;

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

-        ADD_TARIFF(const ADMIN & admin, TARIFFS & tariffs)
+        ADD_TARIFF(const Admin & admin, Tariffs & tariffs)

             : BASE_PARSER(admin, tag), m_tariffs(tariffs) {}
             : BASE_PARSER(admin, tag), m_tariffs(tariffs) {}

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

 
     private:
         std::string tariff;
 
     private:
         std::string tariff;

-        TARIFFS & m_tariffs;
+        Tariffs & m_tariffs;

 
 

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

 };
 
 class DEL_TARIFF: public BASE_PARSER
 };
 
 class DEL_TARIFF: public BASE_PARSER


@@ -95,27 +96,27 @@ class DEL_TARIFF: public BASE_PARSER
         class FACTORY : public BASE_PARSER::FACTORY
         {
             public:
         class FACTORY : public BASE_PARSER::FACTORY
         {
             public:

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

             private:
             private:

-                TARIFFS & m_tariffs;
-                const USERS & m_users;
+                Tariffs & m_tariffs;
+                const Users & m_users;

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

-        DEL_TARIFF(const ADMIN & admin, const USERS & users, TARIFFS & tariffs)
+        DEL_TARIFF(const Admin & admin, const Users & users, Tariffs & tariffs)

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

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

 
     private:
         std::string tariff;
 
     private:
         std::string tariff;

-        const USERS & m_users;
-        TARIFFS & m_tariffs;
+        const Users & m_users;
+        Tariffs & m_tariffs;

 
 

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

 };
 
 class CHG_TARIFF: public BASE_PARSER
 };
 
 class CHG_TARIFF: public BASE_PARSER


@@ -124,29 +125,27 @@ class CHG_TARIFF: public BASE_PARSER
         class FACTORY : public BASE_PARSER::FACTORY
         {
             public:
         class FACTORY : public BASE_PARSER::FACTORY
         {
             public:

-                FACTORY(TARIFFS & tariffs) : m_tariffs(tariffs) {}
-                virtual BASE_PARSER * create(const ADMIN & admin) { return new CHG_TARIFF(admin, m_tariffs); }
-                static void Register(REGISTRY & registry, TARIFFS & tariffs)
-                { registry[tag] = new FACTORY(tariffs); }
+                explicit FACTORY(Tariffs & tariffs) : m_tariffs(tariffs) {}
+                BASE_PARSER * create(const Admin & admin) override { return new CHG_TARIFF(admin, m_tariffs); }
+                static void Register(REGISTRY & registry, Tariffs & tariffs)
+                { registry[ToLower(tag)] = new FACTORY(tariffs); }

             private:
             private:

-                TARIFFS & m_tariffs;
+                Tariffs & m_tariffs;

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

-        CHG_TARIFF(const ADMIN & admin, TARIFFS & tariffs)
+        CHG_TARIFF(const Admin & admin, Tariffs & tariffs)

             : BASE_PARSER(admin, tag), m_tariffs(tariffs) {}
             : BASE_PARSER(admin, tag), m_tariffs(tariffs) {}

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

 
     private:
 
     private:

-        TARIFF_DATA_RES td;
-        TARIFFS & m_tariffs;
+        TariffDataOpt td;
+        Tariffs & m_tariffs;

 
         int CheckTariffData();
 
         int CheckTariffData();

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

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

-
-#endif