Ticket 37. The braces removed in the case construction in the

[stg.git] / projects / stargazer / tariffs_impl.h

diff --git a/projects/stargazer/tariffs_impl.h b/projects/stargazer/tariffs_impl.h
index b8aac298bf03788394f99dd7a641a917bd8d4e19..288f1225412a159eb60e63200a4cc07681423c46 100644 (file)
--- a/projects/stargazer/tariffs_impl.h
+++ b/projects/stargazer/tariffs_impl.h
@@ -1,8 +1,3 @@
- /*
- $Revision: 1.7 $
- $Date: 2010/10/07 18:43:21 $
- */
-

 /*
  *    This program is free software; you can redistribute it and/or modify
  *    it under the terms of the GNU General Public License as published by
 /*
  *    This program is free software; you can redistribute it and/or modify
  *    it under the terms of the GNU General Public License as published by


@@ -27,12 +22,6 @@
  *    Author : Boris Mikhailenko <stg34@stargazer.dp.ua>
  */
 
  *    Author : Boris Mikhailenko <stg34@stargazer.dp.ua>
  */
 

-/*
- $Revision: 1.7 $
- $Date: 2010/10/07 18:43:21 $
- $Author: faust $
- */
-

 #ifndef TARIFFS_IMPL_H
 #define TARIFFS_IMPL_H
 
 #ifndef TARIFFS_IMPL_H
 #define TARIFFS_IMPL_H
 


@@ -40,6 +29,7 @@
 
 #include <string>
 #include <list>
 
 #include <string>
 #include <list>

+#include <set>

 
 #include "stg/tariff.h"
 #include "stg/tariffs.h"
 
 #include "stg/tariff.h"
 #include "stg/tariffs.h"


@@ -55,26 +45,41 @@ class ADMIN;
 
 class TARIFFS_IMPL : public TARIFFS {
 public:
 
 class TARIFFS_IMPL : public TARIFFS {
 public:

+    typedef std::list<TARIFF_IMPL> Tariffs;
+

     TARIFFS_IMPL(STORE * store);
     virtual ~TARIFFS_IMPL();
     TARIFFS_IMPL(STORE * store);
     virtual ~TARIFFS_IMPL();

-    int     ReadTariffs ();
+    int ReadTariffs ();

     const TARIFF * FindByName(const std::string & name) const;
     const TARIFF * FindByName(const std::string & name) const;

-    const TARIFF * GetNoTariff() const { return &noTariff; };
-    int     GetTariffsNum() const;
-    int     Del(const std::string & name, const ADMIN * admin);
-    int     Add(const std::string & name, const ADMIN * admin);
-    int     Chg(const TARIFF_DATA & td, const ADMIN * admin);
+    const TARIFF * GetNoTariff() const { return &noTariff; }
+    size_t Count() const;
+    int Del(const std::string & name, const ADMIN * admin);
+    int Add(const std::string & name, const ADMIN * admin);
+    int Chg(const TARIFF_DATA & td, const ADMIN * admin);

 
 

-    void    GetTariffsData(std::list<TARIFF_DATA> * tdl);
+    void AddNotifierAdd(NOTIFIER_BASE<TARIFF_DATA> * notifier);
+    void DelNotifierAdd(NOTIFIER_BASE<TARIFF_DATA> * notifier);
+
+    void AddNotifierDel(NOTIFIER_BASE<TARIFF_DATA> * notifier);
+    void DelNotifierDel(NOTIFIER_BASE<TARIFF_DATA> * notifier);
+
+    void GetTariffsData(std::list<TARIFF_DATA> * tdl) const;

 
     const std::string & GetStrError() const { return strError; }
 
     const std::string & GetStrError() const { return strError; }

+

 private:
 private:

-    std::list<TARIFF_IMPL>  tariffs;
+    TARIFFS_IMPL(const TARIFFS_IMPL & rvalue);
+    TARIFFS_IMPL & operator=(const TARIFFS_IMPL & rvalue);
+
+    Tariffs                 tariffs;

     STORE *                 store;
     STG_LOGGER &            WriteServLog;
     mutable pthread_mutex_t mutex;
     std::string             strError;
     TARIFF_IMPL             noTariff;
     STORE *                 store;
     STG_LOGGER &            WriteServLog;
     mutable pthread_mutex_t mutex;
     std::string             strError;
     TARIFF_IMPL             noTariff;

+
+    std::set<NOTIFIER_BASE<TARIFF_DATA>*> onAddNotifiers;
+    std::set<NOTIFIER_BASE<TARIFF_DATA>*> onDelNotifiers;

 };
 
 #endif
 };
 
 #endif