From b6797b62425b896b9e55059f03f21e96197d368b Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Sun, 14 Apr 2013 23:52:13 -0400 Subject: [PATCH 1/2] Virtual Tags - Started using virtual tags in the report definitions. - Fixed compilation problem. --- src/Config.cpp | 8 ++++---- src/commands/CmdVersion.cpp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Config.cpp b/src/Config.cpp index 62d297289..f3e384e7b 100644 --- a/src/Config.cpp +++ b/src/Config.cpp @@ -357,7 +357,7 @@ std::string Config::_defaults = "report.active.columns=id,project,priority,due,start.active,entry.age,description\n" "report.active.labels=ID,Proj,Pri,Due,Active,Age,Description\n" "report.active.sort=due+,priority-,project+\n" - "report.active.filter=status:pending start.any:\n" + "report.active.filter=status:pending +ACTIVE\n" "\n" "report.completed.description=Lists completed tasks\n" "report.completed.columns=end,project,priority,entry.age,description,uuid\n" @@ -369,13 +369,13 @@ std::string Config::_defaults = "report.recurring.columns=id,project,priority,due,recur,start.active,entry.age,description\n" "report.recurring.labels=ID,Proj,Pri,Due,Recur,Active,Age,Description\n" "report.recurring.sort=due+,priority-,start-,project+\n" - "report.recurring.filter=status:pending parent.any:\n" + "report.recurring.filter=status:pending +CHILD\n" "\n" "report.waiting.description=Lists all waiting tasks\n" "report.waiting.columns=id,project,priority,wait,entry.age,description\n" "report.waiting.labels=ID,Proj,Pri,Wait,Age,Description\n" "report.waiting.sort=wait+,priority-,project+\n" - "report.waiting.filter=status:waiting\n" + "report.waiting.filter=+WAITING\n" "\n" "report.all.description=Lists all pending and completed tasks\n" "report.all.columns=id,status,project,priority,due,end,start.active,entry.age,description\n" @@ -393,7 +393,7 @@ std::string Config::_defaults = "report.ready.columns=id,project,priority,due,start.active,entry.age,urgency,description\n" "report.ready.labels=ID,Proj,Pri,Due,A,Age,Urg,Description\n" "report.ready.sort=urgency-,due+,priority-,start-,project+\n" - "report.ready.filter=status:pending limit:page wait.none: '(scheduled.none: or scheduled.before:now )'\n" + "report.ready.filter=status:pending limit:page -WAITING '(scheduled.none: or scheduled.before:now )'\n" "\n" "report.blocked.description=Lists all blocked tasks\n" "report.blocked.columns=id,depends,project,priority,due,start.active,entry.age,description\n" diff --git a/src/commands/CmdVersion.cpp b/src/commands/CmdVersion.cpp index 2088ea379..2449ac583 100644 --- a/src/commands/CmdVersion.cpp +++ b/src/commands/CmdVersion.cpp @@ -89,7 +89,7 @@ int CmdVersion::execute (std::string& output) #elif defined (LINUX) << "linux" #elif defined (KFREEBSD) - "gnu-kfreebsd" + << "gnu-kfreebsd" #elif defined (GNUHURD) << "gnu-hurd" #else From 1641bcf5921f04e261d6caa80bade4838a2a8f37 Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Mon, 15 Apr 2013 00:06:37 -0400 Subject: [PATCH 2/2] White Space - White space cleanup, to avoid further git hook warnings. --- src/Config.h | 1 - src/Socket.h | 1 + src/columns/ColUrgency.cpp | 1 - src/i18n.h | 1 - test/config.t.cpp | 1 - test/json.t.cpp | 1 - test/json_test.cpp | 1 - test/path.t.cpp | 1 - test/view.t.cpp | 1 - 9 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/Config.h b/src/Config.h index 5c33d25f9..4ddf5983f 100644 --- a/src/Config.h +++ b/src/Config.h @@ -2,7 +2,6 @@ // taskwarrior - a command line task list manager. // // Copyright 2006 - 2013, Paul Beckingham, Federico Hernandez. -// All rights reserved. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/src/Socket.h b/src/Socket.h index 9e9ff3b36..c9f491029 100644 --- a/src/Socket.h +++ b/src/Socket.h @@ -24,6 +24,7 @@ // http://www.opensource.org/licenses/mit-license.php // //////////////////////////////////////////////////////////////////////////////// + #ifndef INCLUDED_SOCKET #define INCLUDED_SOCKET diff --git a/src/columns/ColUrgency.cpp b/src/columns/ColUrgency.cpp index ee4efd7d6..cbfb752be 100644 --- a/src/columns/ColUrgency.cpp +++ b/src/columns/ColUrgency.cpp @@ -25,7 +25,6 @@ // //////////////////////////////////////////////////////////////////////////////// - #include #include #include diff --git a/src/i18n.h b/src/i18n.h index 90cd28216..5df5ca3c8 100644 --- a/src/i18n.h +++ b/src/i18n.h @@ -25,7 +25,6 @@ // //////////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// // // Strings that should be localized: diff --git a/test/config.t.cpp b/test/config.t.cpp index 4afdfde2b..5615e2613 100644 --- a/test/config.t.cpp +++ b/test/config.t.cpp @@ -2,7 +2,6 @@ // taskwarrior - a command line task list manager. // // Copyright 2006 - 2013, Paul Beckingham, Federico Hernandez. -// All rights reserved. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/test/json.t.cpp b/test/json.t.cpp index 39cb51757..c19a08748 100644 --- a/test/json.t.cpp +++ b/test/json.t.cpp @@ -25,7 +25,6 @@ // //////////////////////////////////////////////////////////////////////////////// - #include #include #include diff --git a/test/json_test.cpp b/test/json_test.cpp index ae90c8ca8..d2a266583 100644 --- a/test/json_test.cpp +++ b/test/json_test.cpp @@ -25,7 +25,6 @@ // //////////////////////////////////////////////////////////////////////////////// - #include #include #include diff --git a/test/path.t.cpp b/test/path.t.cpp index 8b3da3d26..026938f8a 100644 --- a/test/path.t.cpp +++ b/test/path.t.cpp @@ -25,7 +25,6 @@ // //////////////////////////////////////////////////////////////////////////////// - #include #include #include diff --git a/test/view.t.cpp b/test/view.t.cpp index 955734abd..e85fe289c 100644 --- a/test/view.t.cpp +++ b/test/view.t.cpp @@ -25,7 +25,6 @@ // //////////////////////////////////////////////////////////////////////////////// - #include #include #include