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

Dates: Migrated from ISO8601d to Datetime

Browse source
This commit is contained in:
Paul Beckingham 2016-12-17 21:56:18 -05:00
parent ead550cbef
commit 340ec66891
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/Dates.cpp
View file

@ -30,7 +30,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <time.h> #include <time.h>
#include <shared.h> #include <shared.h>
#include <ISO8601.h> #include <Datetime.h>
#include <Lexer.h> #include <Lexer.h>
#include <CLI2.h> #include <CLI2.h>
#include <i18n.h> #include <i18n.h>
@ -38,14 +38,14 @@
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
static bool isMonth (const std::string& name, int& i) static bool isMonth (const std::string& name, int& i)
{ {
i = ISO8601d::monthOfYear (name) - 1; i = Datetime::monthOfYear (name) - 1;
return i != -2 ? true : false; return i != -2 ? true : false;
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
static bool isDay (const std::string& name, int& i) static bool isDay (const std::string& name, int& i)
{ {
i = ISO8601d::dayOfWeek (name); i = Datetime::dayOfWeek (name);
return i != -1 ? true : false; return i != -1 ? true : false;
} }
@ -303,7 +303,7 @@ bool namedDates (const std::string& name, Variant& value)
t->tm_hour = 24; t->tm_hour = 24;
t->tm_min = 0; t->tm_min = 0;
t->tm_sec = -1; t->tm_sec = -1;
t->tm_mday = ISO8601d::daysInMonth (t->tm_mon + 1, t->tm_year + 1900); t->tm_mday = Datetime::daysInMonth (t->tm_year + 1900, t->tm_mon + 1);
t->tm_isdst = -1; t->tm_isdst = -1;
value = Variant (mktime (t), Variant::type_date); value = Variant (mktime (t), Variant::type_date);
} }
@ -415,7 +415,7 @@ bool namedDates (const std::string& name, Variant& value)
// If it is this month. // If it is this month.
if (d < number && if (d < number &&
number <= ISO8601d::daysInMonth (m, y)) number <= Datetime::daysInMonth (y, m))
{ {
t->tm_hour = t->tm_min = t->tm_sec = 0; t->tm_hour = t->tm_min = t->tm_sec = 0;
t->tm_mon = m - 1; t->tm_mon = m - 1;