Code: Formatting cleanup

This commit is contained in:
Paul Beckingham 2015-05-25 09:21:58 -04:00
parent e8d04bdce6
commit 8fd1bb630d
3 changed files with 18 additions and 21 deletions

View file

@ -42,14 +42,13 @@ ColumnDate::ColumnDate ()
_type = "date"; _type = "date";
_style = "formatted"; _style = "formatted";
_label = ""; _label = "";
_styles = {"formatted",
_styles = {"formatted", "julian",
"julian", "epoch",
"epoch", "iso",
"iso", "age",
"age", "remaining",
"remaining", "countdown"};
"countdown"};
Date now; Date now;
now -= 125; // So that "age" is non-zero. now -= 125; // So that "age" is non-zero.

View file

@ -38,18 +38,16 @@ extern Context context;
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
ColumnDepends::ColumnDepends () ColumnDepends::ColumnDepends ()
{ {
_name = "depends"; _name = "depends";
_type = "string"; _type = "string";
_style = "list"; _style = "list";
_label = STRING_COLUMN_LABEL_DEP; _label = STRING_COLUMN_LABEL_DEP;
_styles = {"list",
_styles = {"list", "count",
"count", "indicator"};
"indicator"}; _examples = {"1 2 10",
"[3]",
_examples = {"1 2 10", context.config.get ("dependency.indicator")};
"[3]",
context.config.get ("dependency.indicator")};
_hyphenate = context.config.getBoolean ("hyphenate"); _hyphenate = context.config.getBoolean ("hyphenate");
} }

View file

@ -138,7 +138,7 @@ void ColumnDescription::measure (Task& task, unsigned int& minimum, unsigned int
if (task.annotation_count) if (task.annotation_count)
{ {
unsigned int min_anno = Date::length (_dateformat); auto min_anno = Date::length (_dateformat);
std::map <std::string, std::string> annos; std::map <std::string, std::string> annos;
task.getAnnotations (annos); task.getAnnotations (annos);
for (auto& i : annos) for (auto& i : annos)