diff --git a/src/commands/CmdGaps.cpp b/src/commands/CmdGaps.cpp index 5007c8fc..51ec75ff 100644 --- a/src/commands/CmdGaps.cpp +++ b/src/commands/CmdGaps.cpp @@ -36,7 +36,7 @@ int CmdGaps ( Database& database) { auto filter = getFilter (cli); - auto untracked = getUntrackedRanges (database, rules, filter); + auto untracked = getUntracked (database, rules, filter); for (auto & u : untracked) std::cout << "# untracked " << u.dump () << "\n"; diff --git a/src/data.cpp b/src/data.cpp index 02f01566..81cdf1ae 100644 --- a/src/data.cpp +++ b/src/data.cpp @@ -610,7 +610,7 @@ std::vector getTracked ( //////////////////////////////////////////////////////////////////////////////// // Untracked time is that which is not excluded, and not filled. Gaps. -std::vector getUntrackedRanges ( +std::vector getUntracked ( Database& database, const Rules& rules, Interval& filter) diff --git a/src/timew.h b/src/timew.h index 866f2feb..0fd8feb4 100644 --- a/src/timew.h +++ b/src/timew.h @@ -37,23 +37,23 @@ #include // data.cpp -Interval getFilter (const CLI&); -std::vector getHolidays (const Rules&); -std::vector getAllExclusions (const Rules&, const Range&); -std::vector getAllInclusions (Database&); -std::vector subset (const Interval&, const std::vector &); -std::vector subset (const Range&, const std::vector &); -std::vector subset (const Range&, const std::vector &); -std::vector flatten (const Interval&, const std::vector &); -std::vector addRanges (const Range&, const std::vector &, const std::vector &); -std::vector subtractRanges (const Range&, const std::vector &, const std::vector &); -Range outerRange (const std::vector &); -bool matchesFilter (const Interval&, const Interval&); -Interval clip (const Interval&, const Range&); -std::vector getTracked (Database&, const Rules&, Interval&); -std::vector getUntrackedRanges (Database&, const Rules&, Interval&); -Interval getLatestInterval (Database&); -Range getFullDay (const Datetime&); +Interval getFilter (const CLI&); +std::vector getHolidays (const Rules&); +std::vector getAllExclusions (const Rules&, const Range&); +std::vector getAllInclusions (Database&); +std::vector subset (const Interval&, const std::vector &); +std::vector subset (const Range&, const std::vector &); +std::vector subset (const Range&, const std::vector &); +std::vector flatten (const Interval&, const std::vector &); +std::vector addRanges (const Range&, const std::vector &, const std::vector &); +std::vector subtractRanges (const Range&, const std::vector &, const std::vector &); +Range outerRange (const std::vector &); +bool matchesFilter (const Interval&, const Interval&); +Interval clip (const Interval&, const Range&); +std::vector getTracked (Database&, const Rules&, Interval&); +std::vector getUntracked (Database&, const Rules&, Interval&); +Interval getLatestInterval (Database&); +Range getFullDay (const Datetime&); // init.cpp bool lightweightVersionCheck (int, const char**);