From de9c0b97f626465955f03671cb933d89d5c4346f Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 31 Oct 2015 12:12:30 -0400
Subject: [PATCH] Col*: Assigned a type-specific base class to each column
 object

- Base class currently does nothing.
---
 src/columns/ColDepends.h     | 8 ++------
 src/columns/ColDescription.h | 8 ++------
 src/columns/ColID.h          | 8 ++------
 src/columns/ColIMask.h       | 8 ++------
 src/columns/ColMask.h        | 8 ++------
 src/columns/ColParent.h      | 8 ++------
 src/columns/ColProject.h     | 8 ++------
 src/columns/ColRecur.h       | 8 ++------
 src/columns/ColStatus.h      | 8 ++------
 src/columns/ColTags.h        | 8 ++------
 src/columns/ColTypeDate.cpp  | 3 +--
 src/columns/ColUDA.h         | 4 ----
 src/columns/ColUUID.h        | 8 ++------
 src/columns/ColUrgency.h     | 8 ++------
 14 files changed, 25 insertions(+), 78 deletions(-)

diff --git a/src/columns/ColDepends.h b/src/columns/ColDepends.h
index a9297db3c..454e1305b 100644
--- a/src/columns/ColDepends.h
+++ b/src/columns/ColDepends.h
@@ -27,13 +27,9 @@
 #ifndef INCLUDED_COLDEPENDS
 #define INCLUDED_COLDEPENDS
 
-#include <vector>
-#include <string>
-#include <Column.h>
-#include <Color.h>
-#include <Task.h>
+#include <ColTypeString.h>
 
