X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/6f7160dd027c8ce7e2760aa369768ba39ab80181..d5b7462f9c0fe95644ddbd117bacc4ef367cac9a:/projects/stargazer/tariffs_impl.h?ds=sidebyside

diff --git a/projects/stargazer/tariffs_impl.h b/projects/stargazer/tariffs_impl.h
index 8c2ae4d0..b8aac298 100644
--- a/projects/stargazer/tariffs_impl.h
+++ b/projects/stargazer/tariffs_impl.h
@@ -41,40 +41,40 @@
 #include <string>
 #include <list>
 
-#include "tariff.h"
+#include "stg/tariff.h"
+#include "stg/tariffs.h"
+#include "stg/tariff_conf.h"
 #include "tariff_impl.h"
-#include "tariffs.h"
-#include "tariff_conf.h"
 
 #define TARIFF_DAY     0
 #define TARIFF_NIGHT   1
 
-class BASE_STORE;
+class STORE;
 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; };
     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);
+    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);
 
-    const std::string & GetStrError() const { return strError; };
+    const std::string & GetStrError() const { return strError; }
 private:
-    std::list<TARIFF_IMPL>   tariffs;
-    BASE_STORE *        store;
-    STG_LOGGER &        WriteServLog;
+    std::list<TARIFF_IMPL>  tariffs;
+    STORE *                 store;
+    STG_LOGGER &            WriteServLog;
     mutable pthread_mutex_t mutex;
-    std::string         strError;
-    TARIFF_IMPL         noTariff;
+    std::string             strError;
+    TARIFF_IMPL             noTariff;
 };
 
 #endif