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

diff --git a/projects/stargazer/tariff_impl.h b/projects/stargazer/tariff_impl.h
index aaa6a3b9..f33c08af 100644
--- a/projects/stargazer/tariff_impl.h
+++ b/projects/stargazer/tariff_impl.h
@@ -36,9 +36,9 @@
 #include <string>
 #include <list>
 
-#include "tariff.h"
-#include "os_int.h"
-#include "tariff_conf.h"
+#include "stg/tariff.h"
+#include "stg/os_int.h"
+#include "stg/tariff_conf.h"
 
 #define TARIFF_DAY     0
 #define TARIFF_NIGHT   1
@@ -46,16 +46,20 @@
 class TARIFF_IMPL : public TARIFF {
 public:
     TARIFF_IMPL()
-        : tariffData()
+        : TARIFF(),
+          tariffData()
     {};
     TARIFF_IMPL(const std::string & name)
-        : tariffData(name)
+        : TARIFF(),
+          tariffData(name)
     {};
     TARIFF_IMPL(const TARIFF_DATA & td)
-        : tariffData(td)
+        : TARIFF(),
+          tariffData(td)
     {};
     TARIFF_IMPL(const TARIFF_IMPL & t)
-        : tariffData(t.tariffData)
+        : TARIFF(),
+          tariffData(t.tariffData)
     {};
     virtual ~TARIFF_IMPL() {};
 
@@ -78,10 +82,10 @@ public:
     int     GetThreshold(int dir) const;
     const TARIFF_DATA & GetTariffData() const { return tariffData; }
 
-    TARIFF & operator=(const TARIFF_DATA & td);
-    TARIFF & operator=(const TARIFF & t);
-    bool     operator==(const TARIFF & rhs) const { return GetName() == rhs.GetName(); }
-    bool     operator!=(const TARIFF & rhs) const { return GetName() != rhs.GetName(); }
+    TARIFF_IMPL & operator=(const TARIFF_DATA & td);
+    TARIFF_IMPL & operator=(const TARIFF_IMPL & t);
+    bool     operator==(const TARIFF_IMPL & rhs) const { return GetName() == rhs.GetName(); }
+    bool     operator!=(const TARIFF_IMPL & rhs) const { return GetName() != rhs.GetName(); }
 
 private:
     TARIFF_DATA     tariffData;