From 0a8fb12dc516146809fd6a1906d4df3a2f4b2f73 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 17 Dec 2016 17:37:47 -0500
Subject: [PATCH] CmdCalendar: Migrated from ViewText to Table

---
 src/commands/CmdCalendar.cpp | 42 ++++++++++++++++++------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/commands/CmdCalendar.cpp b/src/commands/CmdCalendar.cpp
index cd7ff484c..d500d6e0d 100644
--- a/src/commands/CmdCalendar.cpp
+++ b/src/commands/CmdCalendar.cpp
@@ -30,7 +30,7 @@
 #include <iomanip>
 #include <stdlib.h>
 #include <Context.h>
-#include <ViewText.h>
+#include <Table.h>
 #include <Lexer.h>
 #include <i18n.h>
 #include <shared.h>
@@ -368,10 +368,10 @@ int CmdCalendar::execute (std::string& output)
     // Table with holiday information
     if (context.config.get ("calendar.holidays") == "full")
     {
-      ViewText holTable;
+      Table holTable;
       holTable.width (context.getWidth ());
-      holTable.add (Column::factory ("string", STRING_CMD_CAL_LABEL_DATE));
-      holTable.add (Column::factory ("string", STRING_CMD_CAL_LABEL_HOL));
+      holTable.add (STRING_CMD_CAL_LABEL_DATE);
+      holTable.add (STRING_CMD_CAL_LABEL_HOL);
       holTable.colorHeader (color_label);
 
       std::map <time_t, std::vector<std::string>> hm; // we need to store multiple holidays per day
@@ -434,32 +434,32 @@ std::string CmdCalendar::renderMonths (
   // Build table for the number of months to be displayed.
   Color label (context.config.get ("color.label"));
 
-  ViewText view;
+  Table view;
   view.colorHeader (label);
   view.width (context.getWidth ());
   for (int i = 0 ; i < (monthsPerLine * 8); i += 8)
   {
     if (weekStart == 1)
     {
-      view.add (Column::factory ("string.right", ""));
-      view.add (Column::factory ("string.right", utf8_substr (ISO8601d::dayName (1), 0, 2)));
-      view.add (Column::factory ("string.right", utf8_substr (ISO8601d::dayName (2), 0, 2)));
-      view.add (Column::factory ("string.right", utf8_substr (ISO8601d::dayName (3), 0, 2)));
-      view.add (Column::factory ("string.right", utf8_substr (ISO8601d::dayName (4), 0, 2)));
-      view.add (Column::factory ("string.right", utf8_substr (ISO8601d::dayName (5), 0, 2)));
-      view.add (Column::factory ("string.right", utf8_substr (ISO8601d::dayName (6), 0, 2)));
-      view.add (Column::factory ("string.right", utf8_substr (ISO8601d::dayName (0), 0, 2)));
+      view.add ("", false);
+      view.add (utf8_substr (ISO8601d::dayName (1), 0, 2), false);
+      view.add (utf8_substr (ISO8601d::dayName (2), 0, 2), false);
+      view.add (utf8_substr (ISO8601d::dayName (3), 0, 2), false);
+      view.add (utf8_substr (ISO8601d::dayName (4), 0, 2), false);
+      view.add (utf8_substr (ISO8601d::dayName (5), 0, 2), false);
+      view.add (utf8_substr (ISO8601d::dayName (6), 0, 2), false);
+      view.add (utf8_substr (ISO8601d::dayName (0), 0, 2), false);
     }
     else
     {
-      view.add (Column::factory ("string.right", ""));
-      view.add (Column::factory ("string.right", utf8_substr (ISO8601d::dayName (0), 0, 2)));
-      view.add (Column::factory ("string.right", utf8_substr (ISO8601d::dayName (1), 0, 2)));
-      view.add (Column::factory ("string.right", utf8_substr (ISO8601d::dayName (2), 0, 2)));
-      view.add (Column::factory ("string.right", utf8_substr (ISO8601d::dayName (3), 0, 2)));
-      view.add (Column::factory ("string.right", utf8_substr (ISO8601d::dayName (4), 0, 2)));
-      view.add (Column::factory ("string.right", utf8_substr (ISO8601d::dayName (5), 0, 2)));
-      view.add (Column::factory ("string.right", utf8_substr (ISO8601d::dayName (6), 0, 2)));
+      view.add ("", false);
+      view.add (utf8_substr (ISO8601d::dayName (0), 0, 2), false);
+      view.add (utf8_substr (ISO8601d::dayName (1), 0, 2), false);
+      view.add (utf8_substr (ISO8601d::dayName (2), 0, 2), false);
+      view.add (utf8_substr (ISO8601d::dayName (3), 0, 2), false);
+      view.add (utf8_substr (ISO8601d::dayName (4), 0, 2), false);
+      view.add (utf8_substr (ISO8601d::dayName (5), 0, 2), false);
+      view.add (utf8_substr (ISO8601d::dayName (6), 0, 2), false);
     }
   }