В классе тарифа удален неиспользуемый метод GetDirPrice

diff --git a/projects/stargazer/tariff.cpp b/projects/stargazer/tariff.cpp
index 088cb53d7bfa9174a8f8ca18bd3bc2451613dab2..70b755762bc131be0b1ac365b48b424f406b50d3 100644 (file)
--- a/projects/stargazer/tariff.cpp
+++ b/projects/stargazer/tariff.cpp
@@ -88,11 +88,6 @@ void TARIFF::PrintTariff() const
 //printfd(__FILE__, "Free: %8.3f\n", tariffConf.free);
 }
 //-----------------------------------------------------------------------------
 //printfd(__FILE__, "Free: %8.3f\n", tariffConf.free);
 }
 //-----------------------------------------------------------------------------

-void TARIFF::GetDirPrice(int dir, DIRPRICE_DATA * dd) const
-{
-*dd = tariffData.dirPrice[dir];
-}
-//-----------------------------------------------------------------------------

 void TARIFF::GetTariffData(TARIFF_DATA * td) const
 {
 *td = tariffData;
 void TARIFF::GetTariffData(TARIFF_DATA * td) const
 {
 *td = tariffData;

diff --git a/projects/stargazer/tariff.h b/projects/stargazer/tariff.h
index 830863eb36d7a00b1652e320646401d928963ffe..ed61e0151f4ab671e3a69566682c7a5eb0daa622 100644 (file)
--- a/projects/stargazer/tariff.h
+++ b/projects/stargazer/tariff.h
@@ -62,7 +62,6 @@ public:
                                   int dir,
                                   time_t t) const;
     double  GetFreeMb() const { return tariffData.tariffConf.free; };
                                   int dir,
                                   time_t t) const;
     double  GetFreeMb() const { return tariffData.tariffConf.free; };

-    void    GetDirPrice(int dir, DIRPRICE_DATA * dd) const;

     double  GetPassiveCost() const { return tariffData.tariffConf.passiveCost; };
     double  GetFee() const { return tariffData.tariffConf.fee; };
     double  GetFree() const { return tariffData.tariffConf.free; };
     double  GetPassiveCost() const { return tariffData.tariffConf.passiveCost; };
     double  GetFee() const { return tariffData.tariffConf.fee; };
     double  GetFree() const { return tariffData.tariffConf.free; };