GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-09-09 18:50:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Portability: Updated to make main re-entrant()

Browse source 
- New INSTALL instructions to emscripten, and AUTHORS for contribution.
This commit is contained in:
Mark Scannell 2018-01-31 19:45:07 -05:00 • committed by Paul Beckingham
parent cae3f06b7d
commit 7af6db4c17
112 changed files with 960 additions and 1147 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/commands/Command.cpp
View file

@ -90,8 +90,6 @@
#include <ColProject.h>
#include <ColDue.h>
extern Context context;
////////////////////////////////////////////////////////////////////////////////
void Command::factory (std::map <std::string, Command*>& all)
{
@ -174,7 +172,7 @@ void Command::factory (std::map <std::string, Command*>& all)
// Instantiate a command object for each custom report.
std::vector <std::string> reports;
for (auto &i : context.config)
for (auto &i : Context::getContext ().config)
{
if (i.first.substr (0, 7) == "report.")
{
@ -194,7 +192,7 @@ void Command::factory (std::map <std::string, Command*>& all)
c = new CmdCustom (
report,
"task <filter> " + report,
context.config.get ("report." + report + ".description"));
Context::getContext ().config.get ("report." + report + ".description"));
all[c->keyword ()] = c;
}
@ -334,8 +332,8 @@ bool Command::permission (
// What remains are write commands that have not yet selected 'all' or 'quit'.
// Describe the task.
bool confirmation = context.config.getBoolean ("confirmation");
unsigned int bulk = context.config.getInteger ("bulk");
bool confirmation = Context::getContext ().config.getBoolean ("confirmation");
unsigned int bulk = Context::getContext ().config.getInteger ("bulk");
// Quantity 1 modifications have optional confirmation, and only (y/n).
if (quantity == 1)
@ -353,7 +351,7 @@ bool Command::permission (
if ((bulk == 0 || quantity < bulk) && (!_needs_confirm || !confirmation))
return true;
if (context.verbose ("blank") && !_first_iteration)
if (Context::getContext ().verbose ("blank") && !_first_iteration)
std::cout << '\n';
int answer = confirm4 (question);
_first_iteration = false;