Merge remote-tracking branch 'github/master'

[stg.git] / include / stg / services.h

diff --git a/include/stg/services.h b/include/stg/services.h
index 2f1eec717f74c9ab53ed2750566f52a5fb33b576..41c0cf544ad53ec598d6df39c5a4ade6ccd7c607 100644 (file)
--- a/include/stg/services.h
+++ b/include/stg/services.h
@@ -18,25 +18,32 @@
  *    Author : Maxim Mamontov <faust@stargazer.dp.ua>
  */
 
-#ifndef SERVICES_H
-#define SERVICES_H
+#pragma once
 
 #include <string>
 
-#include "service_conf.h"
+namespace STG
+{
 
-class SERVICES {
-public:
-    virtual int Add(const SERVICE_CONF & service) = 0;
-    virtual int Del(const std::string & name) = 0;
-    virtual int Change(const SERVICE_CONF & service) = 0;
-    virtual bool FindService(const std::string & name, SERVICE_CONF & service) = 0;
-    virtual bool ServiceExists(const std::string & name) const = 0;
-    virtual const std::string & GetStrError() const = 0;
+class Admin;
+struct ServiceConf;
+struct ServiceConfOpt;
+
+struct Services {
+    virtual ~Services() = default;
+
+    virtual int Add(const ServiceConf& service, const Admin* admin) = 0;
+    virtual int Del(const std::string& name, const Admin* admin) = 0;
+    virtual int Change(const ServiceConf& service, const Admin* admin) = 0;
+    virtual bool Find(const std::string& name, ServiceConf* service) const = 0;
+    virtual bool Find(const std::string& name, ServiceConfOpt* service) const = 0;
+    virtual bool Exists(const std::string& name) const = 0;
+    virtual const std::string& GetStrError() const = 0;
+    virtual size_t Count() const = 0;
 
     virtual int OpenSearch() const = 0;
-    virtual int SearchNext(int, SERVICE_CONF * service) const = 0;
+    virtual int SearchNext(int, ServiceConf* service) const = 0;
     virtual int CloseSearch(int) const = 0;
 };
 
-#endif
+}