From e619f8c91d1ebbf326baaf51113db081b0114e8d Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Fri, 27 Aug 2010 17:45:22 -0400 Subject: [PATCH] Dependencies - Added dependency nagging to the 'start', 'done' and 'delete' commands. --- src/command.cpp | 5 +++++ src/dependency.cpp | 16 ++++++++++------ src/main.h | 2 +- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/src/command.cpp b/src/command.cpp index bfc27728f..39d0ac559 100644 --- a/src/command.cpp +++ b/src/command.cpp @@ -1189,6 +1189,7 @@ int handleDelete (std::string &outs) << "'." << std::endl; + out << dependencyNag (*task); out << onProjectChange (*task); } } @@ -1211,6 +1212,7 @@ int handleDelete (std::string &outs) << "'." << std::endl; + out << dependencyNag (*task); out << onProjectChange (*task); } } @@ -1276,6 +1278,8 @@ int handleStart (std::string &outs) << std::endl; if (!nagged) nagged = nag (*task); + + out << dependencyNag (*task); } else { @@ -1422,6 +1426,7 @@ int handleDone (std::string &outs) << "'." << std::endl; + out << dependencyNag (*task); out << onProjectChange (*task, false); ++count; diff --git a/src/dependency.cpp b/src/dependency.cpp index 4e5a1b247..a0d8bc390 100644 --- a/src/dependency.cpp +++ b/src/dependency.cpp @@ -27,6 +27,7 @@ #include #include +#include #include #include @@ -150,13 +151,16 @@ bool dependencyChainBroken (Task& task) //////////////////////////////////////////////////////////////////////////////// // Generate a nag message if a dependency chain is being violated. -void dependencyNag (Task& task) +std::string dependencyNag (Task& task) { - std::cout << "# dependencyNag " - << task.id - << " " - << task.get ("uuid") - << "\n"; + std::stringstream out; + out << "# dependencyNag " + << task.id + << " " + << task.get ("uuid") + << "\n"; + + return out.str (); } //////////////////////////////////////////////////////////////////////////////// diff --git a/src/main.h b/src/main.h index 9d74a5c6b..4f4f184ff 100644 --- a/src/main.h +++ b/src/main.h @@ -135,7 +135,7 @@ bool dependencyIsBlocked (Task&); bool dependencyIsBlocking (Task&); bool dependencyIsCircular (Task&); bool dependencyChainBroken (Task&); -void dependencyNag (Task&); +std::string dependencyNag (Task&); // list template ///////////////////////////////////////////////////////////////////////////////