Move variables declaration to the beginning of the function (old C)

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

diff --git a/projects/stargazer/tariffs_impl.h b/projects/stargazer/tariffs_impl.h
index 8c2ae4d03b92e7a601e24e4223c48d0c97b812a1..caeb811d954bdafe9d277f44a0077987e1d6a005 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,41 +29,55 @@
 
 #include <string>
 #include <list>
 
 #include <string>
 #include <list>

+#include <set>

 
 

-#include "tariff.h"
+#include "stg/tariff.h"
+#include "stg/tariffs.h"
+#include "stg/tariff_conf.h"

 #include "tariff_impl.h"
 #include "tariff_impl.h"

-#include "tariffs.h"
-#include "tariff_conf.h"

 
 #define TARIFF_DAY     0
 #define TARIFF_NIGHT   1
 
 
 #define TARIFF_DAY     0
 #define TARIFF_NIGHT   1
 

-class BASE_STORE;
+class STORE;

 class STG_LOGGER;
 class ADMIN;
 
 class TARIFFS_IMPL : public TARIFFS {
 public:
 class STG_LOGGER;
 class ADMIN;
 
 class TARIFFS_IMPL : public TARIFFS {
 public:

-    TARIFFS_IMPL(BASE_STORE * store);
+    TARIFFS_IMPL(STORE * store);

     virtual ~TARIFFS_IMPL();
     int     ReadTariffs ();
     const TARIFF * FindByName(const std::string & name) const;
     const TARIFF * GetNoTariff() const { return &noTariff; };
     virtual ~TARIFFS_IMPL();
     int     ReadTariffs ();
     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);
+    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 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);
 
 
     void    GetTariffsData(std::list<TARIFF_DATA> * tdl);
 

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

 private:
 private:

-    std::list<TARIFF_IMPL>   tariffs;
-    BASE_STORE *        store;
-    STG_LOGGER &        WriteServLog;
+    TARIFFS_IMPL(const TARIFFS_IMPL & rvalue);
+    TARIFFS_IMPL & operator=(const TARIFFS_IMPL & rvalue);
+
+    std::list<TARIFF_IMPL>  tariffs;
+    STORE *                 store;
+    STG_LOGGER &            WriteServLog;

     mutable pthread_mutex_t mutex;
     mutable pthread_mutex_t mutex;

-    std::string         strError;
-    TARIFF_IMPL         noTariff;
+    std::string             strError;
+    TARIFF_IMPL             noTariff;
+
+    std::set<NOTIFIER_BASE<TARIFF_DATA>*> onAddNotifiers;
+    std::set<NOTIFIER_BASE<TARIFF_DATA>*> onDelNotifiers;

 };
 
 #endif
 };
 
 #endif