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

C++11: Cleaned up commands code with range-based for

Browse Source
This commit is contained in:
Paul Beckingham
2015-05-11 17:45:15 -04:00
parent bd3d58484a
commit 5a57dfd70d
42 changed files with 911 additions and 1065 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/commands/CmdIDs.cpp
View File

@@ -59,10 +59,9 @@ int CmdIDs::execute (std::string& output)
// Find number of matching tasks.
std::vector <int> ids;
std::vector <Task>::iterator task;
for (task = filtered.begin (); task != filtered.end (); ++task)
if (task->id)
ids.push_back (task->id);
for (auto& task : filtered)
if (task.id)
ids.push_back (task.id);
std::sort (ids.begin (), ids.end ());
output = compressIds (ids) + "\n";
@@ -146,11 +145,10 @@ int CmdCompletionIds::execute (std::string& output)
filter.subset (filtered);
std::vector <int> ids;
std::vector <Task>::iterator task;
for (task = filtered.begin (); task != filtered.end (); ++task)
if (task->getStatus () != Task::deleted &&
task->getStatus () != Task::completed)
ids.push_back (task->id);
for (auto& task : filtered)
if (task.getStatus () != Task::deleted &&
task.getStatus () != Task::completed)
ids.push_back (task.id);
std::sort (ids.begin (), ids.end ());
join (output, "\n", ids);
@@ -180,13 +178,12 @@ int CmdZshCompletionIds::execute (std::string& output)
filter.subset (filtered);
std::stringstream out;
std::vector <Task>::iterator task;
for (task = filtered.begin (); task != filtered.end (); ++task)
if (task->getStatus () != Task::deleted &&
task->getStatus () != Task::completed)
out << task->id
for (auto& task : filtered)
if (task.getStatus () != Task::deleted &&
task.getStatus () != Task::completed)
out << task.id
<< ":"
<< str_replace(task->get ("description"), ":", zshColonReplacement)
<< str_replace(task.get ("description"), ":", zshColonReplacement)
<< "\n";
output = out.str ();
@@ -215,9 +212,8 @@ int CmdUUIDs::execute (std::string& output)
filter.subset (filtered);
std::vector <std::string> uuids;
std::vector <Task>::iterator task;
for (task = filtered.begin (); task != filtered.end (); ++task)
uuids.push_back (task->get ("uuid"));
for (auto& task : filtered)
uuids.push_back (task.get ("uuid"));
std::sort (uuids.begin (), uuids.end ());
join (output, ",", uuids);
@@ -247,9 +243,8 @@ int CmdCompletionUuids::execute (std::string& output)
filter.subset (filtered);
std::vector <std::string> uuids;
std::vector <Task>::iterator task;
for (task = filtered.begin (); task != filtered.end (); ++task)
uuids.push_back (task->get ("uuid"));
for (auto& task : filtered)
uuids.push_back (task.get ("uuid"));
std::sort (uuids.begin (), uuids.end ());
join (output, "\n", uuids);
@@ -279,11 +274,10 @@ int CmdZshCompletionUuids::execute (std::string& output)
filter.subset (filtered);
std::stringstream out;
std::vector <Task>::iterator task;
for (task = filtered.begin (); task != filtered.end (); ++task)
out << task->get ("uuid")
for (auto& task : filtered)
out << task.get ("uuid")
<< ":"
<< str_replace (task->get ("description"), ":", zshColonReplacement)
<< str_replace (task.get ("description"), ":", zshColonReplacement)
<< "\n";
output = out.str ();