Some more BSD-related issues.

[stg.git] / stargazer / plugins / configuration / sgconfig / parser_services.h

diff --git a/stargazer/plugins/configuration/sgconfig/parser_services.h b/stargazer/plugins/configuration/sgconfig/parser_services.h
index f4d87fe90a243901f1e7feaf2f8dc6fdbb1e059f..6eb67e0f90bcf18cc7a1de6cd97a3618fe5d2f78 100644 (file)
--- a/stargazer/plugins/configuration/sgconfig/parser_services.h
+++ b/stargazer/plugins/configuration/sgconfig/parser_services.h
@@ -18,8 +18,7 @@
  *    Author : Maxim Mamontov <faust@stargazer.dp.ua>
  */
 
  *    Author : Maxim Mamontov <faust@stargazer.dp.ua>
  */
 

-#ifndef __STG_SGCONFIG_PARSER_SERVICES_H__
-#define __STG_SGCONFIG_PARSER_SERVICES_H__
+#pragma once

 
 #include "parser.h"
 
 
 #include "parser.h"
 


@@ -29,10 +28,11 @@
 
 #include <string>
 
 
 #include <string>
 

-class SERVICES;
-

 namespace STG
 {
 namespace STG
 {

+
+struct Services;
+

 namespace PARSER
 {
 
 namespace PARSER
 {
 


@@ -42,21 +42,21 @@ class GET_SERVICES: public BASE_PARSER
         class FACTORY : public BASE_PARSER::FACTORY
         {
             public:
         class FACTORY : public BASE_PARSER::FACTORY
         {
             public:

-                FACTORY(const SERVICES & services) : m_services(services) {}
-                virtual BASE_PARSER * create(const ADMIN & admin) { return new GET_SERVICES(admin, m_services); }
-                static void Register(REGISTRY & registry, const SERVICES & services)
+                FACTORY(const Services & services) : m_services(services) {}
+                virtual BASE_PARSER * create(const Admin & admin) { return new GET_SERVICES(admin, m_services); }
+                static void Register(REGISTRY & registry, const Services & services)

                 { registry[ToLower(tag)] = new FACTORY(services); }
             private:
                 { registry[ToLower(tag)] = new FACTORY(services); }
             private:

-                const SERVICES & m_services;
+                const Services & m_services;

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

-        GET_SERVICES(const ADMIN & admin, const SERVICES & services)
+        GET_SERVICES(const Admin & admin, const Services & services)

             : BASE_PARSER(admin, tag), m_services(services) {}
 
     private:
             : BASE_PARSER(admin, tag), m_services(services) {}
 
     private:

-        const SERVICES & m_services;
+        const Services & m_services;

 
         void CreateAnswer();
 };
 
         void CreateAnswer();
 };


@@ -67,23 +67,23 @@ class GET_SERVICE: public BASE_PARSER
         class FACTORY : public BASE_PARSER::FACTORY
         {
             public:
         class FACTORY : public BASE_PARSER::FACTORY
         {
             public:

-                FACTORY(const SERVICES & services) : m_services(services) {}
-                virtual BASE_PARSER * create(const ADMIN & admin) { return new GET_SERVICE(admin, m_services); }
-                static void Register(REGISTRY & registry, SERVICES & services)
+                FACTORY(const Services & services) : m_services(services) {}
+                virtual BASE_PARSER * create(const Admin & admin) { return new GET_SERVICE(admin, m_services); }
+                static void Register(REGISTRY & registry, Services & services)

                 { registry[ToLower(tag)] = new FACTORY(services); }
             private:
                 { registry[ToLower(tag)] = new FACTORY(services); }
             private:

-                const SERVICES & m_services;
+                const Services & m_services;

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

-        GET_SERVICE(const ADMIN & admin, const SERVICES & services)
+        GET_SERVICE(const Admin & admin, const Services & services)

             : BASE_PARSER(admin, tag), m_services(services) {}
         int Start(void * data, const char * el, const char ** attr);
 
     private:
         std::string m_name;
             : BASE_PARSER(admin, tag), m_services(services) {}
         int Start(void * data, const char * el, const char ** attr);
 
     private:
         std::string m_name;

-        const SERVICES & m_services;
+        const Services & m_services;

 
         void CreateAnswer();
 };
 
         void CreateAnswer();
 };


@@ -94,23 +94,23 @@ class ADD_SERVICE: public BASE_PARSER
         class FACTORY : public BASE_PARSER::FACTORY
         {
             public:
         class FACTORY : public BASE_PARSER::FACTORY
         {
             public:

-                FACTORY(SERVICES & services) : m_services(services) {}
-                virtual BASE_PARSER * create(const ADMIN & admin) { return new ADD_SERVICE(admin, m_services); }
-                static void Register(REGISTRY & registry, SERVICES & services)
+                FACTORY(Services & services) : m_services(services) {}
+                virtual BASE_PARSER * create(const Admin & admin) { return new ADD_SERVICE(admin, m_services); }
+                static void Register(REGISTRY & registry, Services & services)

                 { registry[ToLower(tag)] = new FACTORY(services); }
             private:
                 { registry[ToLower(tag)] = new FACTORY(services); }
             private:

-                SERVICES & m_services;
+                Services & m_services;

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

-        ADD_SERVICE(const ADMIN & admin, SERVICES & services)
+        ADD_SERVICE(const Admin & admin, Services & services)

             : BASE_PARSER(admin, tag), m_services(services) {}
         int Start(void * data, const char * el, const char ** attr);
 
     private:
         std::string m_name;
             : BASE_PARSER(admin, tag), m_services(services) {}
         int Start(void * data, const char * el, const char ** attr);
 
     private:
         std::string m_name;

-        SERVICES & m_services;
+        Services & m_services;

 
         void CreateAnswer();
 };
 
         void CreateAnswer();
 };


@@ -121,23 +121,23 @@ class DEL_SERVICE: public BASE_PARSER
         class FACTORY : public BASE_PARSER::FACTORY
         {
             public:
         class FACTORY : public BASE_PARSER::FACTORY
         {
             public:

-                FACTORY(SERVICES & services) : m_services(services) {}
-                virtual BASE_PARSER * create(const ADMIN & admin) { return new DEL_SERVICE(admin, m_services); }
-                static void Register(REGISTRY & registry, SERVICES & services)
+                FACTORY(Services & services) : m_services(services) {}
+                virtual BASE_PARSER * create(const Admin & admin) { return new DEL_SERVICE(admin, m_services); }
+                static void Register(REGISTRY & registry, Services & services)

                 { registry[ToLower(tag)] = new FACTORY(services); }
             private:
                 { registry[ToLower(tag)] = new FACTORY(services); }
             private:

-                SERVICES & m_services;
+                Services & m_services;

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

-        DEL_SERVICE(const ADMIN & admin, SERVICES & services)
+        DEL_SERVICE(const Admin & admin, Services & services)

             : BASE_PARSER(admin, tag), m_services(services) {}
         int Start(void * data, const char * el, const char ** attr);
 
     private:
         std::string m_name;
             : BASE_PARSER(admin, tag), m_services(services) {}
         int Start(void * data, const char * el, const char ** attr);
 
     private:
         std::string m_name;

-        SERVICES & m_services;
+        Services & m_services;

 
         void CreateAnswer();
 };
 
         void CreateAnswer();
 };


@@ -148,28 +148,26 @@ class CHG_SERVICE: public BASE_PARSER
         class FACTORY : public BASE_PARSER::FACTORY
         {
             public:
         class FACTORY : public BASE_PARSER::FACTORY
         {
             public:

-                FACTORY(SERVICES & services) : m_services(services) {}
-                virtual BASE_PARSER * create(const ADMIN & admin) { return new CHG_SERVICE(admin, m_services); }
-                static void Register(REGISTRY & registry, SERVICES & services)
+                FACTORY(Services & services) : m_services(services) {}
+                virtual BASE_PARSER * create(const Admin & admin) { return new CHG_SERVICE(admin, m_services); }
+                static void Register(REGISTRY & registry, Services & services)

                 { registry[ToLower(tag)] = new FACTORY(services); }
             private:
                 { registry[ToLower(tag)] = new FACTORY(services); }
             private:

-                SERVICES & m_services;
+                Services & m_services;

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

-        CHG_SERVICE(const ADMIN & admin, SERVICES & services)
+        CHG_SERVICE(const Admin & admin, Services & services)

             : BASE_PARSER(admin, tag), m_services(services) {}
         int Start(void * data, const char * el, const char ** attr);
 
     private:
             : BASE_PARSER(admin, tag), m_services(services) {}
         int Start(void * data, const char * el, const char ** attr);
 
     private:

-        SERVICE_CONF_RES m_service;
-        SERVICES & m_services;
+        ServiceConfOpt m_service;
+        Services & m_services;

 
         void CreateAnswer();
 };
 
 } // namespace PARSER
 } // namespace STG
 
         void CreateAnswer();
 };
 
 } // namespace PARSER
 } // namespace STG

-
-#endif