From e871976bb93c8fcc9a7ea8d1e55371f6c11fdd4d Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Sat, 7 Jan 2017 10:46:40 -0500 Subject: [PATCH] Columns: Consistency --- src/columns/ColIMask.cpp | 1 - src/columns/ColLast.cpp | 1 - src/columns/ColParent.cpp | 1 - src/columns/ColProject.cpp | 1 - src/columns/ColRecur.cpp | 1 - src/columns/ColStart.cpp | 3 ++- src/columns/ColTags.cpp | 1 - src/columns/ColTemplate.cpp | 1 - src/columns/ColTypeDate.cpp | 1 - src/columns/ColUDA.cpp | 4 ---- src/columns/Column.cpp | 2 +- 11 files changed, 3 insertions(+), 14 deletions(-) diff --git a/src/columns/ColIMask.cpp b/src/columns/ColIMask.cpp index ee17436f3..3d2a905cc 100644 --- a/src/columns/ColIMask.cpp +++ b/src/columns/ColIMask.cpp @@ -45,7 +45,6 @@ ColumnIMask::ColumnIMask () void ColumnIMask::measure (Task& task, unsigned int& minimum, unsigned int& maximum) { minimum = maximum = 0; - if (task.has (_name)) { minimum = maximum = task.get (_name).length (); diff --git a/src/columns/ColLast.cpp b/src/columns/ColLast.cpp index 7adecaabc..3e74fb8e4 100644 --- a/src/columns/ColLast.cpp +++ b/src/columns/ColLast.cpp @@ -45,7 +45,6 @@ ColumnLast::ColumnLast () void ColumnLast::measure (Task& task, unsigned int& minimum, unsigned int& maximum) { minimum = maximum = 0; - if (task.has (_name)) { minimum = maximum = task.get (_name).length (); diff --git a/src/columns/ColParent.cpp b/src/columns/ColParent.cpp index 38518681f..a58a39a2e 100644 --- a/src/columns/ColParent.cpp +++ b/src/columns/ColParent.cpp @@ -45,7 +45,6 @@ ColumnParent::ColumnParent () void ColumnParent::measure (Task& task, unsigned int& minimum, unsigned int& maximum) { minimum = maximum = 0; - if (task.has (_name)) { if (_style == "default" || _style == "long") minimum = maximum = 36; diff --git a/src/columns/ColProject.cpp b/src/columns/ColProject.cpp index 069563db8..1da64525d 100644 --- a/src/columns/ColProject.cpp +++ b/src/columns/ColProject.cpp @@ -59,7 +59,6 @@ ColumnProject::ColumnProject () void ColumnProject::measure (Task& task, unsigned int& minimum, unsigned int& maximum) { minimum = maximum = 0; - if (task.has (_name)) { std::string project = task.get (_name); diff --git a/src/columns/ColRecur.cpp b/src/columns/ColRecur.cpp index f1cf833fc..bcf7db6ae 100644 --- a/src/columns/ColRecur.cpp +++ b/src/columns/ColRecur.cpp @@ -68,7 +68,6 @@ void ColumnRecur::setStyle (const std::string& value) void ColumnRecur::measure (Task& task, unsigned int& minimum, unsigned int& maximum) { minimum = maximum = 0; - if (task.has (_name)) { if (_style == "default" || diff --git a/src/columns/ColStart.cpp b/src/columns/ColStart.cpp index 3bb6a9ed3..6760a4227 100644 --- a/src/columns/ColStart.cpp +++ b/src/columns/ColStart.cpp @@ -58,13 +58,14 @@ void ColumnStart::setStyle (const std::string& value) void ColumnStart::measure (Task& task, unsigned int& minimum, unsigned int& maximum) { minimum = maximum = 0; - if (task.has (_name)) { if (_style == "active") minimum = maximum = utf8_width (context.config.get ("active.indicator")); else ColumnTypeDate::measure (task, minimum, maximum); + + // TODO Throw on bad format. } } diff --git a/src/columns/ColTags.cpp b/src/columns/ColTags.cpp index 246c7ee3b..b044bb827 100644 --- a/src/columns/ColTags.cpp +++ b/src/columns/ColTags.cpp @@ -75,7 +75,6 @@ void ColumnTags::setStyle (const std::string& value) void ColumnTags::measure (Task& task, unsigned int& minimum, unsigned int& maximum) { minimum = maximum = 0; - if (task.has (_name)) { if (_style == "indicator") diff --git a/src/columns/ColTemplate.cpp b/src/columns/ColTemplate.cpp index f9168525f..6a392d39e 100644 --- a/src/columns/ColTemplate.cpp +++ b/src/columns/ColTemplate.cpp @@ -45,7 +45,6 @@ ColumnTemplate::ColumnTemplate () void ColumnTemplate::measure (Task& task, unsigned int& minimum, unsigned int& maximum) { minimum = maximum = 0; - if (task.has (_name)) { if (_style == "default" || _style == "long") minimum = maximum = 36; diff --git a/src/columns/ColTypeDate.cpp b/src/columns/ColTypeDate.cpp index 869f94483..c1675a14c 100644 --- a/src/columns/ColTypeDate.cpp +++ b/src/columns/ColTypeDate.cpp @@ -72,7 +72,6 @@ ColumnTypeDate::ColumnTypeDate () void ColumnTypeDate::measure (Task& task, unsigned int& minimum, unsigned int& maximum) { minimum = maximum = 0; - if (task.has (_name)) { Datetime date (task.get_date (_name)); diff --git a/src/columns/ColUDA.cpp b/src/columns/ColUDA.cpp index 83c8ab38e..60faa1e20 100644 --- a/src/columns/ColUDA.cpp +++ b/src/columns/ColUDA.cpp @@ -71,7 +71,6 @@ bool ColumnUDAString::validate (const std::string& value) const void ColumnUDAString::measure (Task& task, unsigned int& minimum, unsigned int& maximum) { minimum = maximum = 0; - if (task.has (_name)) { if (_style == "default") @@ -159,7 +158,6 @@ bool ColumnUDANumeric::validate (const std::string& value) const void ColumnUDANumeric::measure (Task& task, unsigned int& minimum, unsigned int& maximum) { minimum = maximum = 0; - if (task.has (_name)) { if (_style == "default") @@ -239,7 +237,6 @@ bool ColumnUDADate::validate (const std::string& value) const void ColumnUDADate::measure (Task& task, unsigned int& minimum, unsigned int& maximum) { minimum = maximum = 0; - if (task.has (_name)) { if (_style == "default") @@ -345,7 +342,6 @@ bool ColumnUDADuration::validate (const std::string& value) const void ColumnUDADuration::measure (Task& task, unsigned int& minimum, unsigned int& maximum) { minimum = maximum = 0; - if (task.has (_name)) { if (_style == "default") diff --git a/src/columns/Column.cpp b/src/columns/Column.cpp index ee105d36f..29766ec96 100644 --- a/src/columns/Column.cpp +++ b/src/columns/Column.cpp @@ -154,7 +154,7 @@ void Column::factory (std::map & all) //////////////////////////////////////////////////////////////////////////////// void Column::uda (std::map & all) { - // For each UDA, instantiate and initialize ColumnUDA(). + // For each UDA, instantiate and initialize ColumnUDA. std::set udas; for (const auto& i : context.config)