From 7a196bac9c61929cfbc468be8906c6b341d88952 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 24 May 2014 22:52:04 -0400
Subject: [PATCH] CmdIDs

- Converted from A3 to Filter.
---
 src/commands/CmdIDs.cpp | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/commands/CmdIDs.cpp b/src/commands/CmdIDs.cpp
index baf926196..1b1baab09 100644
--- a/src/commands/CmdIDs.cpp
+++ b/src/commands/CmdIDs.cpp
@@ -28,6 +28,7 @@
 #include <sstream>
 #include <algorithm>
 #include <Context.h>
+#include <Filter.h>
 #include <main.h>
 #include <text.h>
 #include <util.h>
@@ -53,8 +54,9 @@ int CmdIDs::execute (std::string& output)
 {
   // Apply filter.
   handleRecurrence ();
+  Filter filter;
   std::vector <Task> filtered;
-  filter (filtered);
+  filter.subset (filtered);
   context.tdb2.commit ();
 
   // Find number of matching tasks.
@@ -66,7 +68,7 @@ int CmdIDs::execute (std::string& output)
 
   std::sort (ids.begin (), ids.end ());
   output = compressIds (ids) + "\n";
-  
+
   context.headers.clear ();
   return 0;
 }
@@ -86,8 +88,9 @@ int CmdCompletionIds::execute (std::string& output)
 {
   // Apply filter.
   handleRecurrence ();
+  Filter filter;
   std::vector <Task> filtered;
-  filter (filtered);
+  filter.subset (filtered);
   context.tdb2.commit ();
 
   std::vector <int> ids;
@@ -120,8 +123,9 @@ int CmdZshCompletionIds::execute (std::string& output)
 {
   // Apply filter.
   handleRecurrence ();
+  Filter filter;
   std::vector <Task> filtered;
-  filter (filtered);
+  filter.subset (filtered);
   context.tdb2.commit ();
 
   std::stringstream out;
@@ -155,8 +159,9 @@ int CmdUUIDs::execute (std::string& output)
 {
   // Apply filter.
   handleRecurrence ();
+  Filter filter;
   std::vector <Task> filtered;
-  filter (filtered);
+  filter.subset (filtered);
   context.tdb2.commit ();
 
   std::vector <std::string> uuids;
@@ -187,8 +192,9 @@ int CmdCompletionUuids::execute (std::string& output)
 {
   // Apply filter.
   handleRecurrence ();
+  Filter filter;
   std::vector <Task> filtered;
-  filter (filtered);
+  filter.subset (filtered);
   context.tdb2.commit ();
 
   std::vector <std::string> uuids;
@@ -219,8 +225,9 @@ int CmdZshCompletionUuids::execute (std::string& output)
 {
   // Apply filter.
   handleRecurrence ();
+  Filter filter;
   std::vector <Task> filtered;
-  filter (filtered);
+  filter.subset (filtered);
   context.tdb2.commit ();
 
   std::stringstream out;