X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/4ee4759a51cf944de103eb73a654ec00ccb3664d..b2b89723a2427bba8290bd6967a1ab39cbb630be:/include/stg/tariffs.h

diff --git a/include/stg/tariffs.h b/include/stg/tariffs.h
index 9a35f645..959c6112 100644
--- a/include/stg/tariffs.h
+++ b/include/stg/tariffs.h
@@ -18,39 +18,46 @@
  *    Author : Maxim Mamontov <faust@stargazer.dp.ua>
  */
 
-#ifndef TARIFFS_H
-#define TARIFFS_H
+#pragma once
+
+#include "subscriptions.h"
 
 #include <string>
-#include <list>
+#include <vector>
+
+namespace STG
+{
 
-#include "notifer.h"
+class Admin;
+struct Tariff;
+struct TariffData;
 
-class ADMIN;
-class TARIFF;
-struct TARIFF_DATA;
+class Tariffs
+{
+    public:
+        virtual ~Tariffs() = default;
 
-class TARIFFS {
-public:
-    virtual ~TARIFFS() {}
-    virtual int ReadTariffs () = 0;
-    virtual const TARIFF * FindByName(const std::string & name) const = 0;
-    virtual const TARIFF * GetNoTariff() const = 0;
-    virtual int Del(const std::string & name, const ADMIN * admin) = 0;
-    virtual int Add(const std::string & name, const ADMIN * admin) = 0;
-    virtual int Chg(const TARIFF_DATA & td, const ADMIN * admin) = 0;
+        virtual int ReadTariffs() = 0;
+        virtual const Tariff* FindByName(const std::string& name) const = 0;
+        virtual const Tariff* GetNoTariff() const = 0;
+        virtual int Del(const std::string& name, const Admin* admin) = 0;
+        virtual int Add(const std::string& name, const Admin* admin) = 0;
+        virtual int Chg(const TariffData& td, const Admin* admin) = 0;
 
-    virtual void AddNotifierAdd(NOTIFIER_BASE<TARIFF_DATA> * notifier) = 0;
-    virtual void DelNotifierAdd(NOTIFIER_BASE<TARIFF_DATA> * notifier) = 0;
+        template <typename F>
+        auto onAdd(F&& f) { return m_onAddCallbacks.add(std::forward<F>(f)); }
+        template <typename F>
+        auto onDel(F&& f) { return m_onDelCallbacks.add(std::forward<F>(f)); }
 
-    virtual void AddNotifierDel(NOTIFIER_BASE<TARIFF_DATA> * notifier) = 0;
-    virtual void DelNotifierDel(NOTIFIER_BASE<TARIFF_DATA> * notifier) = 0;
+        virtual void GetTariffsData(std::vector<TariffData>* tdl) const = 0;
 
-    virtual void GetTariffsData(std::list<TARIFF_DATA> * tdl) = 0;
+        virtual size_t Count() const = 0;
 
-    virtual size_t Count() const = 0;
+        virtual const std::string& GetStrError() const = 0;
 
-    virtual const std::string & GetStrError() const = 0;
+    protected:
+        Subscriptions<TariffData> m_onAddCallbacks;
+        Subscriptions<TariffData> m_onDelCallbacks;
 };
 
-#endif
+}