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

Replace direct Task.data access with a temp getter (syntactic refactor)

Browse source 
Now this getter, `data_removeme`, can easily be grepped out and
replaced, one usage at a time in small PRs.
This commit is contained in:
Dustin J. Mitchell 2021-11-18 02:08:16 +00:00 • committed by Tomas Babej
parent 3a00956144
commit dede40bc4e
10 changed files with 29 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/DOM.cpp
View file

@ -246,13 +246,13 @@ bool getDOM (const std::string& name, const Task& task, Variant& value)
return false;
// Quickly deal with the most common cases.
if (task.data.size () && name == "id")
if (task.data_removeme ().size () && name == "id")
{
value = Variant (static_cast<int> (task.id));
return true;
}
if (task.data.size () && name == "urgency")
if (task.data_removeme ().size () && name == "urgency")
{
value = Variant (task.urgency_c ());
return true;
@ -318,13 +318,13 @@ bool getDOM (const std::string& name, const Task& task, Variant& value)
{
// Now that 'ref' is the contextual task, and any ID/UUID is chopped off the
// elements vector, DOM resolution is now simple.
if (ref.data.size () && size == 1 && canonical == "id")
if (ref.data_removeme ().size () && size == 1 && canonical == "id")
{
value = Variant (static_cast<int> (ref.id));
return true;
}
if (ref.data.size () && size == 1 && canonical == "urgency")
if (ref.data_removeme ().size () && size == 1 && canonical == "urgency")
{
value = Variant (ref.urgency_c ());
return true;
@ -332,7 +332,7 @@ bool getDOM (const std::string& name, const Task& task, Variant& value)
// Special handling of status required for virtual waiting status
// implementation. Remove in 3.0.0.
if (ref.data.size () && size == 1 && canonical == "status")
if (ref.data_removeme ().size () && size == 1 && canonical == "status")
{
value = Variant (ref.statusToText (ref.getStatus ()));
return true;
@ -340,7 +340,7 @@ bool getDOM (const std::string& name, const Task& task, Variant& value)
Column* column = Context::getContext ().columns[canonical];
if (ref.data.size () && size == 1 && column)
if (ref.data_removeme ().size () && size == 1 && column)
{
if (column->is_uda () && ! ref.has (canonical))
{
@ -375,13 +375,13 @@ bool getDOM (const std::string& name, const Task& task, Variant& value)
return true;
}
if (ref.data.size () && size == 2 && canonical == "tags")
if (ref.data_removeme ().size () && size == 2 && canonical == "tags")
{
value = Variant (ref.hasTag (elements[1]) ? elements[1] : "");
return true;
}
if (ref.data.size () && size == 2 && column && column->type () == "date")
if (ref.data_removeme ().size () && size == 2 && column && column->type () == "date")
{
Datetime date (ref.get_date (canonical));
if (elements[1] == "year") { value = Variant (static_cast<int> (date.year ())); return true; }
@ -396,13 +396,13 @@ bool getDOM (const std::string& name, const Task& task, Variant& value)
}
}
if (ref.data.size () && size == 2 && elements[0] == "annotations" && elements[1] == "count")
if (ref.data_removeme ().size () && size == 2 && elements[0] == "annotations" && elements[1] == "count")
{
value = Variant (static_cast<int> (ref.getAnnotationCount ()));
return true;
}
if (ref.data.size () && size == 3 && elements[0] == "annotations")
if (ref.data_removeme ().size () && size == 3 && elements[0] == "annotations")
{
auto annos = ref.getAnnotations ();
@ -430,7 +430,7 @@ bool getDOM (const std::string& name, const Task& task, Variant& value)
}
}
if (ref.data.size () && size == 4 && elements[0] == "annotations" && elements[2] == "entry")
if (ref.data_removeme ().size () && size == 4 && elements[0] == "annotations" && elements[2] == "entry")
{
auto annos = ref.getAnnotations ();