From 995de68c903707a45c30e6e7b4ff124537917cf5 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Wed, 12 Aug 2015 21:35:09 -0400
Subject: [PATCH] ISO8601: Converted various calls of ::format to ::formatVague

---
 src/columns/ColDate.cpp      | 14 +++++++-------
 src/columns/ColDue.cpp       |  4 ----
 src/columns/ColScheduled.cpp |  5 -----
 src/columns/ColStart.cpp     |  9 +++++----
 src/commands/CmdInfo.cpp     |  4 ++--
 5 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/src/columns/ColDate.cpp b/src/columns/ColDate.cpp
index 389f917ef..a35a6d386 100644
--- a/src/columns/ColDate.cpp
+++ b/src/columns/ColDate.cpp
@@ -56,7 +56,7 @@ ColumnDate::ColumnDate ()
                format (now.toJulian (), 13, 12),
                now.toEpochString (),
                now.toISO (),
-               ISO8601p (Date () - now).format (),
+               ISO8601p (Date () - now).formatVague (),
                "",
                ISO8601p (Date () - now).format ()};
 }
@@ -94,7 +94,7 @@ void ColumnDate::measure (Task& task, unsigned int& minimum, unsigned int& maxim
     else if (_style == "countdown")
     {
       Date now;
-      minimum = maximum = ISO8601p (now - date).format ().length ();
+      minimum = maximum = ISO8601p (now - date).formatVague ().length ();
     }
     else if (_style == "julian")
     {
@@ -111,13 +111,13 @@ void ColumnDate::measure (Task& task, unsigned int& minimum, unsigned int& maxim
     else if (_style == "age")
     {
       Date now;
-      minimum = maximum = ISO8601p (now - date).format ().length ();
+      minimum = maximum = ISO8601p (now - date).formatVague ().length ();
     }
     else if (_style == "remaining")
     {
       Date now;
       if (date > now)
-        minimum = maximum = ISO8601p (date - now).format ().length ();
+        minimum = maximum = ISO8601p (date - now).formatVague ().length ();
     }
     else
       throw format (STRING_COLUMN_BAD_FORMAT, _name, _style);
@@ -160,7 +160,7 @@ void ColumnDate::render (
       lines.push_back (
         color.colorize (
           rightJustify (
-            ISO8601p (now - date).format (), width)));
+            ISO8601p (now - date).formatVague (), width)));
     }
     else if (_style == "julian")
     {
@@ -190,7 +190,7 @@ void ColumnDate::render (
       lines.push_back (
         color.colorize (
           leftJustify (
-            ISO8601p (now - date).format (), width)));
+            ISO8601p (now - date).formatVague (), width)));
     }
     else if (_style == "remaining")
     {
@@ -199,7 +199,7 @@ void ColumnDate::render (
         lines.push_back (
           color.colorize (
             rightJustify (
-              ISO8601p (date - now).format (), width)));
+              ISO8601p (date - now).formatVague (), width)));
     }
   }
 }
diff --git a/src/columns/ColDue.cpp b/src/columns/ColDue.cpp
index dac0ef451..d719a3025 100644
--- a/src/columns/ColDue.cpp
+++ b/src/columns/ColDue.cpp
@@ -40,10 +40,6 @@ ColumnDue::ColumnDue ()
 {
   _name      = "due";
   _label     = STRING_COLUMN_LABEL_DUE;
-
-  Date now;
-  now += 125;
-  _examples.push_back (ISO8601p (now - Date ()).format ());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/columns/ColScheduled.cpp b/src/columns/ColScheduled.cpp
index dfd16a30c..b82c494f5 100644
--- a/src/columns/ColScheduled.cpp
+++ b/src/columns/ColScheduled.cpp
@@ -40,11 +40,6 @@ ColumnScheduled::ColumnScheduled ()
 {
   _name     = "scheduled";
   _label    = STRING_COLUMN_LABEL_SCHED;
-  _styles   = {"countdown"};
-
-  Date now;
-  now += 125;
-  _examples = {ISO8601p (now - Date ()).format ()};
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/columns/ColStart.cpp b/src/columns/ColStart.cpp
index 6c74e9036..1c42cc76f 100644
--- a/src/columns/ColStart.cpp
+++ b/src/columns/ColStart.cpp
@@ -36,10 +36,11 @@ extern Context context;
 ////////////////////////////////////////////////////////////////////////////////
 ColumnStart::ColumnStart ()
 {
-  _name     = "start";
-  _label    = STRING_COLUMN_LABEL_STARTED;
-  _styles   = {"active"};
-  _examples = {context.config.get ("active.indicator")};
+  _name  = "start";
+  _label = STRING_COLUMN_LABEL_STARTED;
+
+  _styles.push_back ("active");
+  _examples.push_back (context.config.get ("active.indicator"));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/commands/CmdInfo.cpp b/src/commands/CmdInfo.cpp
index b25cd0415..a48d1cb1e 100644
--- a/src/commands/CmdInfo.cpp
+++ b/src/commands/CmdInfo.cpp
@@ -229,7 +229,7 @@ int CmdInfo::execute (std::string& output)
     if (created.length ())
     {
       Date dt (strtol (created.c_str (), NULL, 10));
-      age = ISO8601p (now - dt).format ();
+      age = ISO8601p (now - dt).formatVague ();
     }
 
     view.set (row, 1, entry + " (" + age + ")");
@@ -289,7 +289,7 @@ int CmdInfo::execute (std::string& output)
       view.set (row, 0, STRING_CMD_INFO_MODIFIED);
 
       Date mod (task.get_date ("modified"));
-      std::string age = ISO8601p (now - mod).format ();
+      std::string age = ISO8601p (now - mod).formatVague ();
       view.set (row, 1, mod.toString (dateformat) + " (" + age + ")");
     }