-class ColumnDepends : public Column
+class ColumnDepends : public ColumnTypeString
 {
 public:
   ColumnDepends ();
diff --git a/src/columns/ColDescription.h b/src/columns/ColDescription.h
index fdd47f689..67eafcd87 100644
--- a/src/columns/ColDescription.h
+++ b/src/columns/ColDescription.h
@@ -27,13 +27,9 @@
 #ifndef INCLUDED_COLDESCRIPTION
 #define INCLUDED_COLDESCRIPTION
 
-#include <vector>
-#include <string>
-#include <Column.h>
-#include <Color.h>
-#include <Task.h>
+#include <ColTypeString.h>
 
-class ColumnDescription : public Column
+class ColumnDescription : public ColumnTypeString
 {
 public:
   ColumnDescription ();
diff --git a/src/columns/ColID.h b/src/columns/ColID.h
index 55cd665be..ae44a460e 100644
--- a/src/columns/ColID.h
+++ b/src/columns/ColID.h
@@ -27,13 +27,9 @@
 #ifndef INCLUDED_COLID
 #define INCLUDED_COLID
 
-#include <vector>
-#include <string>
-#include <Column.h>
-#include <Color.h>
-#include <Task.h>
+#include <ColTypeNumeric.h>
 
-class ColumnID : public Column
+class ColumnID : public ColumnTypeNumeric
 {
 public:
   ColumnID ();
diff --git a/src/columns/ColIMask.h b/src/columns/ColIMask.h
index bab03a7b2..7d9b9810c 100644
--- a/src/columns/ColIMask.h
+++ b/src/columns/ColIMask.h
@@ -27,13 +27,9 @@
 #ifndef INCLUDED_COLIMASK
 #define INCLUDED_COLIMASK
 
-#include <vector>
-#include <string>
-#include <Column.h>
-#include <Color.h>
-#include <Task.h>
+#include <ColTypeNumeric.h>
 
-class ColumnIMask : public Column
+class ColumnIMask : public ColumnTypeNumeric
 {
 public:
   ColumnIMask ();
diff --git a/src/columns/ColMask.h b/src/columns/ColMask.h
index b8ef04c99..3f63140b9 100644
--- a/src/columns/ColMask.h
+++ b/src/columns/ColMask.h
@@ -27,13 +27,9 @@
 #ifndef INCLUDED_COLMASK
 #define INCLUDED_COLMASK
 
-#include <vector>
-#include <string>
-#include <Column.h>
-#include <Color.h>
-#include <Task.h>
+#include <ColTypeString.h>
 
-class ColumnMask : public Column
+class ColumnMask : public ColumnTypeString
 {
 public:
   ColumnMask ();
diff --git a/src/columns/ColParent.h b/src/columns/ColParent.h
index ad2415be6..c556d6358 100644
--- a/src/columns/ColParent.h
+++ b/src/columns/ColParent.h
@@ -27,13 +27,9 @@
 #ifndef INCLUDED_COLPARENT
 #define INCLUDED_COLPARENT
 
-#include <vector>
-#include <string>
-#include <Column.h>
-#include <Color.h>
-#include <Task.h>
+#include <ColTypeString.h>
 
-class ColumnParent : public Column
+class ColumnParent : public ColumnTypeString
 {
 public:
   ColumnParent ();
diff --git a/src/columns/ColProject.h b/src/columns/ColProject.h
index 708ee3eb5..4f0b1a66d 100644
--- a/src/columns/ColProject.h
+++ b/src/columns/ColProject.h
@@ -27,13 +27,9 @@
 #ifndef INCLUDED_COLPROJECT
 #define INCLUDED_COLPROJECT
 
-#include <vector>
-#include <string>
-#include <Column.h>
-#include <Color.h>
-#include <Task.h>
+#include <ColTypeString.h>
 
-class ColumnProject : public Column
+class ColumnProject : public ColumnTypeString
 {
 public:
   ColumnProject ();
diff --git a/src/columns/ColRecur.h b/src/columns/ColRecur.h
index 19c0ea92c..c6c12c687 100644
--- a/src/columns/ColRecur.h
+++ b/src/columns/ColRecur.h
@@ -27,13 +27,9 @@
 #ifndef INCLUDED_COLRECUR
 #define INCLUDED_COLRECUR
 
-#include <vector>
-#include <string>
-#include <Column.h>
-#include <Color.h>
-#include <Task.h>
+#include <ColTypeDuration.h>
 
-class ColumnRecur : public Column
+class ColumnRecur : public ColumnTypeDuration
 {
 public:
   ColumnRecur ();
diff --git a/src/columns/ColStatus.h b/src/columns/ColStatus.h
index f16f14da3..a5f8fc62e 100644
--- a/src/columns/ColStatus.h
+++ b/src/columns/ColStatus.h
@@ -27,13 +27,9 @@
 #ifndef INCLUDED_COLSTATUS
 #define INCLUDED_COLSTATUS
 
-#include <vector>
-#include <string>
-#include <Column.h>
-#include <Color.h>
-#include <Task.h>
+#include <ColTypeString.h>
 
-class ColumnStatus : public Column
+class ColumnStatus : public ColumnTypeString
 {
 public:
   ColumnStatus ();
diff --git a/src/columns/ColTags.h b/src/columns/ColTags.h
index ecd8d3716..6762d5cf0 100644
--- a/src/columns/ColTags.h
+++ b/src/columns/ColTags.h
@@ -27,13 +27,9 @@
 #ifndef INCLUDED_COLTAGS
 #define INCLUDED_COLTAGS
 
-#include <vector>
-#include <string>
-#include <Column.h>
-#include <Color.h>
-#include <Task.h>
+#include <ColTypeString.h>
 
-class ColumnTags : public Column
+class ColumnTags : public ColumnTypeString
 {
 public:
   ColumnTags ();
diff --git a/src/columns/ColTypeDate.cpp b/src/columns/ColTypeDate.cpp
index 52e136051..829fe20ef 100644
--- a/src/columns/ColTypeDate.cpp
+++ b/src/columns/ColTypeDate.cpp
@@ -25,9 +25,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
-#include <math.h>
-#include <Context.h>
 #include <ColTypeDate.h>
+#include <Context.h>
 #include <ISO8601.h>
 #include <text.h>
 #include <i18n.h>
diff --git a/src/columns/ColUDA.h b/src/columns/ColUDA.h
index 62b131b45..7c66ebcaa 100644
--- a/src/columns/ColUDA.h
+++ b/src/columns/ColUDA.h
@@ -27,11 +27,7 @@
 #ifndef INCLUDED_COLUDA
 #define INCLUDED_COLUDA
 
-#include <vector>
-#include <string>
 #include <Column.h>
-#include <Color.h>
-#include <Task.h>
 
 class ColumnUDA : public Column
 {
diff --git a/src/columns/ColUUID.h b/src/columns/ColUUID.h
index ddf22fd33..a4aafb4d2 100644
--- a/src/columns/ColUUID.h
+++ b/src/columns/ColUUID.h
@@ -27,13 +27,9 @@
 #ifndef INCLUDED_COLUUID
 #define INCLUDED_COLUUID
 
-#include <vector>
-#include <string>
-#include <Column.h>
-#include <Color.h>
-#include <Task.h>
+#include <ColTypeString.h>
 
-class ColumnUUID : public Column
+class ColumnUUID : public ColumnTypeString
 {
 public:
   ColumnUUID ();
diff --git a/src/columns/ColUrgency.h b/src/columns/ColUrgency.h
index 8529a88b1..d0daf9474 100644
--- a/src/columns/ColUrgency.h
+++ b/src/columns/ColUrgency.h
@@ -27,13 +27,9 @@
 #ifndef INCLUDED_COLURGENCY
 #define INCLUDED_COLURGENCY
 
-#include <vector>
-#include <string>
-#include <Column.h>
-#include <Color.h>
-#include <Task.h>
+#include <ColTypeNumeric.h>
 
-class ColumnUrgency : public Column
+class ColumnUrgency : public ColumnTypeNumeric
 {
 public:
   ColumnUrgency ();