Merge remote-tracking branch 'origin/master' into ticket37

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

diff --git a/include/stg/tariffs.h b/include/stg/tariffs.h
index 515e76088f1322fce2b153c56967c5ea8c7ae19d..6a851c5a3979167d25774a595f97cd82a27912bd 100644 (file)
--- a/include/stg/tariffs.h
+++ b/include/stg/tariffs.h
@@ -32,6 +32,9 @@ struct TARIFF_DATA;
 
 class TARIFFS {
 public:
 
 class TARIFFS {
 public:

+    typedef std::list<TARIFF> Tariffs;
+
+    virtual ~TARIFFS() {}

     virtual int ReadTariffs () = 0;
     virtual const TARIFF * FindByName(const std::string & name) const = 0;
     virtual const TARIFF * GetNoTariff() const = 0;
     virtual int ReadTariffs () = 0;
     virtual const TARIFF * FindByName(const std::string & name) const = 0;
     virtual const TARIFF * GetNoTariff() const = 0;


@@ -45,7 +48,7 @@ public:
     virtual void AddNotifierDel(NOTIFIER_BASE<TARIFF_DATA> * notifier) = 0;
     virtual void DelNotifierDel(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::list<TARIFF_DATA> * tdl) const = 0;

 
     virtual size_t Count() const = 0;
 
 
     virtual size_t Count() const = 0;