From 34c0cc81e7aee9c2163051c5c01c9704855b2d33 Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Thu, 28 Apr 2016 08:48:37 -0400 Subject: [PATCH] helper: Renamed createFilterIntervalFromCLI to getFilter --- src/commands/CmdExport.cpp | 2 +- src/commands/CmdGaps.cpp | 2 +- src/commands/CmdReport.cpp | 2 +- src/commands/CmdReportDay.cpp | 2 +- src/commands/CmdReportSummary.cpp | 2 +- src/commands/CmdTrack.cpp | 2 +- src/helper.cpp | 2 +- src/timew.h | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/commands/CmdExport.cpp b/src/commands/CmdExport.cpp index cf7588a8..fd5c7ecf 100644 --- a/src/commands/CmdExport.cpp +++ b/src/commands/CmdExport.cpp @@ -35,7 +35,7 @@ int CmdExport ( Rules& rules, Database& database) { - auto filter = createFilterIntervalFromCLI (cli); + auto filter = getFilter (cli); auto timeline = createTimelineFromData (rules, database, filter); std::cout << jsonFromIntervals (timeline.tracked (rules)); return 0; diff --git a/src/commands/CmdGaps.cpp b/src/commands/CmdGaps.cpp index 9bcac434..9623e1f2 100644 --- a/src/commands/CmdGaps.cpp +++ b/src/commands/CmdGaps.cpp @@ -35,7 +35,7 @@ int CmdGaps ( Rules& rules, Database& database) { - auto filter = createFilterIntervalFromCLI (cli); + auto filter = getFilter (cli); auto timeline = createTimelineFromData (rules, database, filter); for (auto& gap : timeline.untracked (rules)) { diff --git a/src/commands/CmdReport.cpp b/src/commands/CmdReport.cpp index a05d6dc6..a8ad6ac9 100644 --- a/src/commands/CmdReport.cpp +++ b/src/commands/CmdReport.cpp @@ -79,7 +79,7 @@ int CmdReport ( throw std::string ("Specify which report to run."); // Filter the data. - auto filter = createFilterIntervalFromCLI (cli); + auto filter = getFilter (cli); auto timeline = createTimelineFromData (rules, database, filter); auto intervals = timeline.tracked (rules); diff --git a/src/commands/CmdReportDay.cpp b/src/commands/CmdReportDay.cpp index f349bf12..71ce55ab 100644 --- a/src/commands/CmdReportDay.cpp +++ b/src/commands/CmdReportDay.cpp @@ -47,7 +47,7 @@ int CmdReportDay ( Database& database) { // Create a filter, and if empty, choose 'today'. - auto filter = createFilterIntervalFromCLI (cli); + auto filter = getFilter (cli); if (! filter.range.started ()) filter.range = Range (Datetime ("today"), Datetime ("tomorrow")); diff --git a/src/commands/CmdReportSummary.cpp b/src/commands/CmdReportSummary.cpp index 79eeede2..acd59fce 100644 --- a/src/commands/CmdReportSummary.cpp +++ b/src/commands/CmdReportSummary.cpp @@ -35,7 +35,7 @@ int CmdReportSummary ( Rules& rules, Database& database) { - auto filter = createFilterIntervalFromCLI (cli); + auto filter = getFilter (cli); // If filter is empty, choose 'today'. if (! filter.range.started ()) diff --git a/src/commands/CmdTrack.cpp b/src/commands/CmdTrack.cpp index 9a9207da..864a655b 100644 --- a/src/commands/CmdTrack.cpp +++ b/src/commands/CmdTrack.cpp @@ -35,7 +35,7 @@ int CmdTrack ( Rules& rules, Database& database) { - auto filter = createFilterIntervalFromCLI (cli); + auto filter = getFilter (cli); auto timeline = createTimelineFromData (rules, database, filter); for (auto& interval : splitInterval (filter, timeline.excluded (rules))) database.addInterval (interval); diff --git a/src/helper.cpp b/src/helper.cpp index 4335197d..318e262e 100644 --- a/src/helper.cpp +++ b/src/helper.cpp @@ -124,7 +124,7 @@ bool expandIntervalHint ( // ["from"] "for" // ["before"|"after" ] // -Interval createFilterIntervalFromCLI (const CLI& cli) +Interval getFilter (const CLI& cli) { Interval filter; std::string start; diff --git a/src/timew.h b/src/timew.h index 82e05e0a..b89722b2 100644 --- a/src/timew.h +++ b/src/timew.h @@ -47,8 +47,8 @@ int dispatchCommand (const CLI&, Database&, Rules&, const Extensions&); Color tagColor (const Rules&, const std::string&); std::string intervalSummarize (const Rules&, const Interval&); bool expandIntervalHint (const std::string&, std::string&, std::string&); -Interval createFilterIntervalFromCLI (const CLI&); Timeline createTimelineFromData (const Rules&, Database&, const Interval&); +Interval getFilter (const CLI&); Interval getLatestInterval (Database&); bool intervalMatchesFilterInterval (const Interval&, const Interval&); std::string jsonFromIntervals (const std::vector &);