Code Cleanup

- Obsoleted Filter.{h,cpp}.
- Obsoleted Sequence.{h,cpp}.
- Eliminated Context::autoFilter.
- Stubbed Expression::eval.
This commit is contained in:
Paul Beckingham 2011-06-15 23:45:50 -04:00
parent 6b85669812
commit f971fcd110
28 changed files with 148 additions and 616 deletions

View file

@ -987,8 +987,7 @@ int CmdBurndownMonthly::execute (std::string& output)
std::vector <Task> tasks;
context.tdb.lock (context.config.getBoolean ("locking"));
handleRecurrence ();
Filter filter;
context.tdb.load (tasks, filter);
context.tdb.load (tasks);
context.tdb.commit ();
context.tdb.unlock ();
@ -1038,8 +1037,7 @@ int CmdBurndownWeekly::execute (std::string& output)
std::vector <Task> tasks;
context.tdb.lock (context.config.getBoolean ("locking"));
handleRecurrence ();
Filter filter;
context.tdb.load (tasks, filter);
context.tdb.load (tasks);
context.tdb.commit ();
context.tdb.unlock ();
@ -1089,8 +1087,7 @@ int CmdBurndownDaily::execute (std::string& output)
std::vector <Task> tasks;
context.tdb.lock (context.config.getBoolean ("locking"));
handleRecurrence ();
Filter filter;
context.tdb.load (tasks, filter);
context.tdb.load (tasks);
context.tdb.commit ();
context.tdb.unlock ();

View file

@ -65,10 +65,9 @@ int CmdCalendar::execute (std::string& output)
// Get all the tasks.
std::vector <Task> tasks;
Filter filter;
context.tdb.lock (context.config.getBoolean ("locking"));
handleRecurrence ();
context.tdb.loadPending (tasks, filter);
context.tdb.loadPending (tasks);
context.tdb.commit ();
context.tdb.unlock ();

View file

@ -88,8 +88,7 @@ int CmdCustom::execute (std::string& output)
std::vector <Task> tasks;
context.tdb.lock (context.config.getBoolean ("locking"));
handleRecurrence ();
Filter filter; // Blank
context.tdb.load (tasks, filter); // No filter.
context.tdb.load (tasks);
context.tdb.commit ();
context.tdb.unlock ();

View file

@ -59,8 +59,7 @@ int CmdHistoryMonthly::execute (std::string& output)
std::vector <Task> tasks;
context.tdb.lock (context.config.getBoolean ("locking"));
handleRecurrence ();
Filter filter;
context.tdb.load (tasks, filter);
context.tdb.load (tasks);
context.tdb.commit ();
context.tdb.unlock ();
@ -225,8 +224,7 @@ int CmdHistoryAnnual::execute (std::string& output)
std::vector <Task> tasks;
context.tdb.lock (context.config.getBoolean ("locking"));
handleRecurrence ();
Filter filter;
context.tdb.load (tasks, filter);
context.tdb.load (tasks);
context.tdb.commit ();
context.tdb.unlock ();
@ -388,8 +386,7 @@ int CmdGHistoryMonthly::execute (std::string& output)
std::vector <Task> tasks;
context.tdb.lock (context.config.getBoolean ("locking"));
handleRecurrence ();
Filter filter;
context.tdb.load (tasks, filter);
context.tdb.load (tasks);
context.tdb.commit ();
context.tdb.unlock ();
@ -594,8 +591,7 @@ int CmdGHistoryAnnual::execute (std::string& output)
std::vector <Task> tasks;
context.tdb.lock (context.config.getBoolean ("locking"));
handleRecurrence ();
Filter filter;
context.tdb.load (tasks, filter);
context.tdb.load (tasks);
context.tdb.commit ();
context.tdb.unlock ();

View file

