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

42
src/commands/CmdStart.cpp
View File

@@ -66,34 +66,33 @@ int CmdStart::execute (std::string& output)
std::map <std::string, std::string> projectChanges;
bool nagged = false;
std::vector <Task>::iterator task;
for (task = filtered.begin (); task != filtered.end (); ++task)
for (auto& task : filtered)
{
if (! task->has ("start"))
if (! task.has ("start"))
{
Task before (*task);
Task before (task);
// Start the specified task.
std::string question = format (STRING_CMD_START_CONFIRM,
task->id,
task->get ("description"));
task->modify (Task::modAnnotate);
task->setAsNow ("start");
task.id,
task.get ("description"));
task.modify (Task::modAnnotate);
task.setAsNow ("start");
if (context.config.getBoolean ("journal.time"))
task->addAnnotation (context.config.get ("journal.time.start.annotation"));
task.addAnnotation (context.config.get ("journal.time.start.annotation"));
if (permission (*task, taskDifferences (before, *task) + question, filtered.size ()))
if (permission (task, taskDifferences (before, task) + question, filtered.size ()))
{
updateRecurrenceMask (*task);
context.tdb2.modify (*task);
updateRecurrenceMask (task);
context.tdb2.modify (task);
++count;
feedback_affected (STRING_CMD_START_TASK, *task);
feedback_affected (STRING_CMD_START_TASK, task);
if (!nagged)
nagged = nag (*task);
dependencyChainOnStart (*task);
nagged = nag (task);
dependencyChainOnStart (task);
if (context.verbose ("project"))
projectChanges[task->get ("project")] = onProjectChange (*task, false);
projectChanges[task.get ("project")] = onProjectChange (task, false);
}
else
{
@@ -106,18 +105,17 @@ int CmdStart::execute (std::string& output)
else
{
std::cout << format (STRING_CMD_START_ALREADY,
task->id,
task->get ("description"))
task.id,
task.get ("description"))
<< "\n";
rc = 1;
}
}
// Now list the project changes.
std::map <std::string, std::string>::iterator i;
for (i = projectChanges.begin (); i != projectChanges.end (); ++i)
if (i->first != "")
context.footnote (i->second);
for (auto& change : projectChanges)
if (change.first != "")
context.footnote (change.second);
feedback_affected (count == 1 ? STRING_CMD_START_1 : STRING_CMD_START_N, count);
return rc;