From ed7097d5dac0d44f43d31481685d6583d3bfac15 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 30 May 2016 14:11:29 -0400
Subject: [PATCH] Task: Made better use of ::sameN methods

---
 src/Task.cpp | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/Task.cpp b/src/Task.cpp
index bfa1f8214..6a9e10f13 100644
--- a/src/Task.cpp
+++ b/src/Task.cpp
@@ -445,8 +445,7 @@ bool Task::is_dueweek () const
         status != Task::deleted)
     {
       ISO8601d due (get_date ("due"));
-      if (due >= ISO8601d ("socw") &&
-          due <= ISO8601d ("eocw"))
+      if (due.sameWeek (ISO8601d ()))
         return true;
     }
   }
@@ -465,8 +464,7 @@ bool Task::is_duemonth () const
         status != Task::deleted)
     {
       ISO8601d due (get_date ("due"));
-      if (due >= ISO8601d ("socm") &&
-          due <= ISO8601d ("eocm"))
+      if (due.sameMonth (ISO8601d ()))
         return true;
     }
   }
@@ -503,9 +501,8 @@ bool Task::is_dueyear () const
     if (status != Task::completed &&
         status != Task::deleted)
     {
-      ISO8601d now;
       ISO8601d due (get_date ("due"));
-      if (now.year () == due.year ())
+      if (due.sameYear (ISO8601d ()))
         return true;
     }
   }