gergely/taskwarrior-2.x
1
0
Fork 0
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Revert "Col*: Missing paren"

Browse Source 
This reverts commit e3ea548de0.
This commit is contained in:
Paul Beckingham
2015-11-02 18:42:16 -05:00
parent d23d0fafb7
commit 5a01fe003d
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/columns/ColDescription.cpp
View File

@@ -186,7 +186,7 @@ void ColumnDescription::render (
{ {
for (auto& i : annos) for (auto& i : annos)
{ {
ISO8601d dt (static_cast <time_t> (std::stoul (i.first.substr (11)))); ISO8601d dt (strtol (i.first.substr (11).c_str (), NULL, 10));
description += "\n" + std::string (_indent, ' ') + dt.toString (_dateformat) + " " + i.second; description += "\n" + std::string (_indent, ' ') + dt.toString (_dateformat) + " " + i.second;
} }
} }
@@ -217,7 +217,7 @@ void ColumnDescription::render (
{ {
for (auto& i : annos) for (auto& i : annos)
{ {
ISO8601d dt (static_cast <time_t> (std::stoul (i.first.substr (11)))); ISO8601d dt (strtol (i.first.substr (11).c_str (), NULL, 10));
description += " " + dt.toString (_dateformat) + " " + i.second; description += " " + dt.toString (_dateformat) + " " + i.second;
} }
} }

4
src/columns/ColUDA.cpp
View File

@@ -88,7 +88,7 @@ void ColumnUDA::measure (Task& task, unsigned int& minimum, unsigned int& maximu
// rc.report.<report>.dateformat // rc.report.<report>.dateformat
// rc.dateformat.report // rc.dateformat.report
// rc.dateformat // rc.dateformat
ISO8601d date (static_cast <time_t> (std::stoul (value))); ISO8601d date ((time_t) strtol (value.c_str (), NULL, 10));
std::string format = context.config.get ("report." + _report + ".dateformat"); std::string format = context.config.get ("report." + _report + ".dateformat");
if (format == "") if (format == "")
format = context.config.get ("dateformat.report"); format = context.config.get ("dateformat.report");
@@ -151,7 +151,7 @@ void ColumnUDA::render (
format = context.config.get ("dateformat"); format = context.config.get ("dateformat");
} }
renderStringLeft (lines, width, color, ISO8601d (static_cast <time_t> (std::stoul (value))).toString (format)); renderStringLeft (lines, width, color, ISO8601d ((time_t) strtol (value.c_str (), NULL, 10)).toString (format));
} }
else if (_type == "duration") else if (_type == "duration")
renderStringRight (lines, width, color, ISO8601p (value).format ()); renderStringRight (lines, width, color, ISO8601p (value).format ());