GCC version, warnings.

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

diff --git a/include/stg/tariffs.h b/include/stg/tariffs.h
index b492833b3de660204c7511d84e8a9089b4ea4fac..51179d2fdf11873ed14f4914e3cff0c6640ec6e5 100644 (file)
--- a/include/stg/tariffs.h
+++ b/include/stg/tariffs.h
@@ -22,7 +22,9 @@
 #define TARIFFS_H
 
 #include <string>
 #define TARIFFS_H
 
 #include <string>

-#include <list>
+#include <vector>
+
+#include "notifer.h"

 
 class ADMIN;
 class TARIFF;
 
 class ADMIN;
 class TARIFF;


@@ -30,16 +32,23 @@ struct TARIFF_DATA;
 
 class TARIFFS {
 public:
 
 class TARIFFS {
 public:

-    virtual int            ReadTariffs () = 0;
+    virtual ~TARIFFS() {}
+    virtual int ReadTariffs () = 0;

     virtual const TARIFF * FindByName(const std::string & name) const = 0;
     virtual const TARIFF * GetNoTariff() const = 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 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 void AddNotifierAdd(NOTIFIER_BASE<TARIFF_DATA> * notifier) = 0;
+    virtual void DelNotifierAdd(NOTIFIER_BASE<TARIFF_DATA> * notifier) = 0;
+
+    virtual void AddNotifierDel(NOTIFIER_BASE<TARIFF_DATA> * notifier) = 0;
+    virtual void DelNotifierDel(NOTIFIER_BASE<TARIFF_DATA> * notifier) = 0;

 
 

-    virtual void           GetTariffsData(std::list<TARIFF_DATA> * tdl) = 0;
+    virtual void GetTariffsData(std::vector<TARIFF_DATA> * tdl) const = 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;
 };