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

Task: Removed dead code, fixed comments

Browse Source
This commit is contained in:
Paul Beckingham
2016-01-31 19:40:13 -05:00
parent 6e56849bce
commit 7c8b3c9699
1 changed files with 4 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/Task.cpp
View File

@@ -2007,7 +2007,7 @@ void Task::modify (modType type, bool text_required /* = false */)
evaluatedValue = Variant (value); evaluatedValue = Variant (value);
} }
// Dependencies are specified as IDs or UUIDs. // Delegate modification to the column object or their base classes.
if (name == "depends" || if (name == "depends" ||
name == "tags" || name == "tags" ||
name == "recur") name == "recur")
@@ -2019,26 +2019,7 @@ void Task::modify (modType type, bool text_required /* = false */)
// Dates are special, maybe. // Dates are special, maybe.
else if (column->type () == "date") else if (column->type () == "date")
{ {
// If v is duration, add 'now' to it, else store as date. column->modify (*this, value);
if (evaluatedValue.type () == Variant::type_duration)
{
context.debug (label + name + " <-- '" + format ("{1}", format (evaluatedValue.get_duration ())) + "' <-- '" + (std::string) evaluatedValue + "' <-- '" + value + "'");
Variant now;
if (namedDates ("now", now))
evaluatedValue += now;
}
else
{
evaluatedValue.cast (Variant::type_date);
context.debug (label + name + " <-- '" + format ("{1}", evaluatedValue.get_date ()) + "' <-- '" + (std::string) evaluatedValue + "' <-- '" + value + "'");
}
// If a date doesn't parse (2/29/2014) then it evaluates to zero.
if (value != "" &&
evaluatedValue.get_date () == 0)
throw format (STRING_DATE_INVALID_FORMAT, value, Variant::dateFormat);
set (name, evaluatedValue.get_date ());
mods = true; mods = true;
} }
@@ -2078,22 +2059,8 @@ void Task::modify (modType type, bool text_required /* = false */)
std::string strValue = (std::string) evaluatedValue; std::string strValue = (std::string) evaluatedValue;
if (column->validate (strValue)) if (column->validate (strValue))
{ {
/* context.debug (label + name + " <-- '" + strValue + "' <-- '" + value + "'");
if (column->can_modify ()) (*this).set (name, strValue);
{
std::string col_value = column->modify (strValue);
context.debug (label + name + " <-- '" + col_value + "' <-- '" + strValue + "' <-- '" + value + "'");
(*this).set (name, col_value);
}
else
{
*/
context.debug (label + name + " <-- '" + strValue + "' <-- '" + value + "'");
(*this).set (name, strValue);
/*
}
*/
mods = true; mods = true;
} }
else else