GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-08-30 20:37:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ColDate

Browse source 
- Converted from OldDuration to Duration.
This commit is contained in:
Paul Beckingham 2014-05-28 23:50:32 -04:00
parent f36ffd91e3
commit 05be2c2fc4
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/columns/ColDate.cpp
View file

@ -29,7 +29,7 @@
#include <Context.h> #include <Context.h>
#include <ColDate.h> #include <ColDate.h>
#include <Date.h> #include <Date.h>
#include <OldDuration.h> #include <Duration.h>
#include <text.h> #include <text.h>
#include <i18n.h> #include <i18n.h>
@ -57,9 +57,9 @@ ColumnDate::ColumnDate ()
_examples.push_back (format (now.toJulian (), 13, 12)); _examples.push_back (format (now.toJulian (), 13, 12));
_examples.push_back (now.toEpochString ()); _examples.push_back (now.toEpochString ());
_examples.push_back (now.toISO ()); _examples.push_back (now.toISO ());
_examples.push_back (OldDuration (Date () - now).formatCompact ()); _examples.push_back (Duration (Date () - now).formatCompact ());
_examples.push_back (""); _examples.push_back ("");
_examples.push_back (OldDuration (Date () - now).format ()); _examples.push_back (Duration (Date () - now).format ());
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
@ -101,7 +101,7 @@ void ColumnDate::measure (Task& task, unsigned int& minimum, unsigned int& maxim
else if (_style == "countdown") else if (_style == "countdown")
{ {
Date now; Date now;
minimum = maximum = OldDuration (now - date).format ().length (); minimum = maximum = Duration (now - date).format ().length ();
} }
else if (_style == "julian") else if (_style == "julian")
{ {
@ -118,13 +118,13 @@ void ColumnDate::measure (Task& task, unsigned int& minimum, unsigned int& maxim
else if (_style == "age") else if (_style == "age")
{ {
Date now; Date now;
minimum = maximum = OldDuration (now - date).formatCompact ().length (); minimum = maximum = Duration (now - date).formatCompact ().length ();
} }
else if (_style == "remaining") else if (_style == "remaining")
{ {
Date now; Date now;
if (date > now) if (date > now)
minimum = maximum = OldDuration (date - now).format ().length (); minimum = maximum = Duration (date - now).format ().length ();
} }
else else
throw format (STRING_COLUMN_BAD_FORMAT, _name, _style); throw format (STRING_COLUMN_BAD_FORMAT, _name, _style);
@ -167,7 +167,7 @@ void ColumnDate::render (
lines.push_back ( lines.push_back (
color.colorize ( color.colorize (
rightJustify ( rightJustify (
OldDuration (now - date).format (), width))); Duration (now - date).format (), width)));
} }
else if (_style == "julian") else if (_style == "julian")
{ {
@ -197,7 +197,7 @@ void ColumnDate::render (
lines.push_back ( lines.push_back (
color.colorize ( color.colorize (
leftJustify ( leftJustify (
OldDuration (now - date).formatCompact (), width))); Duration (now - date).formatCompact (), width)));
} }
else if (_style == "remaining") else if (_style == "remaining")
{ {
@ -206,7 +206,7 @@ void ColumnDate::render (
lines.push_back ( lines.push_back (
color.colorize ( color.colorize (
rightJustify ( rightJustify (
OldDuration (date - now).format (), width))); Duration (date - now).format (), width)));
else else
lines.push_back (""); lines.push_back ("");
} }