Let Interval inherit from Range

- Remove 1 level of indirection
- Remove public field Interval::range (instead use interval directly)
This commit is contained in:
Thomas Lauf 2018-06-13 23:01:35 +02:00
parent 0d33700336
commit 9dd106116c
30 changed files with 289 additions and 280 deletions

View file

@ -38,8 +38,8 @@ int CmdTrack (
// If this is not a proper closed interval, then the user is trying to make
// the 'track' command behave like 'start', so delegate to CmdStart.
if (! filter.range.is_started () ||
! filter.range.is_ended ())
if (! filter.is_started () ||
! filter.is_ended ())
return CmdStart (cli, rules, database);
database.startTransaction ();
@ -47,7 +47,7 @@ int CmdTrack (
// Validation must occur before flattening.
validate (cli, rules, database, filter);
for (auto& interval : flatten (filter, getAllExclusions (rules, filter.range)))
for (auto& interval : flatten (filter, getAllExclusions (rules, filter)))
{
database.addInterval (interval, rules.getBoolean ("verbose"));