@ -52,8 +52,7 @@ int CmdIDs::execute (std::string& output)
std::vector <Task> tasks;
context.tdb.lock (context.config.getBoolean ("locking"));
handleRecurrence ();
Filter filter;
context.tdb.load (tasks, filter);
context.tdb.load (tasks);
context.tdb.commit ();
context.tdb.unlock ();
@ -93,8 +92,7 @@ int CmdCompletionIds::execute (std::string& output)
{
std::vector <Task> tasks;
context.tdb.lock (context.config.getBoolean ("locking"));
Filter filter;
context.tdb.loadPending (tasks, filter);
context.tdb.loadPending (tasks);
context.tdb.commit ();
context.tdb.unlock ();
@ -140,8 +138,7 @@ int CmdZshCompletionIds::execute (std::string& output)
{
std::vector <Task> tasks;
context.tdb.lock (context.config.getBoolean ("locking"));
Filter filter;
context.tdb.loadPending (tasks, filter);
context.tdb.loadPending (tasks);
context.tdb.commit ();
context.tdb.unlock ();

View file

@ -1178,8 +1178,7 @@ std::string CmdImport::YAML (const std::vector <std::string>& lines)
// Load all the tasks so that the uuid uniqueness can be checked.
std::vector <Task> tasks;
Filter filter;
context.tdb.load (tasks, filter);
context.tdb.load (tasks);
Task t;

View file

@ -56,8 +56,7 @@ int CmdInfo::execute (std::string& output)
std::vector <Task> tasks;
context.tdb.lock (context.config.getBoolean ("locking"));
handleRecurrence ();
Filter filter;
context.tdb.loadPending (tasks, filter);
context.tdb.loadPending (tasks);
context.tdb.commit ();
context.tdb.unlock ();

View file

@ -51,8 +51,7 @@ int CmdQuery::execute (std::string& output)
std::vector <Task> tasks;
context.tdb.lock (context.config.getBoolean ("locking"));
handleRecurrence ();
Filter filter;
context.tdb.load (tasks, filter);
context.tdb.load (tasks);
context.tdb.commit ();
context.tdb.unlock ();

View file

@ -80,8 +80,7 @@ int CmdStatistics::execute (std::string& output)
std::vector <Task> tasks;
context.tdb.lock (context.config.getBoolean ("locking"));
handleRecurrence ();
Filter filter;
context.tdb.load (tasks, filter);
context.tdb.load (tasks);
context.tdb.commit ();
context.tdb.unlock ();

View file

@ -59,8 +59,7 @@ int CmdSummary::execute (std::string& output)
std::vector <Task> tasks;
context.tdb.lock (context.config.getBoolean ("locking"));
handleRecurrence ();
Filter filter;
context.tdb.load (tasks, filter);
context.tdb.load (tasks);
context.tdb.commit ();
context.tdb.unlock ();

View file

@ -55,11 +55,10 @@ int CmdTags::execute (std::string& output)
std::vector <Task> tasks;
context.tdb.lock (context.config.getBoolean ("locking"));
int quantity = 0;
Filter filter;
if (context.config.getBoolean ("list.all.tags"))
quantity += context.tdb.load (tasks, filter);
quantity += context.tdb.load (tasks);
else
quantity += context.tdb.loadPending (tasks, filter);
quantity += context.tdb.loadPending (tasks);
context.tdb.commit ();
context.tdb.unlock ();
@ -147,11 +146,10 @@ int CmdCompletionTags::execute (std::string& output)
std::vector <Task> tasks;
context.tdb.lock (context.config.getBoolean ("locking"));
Filter filter;
if (context.config.getBoolean ("complete.all.tags"))
context.tdb.load (tasks, filter);
context.tdb.load (tasks);
else
context.tdb.loadPending (tasks, filter);
context.tdb.loadPending (tasks);
context.tdb.commit ();
context.tdb.unlock ();

View file

@ -55,8 +55,7 @@ int CmdTimesheet::execute (std::string& output)
std::vector <Task> tasks;
context.tdb.lock (context.config.getBoolean ("locking"));
handleRecurrence ();
Filter filter;
context.tdb.load (tasks, filter);
context.tdb.load (tasks);
context.tdb.commit ();
context.tdb.unlock ();

View file

@ -51,8 +51,7 @@ int CmdUrgency::execute (std::string& output)
std::vector <Task> tasks;
context.tdb.lock (context.config.getBoolean ("locking"));
handleRecurrence ();
Filter filter;
context.tdb.loadPending (tasks, filter);
context.tdb.loadPending (tasks);
context.tdb.commit ();
context.tdb.unlock ();