MySQL custom port implemented

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

diff --git a/projects/stargazer/tariffs_impl.h b/projects/stargazer/tariffs_impl.h
index caeb811d954bdafe9d277f44a0077987e1d6a005..55cc49b336ebb6cb68a1388e142fd2d93da81b6c 100644 (file)
--- a/projects/stargazer/tariffs_impl.h
+++ b/projects/stargazer/tariffs_impl.h
@@ -25,16 +25,16 @@
 #ifndef TARIFFS_IMPL_H
 #define TARIFFS_IMPL_H
 
 #ifndef TARIFFS_IMPL_H
 #define TARIFFS_IMPL_H
 

-#include <pthread.h>
+#include "stg/tariff.h"
+#include "stg/tariffs.h"
+#include "stg/tariff_conf.h"
+#include "tariff_impl.h"

 
 #include <string>
 #include <list>
 #include <set>
 
 
 #include <string>
 #include <list>
 #include <set>
 

-#include "stg/tariff.h"
-#include "stg/tariffs.h"
-#include "stg/tariff_conf.h"
-#include "tariff_impl.h"
+#include <pthread.h>

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


@@ -45,15 +45,17 @@ class ADMIN;
 
 class TARIFFS_IMPL : public TARIFFS {
 public:
 
 class TARIFFS_IMPL : public TARIFFS {
 public:

-    TARIFFS_IMPL(STORE * store);
+    typedef std::list<TARIFF_IMPL> Tariffs;
+
+    explicit TARIFFS_IMPL(STORE * store);

     virtual ~TARIFFS_IMPL();
     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; };
-    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);
+    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 AddNotifierAdd(NOTIFIER_BASE<TARIFF_DATA> * notifier);
     void DelNotifierAdd(NOTIFIER_BASE<TARIFF_DATA> * notifier);
 
     void AddNotifierAdd(NOTIFIER_BASE<TARIFF_DATA> * notifier);
     void DelNotifierAdd(NOTIFIER_BASE<TARIFF_DATA> * notifier);


@@ -61,7 +63,7 @@ public:
     void AddNotifierDel(NOTIFIER_BASE<TARIFF_DATA> * notifier);
     void DelNotifierDel(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;

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


@@ -69,7 +71,7 @@ private:
     TARIFFS_IMPL(const TARIFFS_IMPL & rvalue);
     TARIFFS_IMPL & operator=(const TARIFFS_IMPL & rvalue);
 
     TARIFFS_IMPL(const TARIFFS_IMPL & rvalue);
     TARIFFS_IMPL & operator=(const TARIFFS_IMPL & rvalue);
 

-    std::list<TARIFF_IMPL>  tariffs;
+    Tariffs                 tariffs;

     STORE *                 store;
     STG_LOGGER &            WriteServLog;
     mutable pthread_mutex_t mutex;
     STORE *                 store;
     STG_LOGGER &            WriteServLog;
     mutable pthread_mutex_t mutex;