Remove extra debug.

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

diff --git a/projects/stargazer/tariffs_impl.h b/projects/stargazer/tariffs_impl.h
index caeb811d954bdafe9d277f44a0077987e1d6a005..4b554b4d9baa110a2a9d9cd53aaf97ec7d2eafb6 100644 (file)
--- a/projects/stargazer/tariffs_impl.h
+++ b/projects/stargazer/tariffs_impl.h
@@ -22,62 +22,59 @@
  *    Author : Boris Mikhailenko <stg34@stargazer.dp.ua>
  */
 
  *    Author : Boris Mikhailenko <stg34@stargazer.dp.ua>
  */
 

-#ifndef TARIFFS_IMPL_H
-#define TARIFFS_IMPL_H
-
-#include <pthread.h>
-
-#include <string>
-#include <list>
-#include <set>
+#pragma once

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

-#define TARIFF_DAY     0
-#define TARIFF_NIGHT   1
+#include <string>
+#include <vector>
+#include <set>
+#include <mutex>
+
+namespace STG
+{
+
+struct Store;
+class Logger;
+struct Admin;

 
 

-class STORE;
-class STG_LOGGER;
-class ADMIN;
+class TariffsImpl : public Tariffs {
+    public:
+        using Data = std::vector<TariffImpl>;

 
 

-class TARIFFS_IMPL : public TARIFFS {
-public:
-    TARIFFS_IMPL(STORE * store);
-    virtual ~TARIFFS_IMPL();
-    int     ReadTariffs ();
-    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);
+        explicit TariffsImpl(Store * store);

 
 

-    void AddNotifierAdd(NOTIFIER_BASE<TARIFF_DATA> * notifier);
-    void DelNotifierAdd(NOTIFIER_BASE<TARIFF_DATA> * notifier);
+        int ReadTariffs () override;
+        const Tariff * FindByName(const std::string & name) const override;
+        const Tariff * GetNoTariff() const override { return &noTariff; }
+        size_t Count() const override;
+        int Del(const std::string & name, const Admin * admin) override;
+        int Add(const std::string & name, const Admin * admin) override;
+        int Chg(const TariffData & td, const Admin * admin) override;

 
 

-    void AddNotifierDel(NOTIFIER_BASE<TARIFF_DATA> * notifier);
-    void DelNotifierDel(NOTIFIER_BASE<TARIFF_DATA> * notifier);
+        void AddNotifierAdd(NotifierBase<TariffData> * notifier) override;
+        void DelNotifierAdd(NotifierBase<TariffData> * notifier) override;

 
 

-    void    GetTariffsData(std::list<TARIFF_DATA> * tdl);
+        void AddNotifierDel(NotifierBase<TariffData> * notifier) override;
+        void DelNotifierDel(NotifierBase<TariffData> * notifier) override;

 
 

-    const std::string & GetStrError() const { return strError; }
+        void GetTariffsData(std::vector<TariffData> * tdl) const override;

 
 

-private:
-    TARIFFS_IMPL(const TARIFFS_IMPL & rvalue);
-    TARIFFS_IMPL & operator=(const TARIFFS_IMPL & rvalue);
+        const std::string & GetStrError() const override { return strError; }

 
 

-    std::list<TARIFF_IMPL>  tariffs;
-    STORE *                 store;
-    STG_LOGGER &            WriteServLog;
-    mutable pthread_mutex_t mutex;
-    std::string             strError;
-    TARIFF_IMPL             noTariff;
+    private:
+        Data               tariffs;
+        Store*             store;
+        Logger&            WriteServLog;
+        mutable std::mutex m_mutex;
+        std::string        strError;
+        TariffImpl         noTariff;

 
 

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

 };
 
 };
 

-#endif
+}