diff --git a/src/commands/CmdContinue.cpp b/src/commands/CmdContinue.cpp index ece54d49..778a9865 100644 --- a/src/commands/CmdContinue.cpp +++ b/src/commands/CmdContinue.cpp @@ -32,8 +32,7 @@ //////////////////////////////////////////////////////////////////////////////// int CmdContinue ( Rules& rules, - Database& database, - Log& log) + Database& database) { // Load the most recent interval. auto latest = database.getLatestInterval (); @@ -48,16 +47,13 @@ int CmdContinue ( // Update database. database.addInterval (latest); - log.write ("debug", std::string ("Continued tracking: ") + latest.serialize ()); // User feedback. std::cout << intervalSummarize (rules, latest); } else { - std::string message = "There is already active tracking."; - std::cout << message << "\n"; - log.write ("warning", message); + std::cout << "There is already active tracking.\n"; } return 0; diff --git a/src/commands/CmdDefine.cpp b/src/commands/CmdDefine.cpp index dd0e5793..db8bb5de 100644 --- a/src/commands/CmdDefine.cpp +++ b/src/commands/CmdDefine.cpp @@ -46,8 +46,7 @@ int CmdDefine ( CLI& cli, Rules& rules, - Database& database, - Log& log) + Database& database) { auto words = cli.getWords (); if (words.size () >= 1) diff --git a/src/commands/commands.h b/src/commands/commands.h index 178ba3b5..479696e3 100644 --- a/src/commands/commands.h +++ b/src/commands/commands.h @@ -33,11 +33,6 @@ #include #include -int CmdClear ( ); -int CmdConfig ( ); -int CmdContinue ( Rules&, Database&, Log&); -int CmdDefault ( Rules&, Database& ); -int CmdDefine (CLI&, Rules&, Database&, Log&); int CmdDiagnostics ( Rules&, Database&, Extensions&, Log&); int CmdExport (CLI&, Rules&, Database&, Log&); int CmdExtensions ( Rules&, Extensions& ); @@ -51,5 +46,10 @@ int CmdStop (CLI&, Rules&, Database&, Log&); int CmdTags ( Rules&, Database&, Log&); int CmdTrack (CLI&, Rules&, Database&, Log&); int CmdUndo ( ); +int CmdClear ( ); +int CmdConfig ( ); +int CmdContinue ( Rules&, Database& ); +int CmdDefault ( Rules&, Database& ); +int CmdDefine (CLI&, Rules&, Database& ); #endif diff --git a/src/init.cpp b/src/init.cpp index a7c56ab4..17edffc4 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -206,10 +206,6 @@ int dispatchCommand ( { // These signatures are æxpected to be all different, therefore no // command to fn mapping. - if (command == "clear") status = CmdClear ( ); - else if (command == "config") status = CmdConfig ( ); - else if (command == "continue") status = CmdContinue ( rules, database, log); - else if (command == "define") status = CmdDefine (cli, rules, database, log); else if (command == "diagnostics") status = CmdDiagnostics ( rules, database, extensions, log); else if (command == "export") status = CmdExport (cli, rules, database, log); else if (command == "extensions") status = CmdExtensions ( rules, extensions ); @@ -222,6 +218,10 @@ int dispatchCommand ( else if (command == "tags") status = CmdTags ( rules, database, log); else if (command == "track") status = CmdTrack (cli, rules, database, log); else if (command == "undo") status = CmdUndo ( ); + if (command == "clear") status = CmdClear ( ); + else if (command == "config") status = CmdConfig ( ); + else if (command == "continue") status = CmdContinue ( rules, database ); + else if (command == "define") status = CmdDefine (cli, rules, database ); } else {