diff --git a/src/commands/CmdDelete.cpp b/src/commands/CmdDelete.cpp index 1c066318c..fff51b7cb 100644 --- a/src/commands/CmdDelete.cpp +++ b/src/commands/CmdDelete.cpp @@ -29,6 +29,8 @@ #include #include #include +#include +#include #include #include @@ -48,22 +50,22 @@ CmdDelete::CmdDelete () int CmdDelete::execute (std::string& output) { int rc = 0; -/* std::stringstream out; context.disallowModification (); std::vector tasks; context.tdb.lock (context.config.getBoolean ("locking")); - Filter filter; - context.tdb.loadPending (tasks, filter); - - // Filter sequence. + context.tdb.loadPending (tasks); std::vector all = tasks; - context.filter.applySequence (tasks, context.sequence); - if (tasks.size () == 0) + + // Apply filter. + std::vector filtered; + filter (tasks, filtered); + + if (filtered.size () == 0) { - context.footnote ("No tasks specified."); + context.footnote (STRING_FEEDBACK_NO_TASKS_SP); return 1; } @@ -72,7 +74,7 @@ int CmdDelete::execute (std::string& output) sprintf (endTime, "%u", (unsigned int) time (NULL)); std::vector ::iterator task; - for (task = tasks.begin (); task != tasks.end (); ++task) + for (task = filtered.begin (); task != filtered.end (); ++task) { if (task->getStatus () == Task::pending || task->getStatus () == Task::waiting) @@ -185,7 +187,6 @@ int CmdDelete::execute (std::string& output) context.tdb.unlock (); output = out.str (); -*/ return rc; }