gergely/taskwarrior-2.x
1
0
Fork 0
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Code Sharing

Browse Source 
- Cleaned up the #ifdef in Task.cpp for sharing with taskd.

(cherry picked from commit af94ac2e12d84fddb735d6931aaf2c46176c794c)
This commit is contained in:
Paul Beckingham
2013-05-31 16:20:05 -04:00
parent 530e9c0118
commit dd0b01e487
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/TDB2.cpp
View File

@@ -1753,9 +1753,9 @@ int TDB2::next_id ()
const std::vector <Task> TDB2::all_tasks () const std::vector <Task> TDB2::all_tasks ()
{ {
std::vector <Task> all (pending._tasks.size () + std::vector <Task> all (pending._tasks.size () +
pending._added_tasks.size () + pending._added_tasks.size () +
completed._tasks.size () + completed._tasks.size () +
completed._added_tasks.size ()); completed._added_tasks.size ());
all = pending.get_tasks (); all = pending.get_tasks ();
std::vector <Task> extra (completed._tasks.size () + std::vector <Task> extra (completed._tasks.size () +

2
src/Task.cpp
View File

@@ -58,6 +58,7 @@
extern Context context; extern Context context;
static const float epsilon = 0.000001; static const float epsilon = 0.000001;
#endif
std::string Task::defaultProject = ""; std::string Task::defaultProject = "";
std::string Task::defaultPriority = ""; std::string Task::defaultPriority = "";
@@ -79,7 +80,6 @@ float Task::urgencyNextCoefficient = 0.0;
float Task::urgencyDueCoefficient = 0.0; float Task::urgencyDueCoefficient = 0.0;
float Task::urgencyBlockingCoefficient = 0.0; float Task::urgencyBlockingCoefficient = 0.0;
float Task::urgencyAgeCoefficient = 0.0; float Task::urgencyAgeCoefficient = 0.0;
#endif
static const std::string dummy (""); static const std::string dummy ("");