X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/7377ab11320e17a5368a731fa7b0d93cd9415e81..471a8ddb278cb5621e36a6c45e450d40580e50fd:/projects/stargazer/tariff_impl.h?ds=inline diff --git a/projects/stargazer/tariff_impl.h b/projects/stargazer/tariff_impl.h index 4948b3f8..f3accec9 100644 --- a/projects/stargazer/tariff_impl.h +++ b/projects/stargazer/tariff_impl.h @@ -31,36 +31,28 @@ #ifndef TARIFF_IMPL_H #define TARIFF_IMPL_H -#include +#include "stg/tariff.h" +#include "stg/os_int.h" +#include "stg/tariff_conf.h" #include #include -#include "stg/tariff.h" -#include "stg/os_int.h" -#include "stg/tariff_conf.h" +#include #define TARIFF_DAY 0 #define TARIFF_NIGHT 1 class TARIFF_IMPL : public TARIFF { public: - TARIFF_IMPL() - : TARIFF(), - tariffData() - {} - TARIFF_IMPL(const std::string & name) + explicit TARIFF_IMPL(const std::string & name) : TARIFF(), tariffData(name) {} - TARIFF_IMPL(const TARIFF_DATA & td) + explicit TARIFF_IMPL(const TARIFF_DATA & td) : TARIFF(), tariffData(td) {} - TARIFF_IMPL(const TARIFF_IMPL & t) - : TARIFF(), - tariffData(t.tariffData) - {} virtual ~TARIFF_IMPL() {} double GetPriceWithTraffType(uint64_t up, @@ -86,10 +78,9 @@ public: const TARIFF_DATA & GetTariffData() const { return tariffData; } 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(); } - std::string TariffChangeIsAllowed(const TARIFF & to) const; + std::string TariffChangeIsAllowed(const TARIFF & to, time_t currentTime) const; private: TARIFF_DATA tariffData;