GothenburgBitFactory/timewarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/timewarrior.git synced 2025-07-07 20:06:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Extract creation of intervals into IntervalFactory

Browse source
This commit is contained in:
Thomas Lauf 2018-10-05 13:48:55 +02:00
parent 8008cd8312
commit 1a24c49507
9 changed files with 190 additions and 110 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/data.cpp
View file

@ -1,6 +1,6 @@
////////////////////////////////////////////////////////////////////////////////
//
// Copyright 2015 - 2018, Thomas Lauf, Paul Beckingham, Federico Hernandez.
// Copyright 2016 - 2018, Thomas Lauf, Paul Beckingham, Federico Hernandez.
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
@ -32,6 +32,7 @@
#include <timew.h>
#include <algorithm>
#include <iostream>
#include "IntervalFactory.h"
////////////////////////////////////////////////////////////////////////////////
// A filter is just another interval, containing start, end and tags.
@ -316,8 +317,7 @@ std::vector <Interval> getAllInclusions (Database& database)
std::vector <Interval> all;
for (auto& line : database.allLines ())
{
Interval i;
i.initialize (line);
Interval i = IntervalFactory::fromSerialization (line);
all.push_back (i);
}
@ -675,14 +675,14 @@ Interval getLatestInterval (Database& database)
// ^ 20
if (line.find (" - ") != 20)
{
i.initialize (line);
i = IntervalFactory::fromSerialization (line);
return i;
}
}
auto lastLine = database.lastLine ();
if (! lastLine.empty ())
i.initialize (lastLine);
i = IntervalFactory::fromSerialization (lastLine);
return i;
}