diff --git a/src/helper.cpp b/src/helper.cpp index 51ab3d1c..d8469ba4 100644 --- a/src/helper.cpp +++ b/src/helper.cpp @@ -401,20 +401,20 @@ std::string jsonFromIntervals (const std::vector & intervals) } //////////////////////////////////////////////////////////////////////////////// -std::vector intervalsFromHolidays (const Rules& rules) +std::vector rangesFromHolidays (const Rules& rules) { - std::vector results; + std::vector results; for (auto& holiday : rules.all ("holidays.")) { auto lastDot = holiday.rfind ('.'); if (lastDot != std::string::npos) { - Interval h; + Daterange r; Datetime d (holiday.substr (lastDot + 1), "Y_M_D"); - h.start (d); + r.start (d); ++d; - h.end (d); - results.push_back (h); + r.end (d); + results.push_back (r); } } diff --git a/src/timew.h b/src/timew.h index 8f0d6c1f..22505b00 100644 --- a/src/timew.h +++ b/src/timew.h @@ -54,7 +54,7 @@ Timeline createTimelineFromData (const Rules&, Database&, const Filter&); Interval getLatestInterval (Database&); bool intervalMatchesFilter (const Interval&, const Filter&); std::string jsonFromIntervals (const std::vector &); -std::vector intervalsFromHolidays (const Rules&); +std::vector rangesFromHolidays (const Rules&); // utiƀ.cpp std::string osName ();