X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/7df336e60c959c440b2c330f7a7ca9b0251db2a1..f7b9fd9ef231946b4a1e5edf54c187e7ddbed8fe:/projects/stargazer/plugins/configuration/sgconfig/parser_tariffs.h?ds=sidebyside diff --git a/projects/stargazer/plugins/configuration/sgconfig/parser_tariffs.h b/projects/stargazer/plugins/configuration/sgconfig/parser_tariffs.h index 5dad5eff..418ae45c 100644 --- a/projects/stargazer/plugins/configuration/sgconfig/parser_tariffs.h +++ b/projects/stargazer/plugins/configuration/sgconfig/parser_tariffs.h @@ -25,6 +25,7 @@ #include "parser.h" #include "stg/tariff_conf.h" +#include "stg/common.h" #include @@ -43,10 +44,10 @@ class GET_TARIFFS: public BASE_PARSER class FACTORY : public BASE_PARSER::FACTORY { public: - FACTORY(const TARIFFS & tariffs) : m_tariffs(tariffs) {} + explicit 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); } + { registry[ToLower(tag)] = new FACTORY(tariffs); } private: const TARIFFS & m_tariffs; }; @@ -68,10 +69,10 @@ class ADD_TARIFF: public BASE_PARSER class FACTORY : public BASE_PARSER::FACTORY { public: - FACTORY(TARIFFS & tariffs) : m_tariffs(tariffs) {} + explicit 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); } + { registry[ToLower(tag)] = new FACTORY(tariffs); } private: TARIFFS & m_tariffs; }; @@ -98,7 +99,7 @@ class DEL_TARIFF: public BASE_PARSER 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); } + { registry[ToLower(tag)] = new FACTORY(tariffs, users); } private: TARIFFS & m_tariffs; const USERS & m_users; @@ -124,10 +125,10 @@ class CHG_TARIFF: public BASE_PARSER class FACTORY : public BASE_PARSER::FACTORY { public: - FACTORY(TARIFFS & tariffs) : m_tariffs(tariffs) {} + explicit 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); } + { registry[ToLower(tag)] = new FACTORY(tariffs); } private: TARIFFS & m_tariffs; };