GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-06-26 10:54:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Integration - fully eliminated T.cpp, T.h

Browse source
This commit is contained in:
Paul Beckingham 2009-06-13 19:09:00 -04:00
parent 113c15ef2f
commit 85e38e67d3
3 changed files with 47 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

86
src/import.cpp
View file

@ -159,23 +159,23 @@ static fileType determineFileType (const std::vector <std::string>& lines)
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
static void decorateTask (T& task) static void decorateTask (Task& task)
{ {
char entryTime[16]; char entryTime[16];
sprintf (entryTime, "%u", (unsigned int) time (NULL)); sprintf (entryTime, "%u", (unsigned int) time (NULL));
task.setAttribute ("entry", entryTime); task.set ("entry", entryTime);
// Override with default.project, if not specified. // Override with default.project, if not specified.
std::string defaultProject = context.config.get ("default.project", ""); std::string defaultProject = context.config.get ("default.project", "");
if (task.getAttribute ("project") == "" && defaultProject != "") if (!task.has ("project") && defaultProject != "")
task.setAttribute ("project", defaultProject); task.set ("project", defaultProject);
// Override with default.priority, if not specified. // Override with default.priority, if not specified.
std::string defaultPriority = context.config.get ("default.priority", ""); std::string defaultPriority = context.config.get ("default.priority", "");
if (task.getAttribute ("priority") == "" && if (!task.has ("priority") &&
defaultPriority != "" && defaultPriority != "" &&
Att::validNameValue ("priority", "", defaultPriority)) Att::validNameValue ("priority", "", defaultPriority))
task.setAttribute ("priority", defaultPriority); task.set ("priority", defaultPriority);
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
@ -261,42 +261,42 @@ static std::string importTask_1_4_3 (
break; break;
case 3: // entry case 3: // entry
task.setAttribute ("entry", fields[f]); task.set ("entry", fields[f]);
break; break;
case 4: // start case 4: // start
if (fields[f].length ()) if (fields[f].length ())
task.setAttribute ("start", fields[f]); task.set ("start", fields[f]);
break; break;
case 5: // due case 5: // due
if (fields[f].length ()) if (fields[f].length ())
task.setAttribute ("due", fields[f]); task.set ("due", fields[f]);
break; break;
case 6: // end case 6: // end
if (fields[f].length ()) if (fields[f].length ())
task.setAttribute ("end", fields[f]); task.set ("end", fields[f]);
break; break;
case 7: // 'project' case 7: // 'project'
if (fields[f].length () > 2) if (fields[f].length () > 2)
task.setAttribute ("project", fields[f].substr (1, fields[f].length () - 2)); task.set ("project", fields[f].substr (1, fields[f].length () - 2));
break; break;
case 8: // 'priority' case 8: // 'priority'
if (fields[f].length () > 2) if (fields[f].length () > 2)
task.setAttribute ("priority", fields[f].substr (1, fields[f].length () - 2)); task.set ("priority", fields[f].substr (1, fields[f].length () - 2));
break; break;
case 9: // 'fg' case 9: // 'fg'
if (fields[f].length () > 2) if (fields[f].length () > 2)
task.setAttribute ("fg", fields[f].substr (1, fields[f].length () - 2)); task.set ("fg", fields[f].substr (1, fields[f].length () - 2));
break; break;
case 10: // 'bg' case 10: // 'bg'
if (fields[f].length () > 2) if (fields[f].length () > 2)
task.setAttribute ("bg", fields[f].substr (1, fields[f].length () - 2)); task.set ("bg", fields[f].substr (1, fields[f].length () - 2));
break; break;
case 11: // 'description' case 11: // 'description'
@ -419,47 +419,47 @@ static std::string importTask_1_5_0 (
break; break;
case 3: // entry case 3: // entry
task.setAttribute ("entry", fields[f]); task.set ("entry", fields[f]);
break; break;
case 4: // start case 4: // start
if (fields[f].length ()) if (fields[f].length ())
task.setAttribute ("start", fields[f]); task.set ("start", fields[f]);
break; break;
case 5: // due case 5: // due
if (fields[f].length ()) if (fields[f].length ())
task.setAttribute ("due", fields[f]); task.set ("due", fields[f]);
break; break;
case 6: // recur case 6: // recur
if (fields[f].length ()) if (fields[f].length ())
task.setAttribute ("recur", fields[f]); task.set ("recur", fields[f]);
break; break;
case 7: // end case 7: // end
if (fields[f].length ()) if (fields[f].length ())
task.setAttribute ("end", fields[f]); task.set ("end", fields[f]);
break; break;
case 8: // 'project' case 8: // 'project'
if (fields[f].length () > 2) if (fields[f].length () > 2)
task.setAttribute ("project", fields[f].substr (1, fields[f].length () - 2)); task.set ("project", fields[f].substr (1, fields[f].length () - 2));
break; break;
case 9: // 'priority' case 9: // 'priority'
if (fields[f].length () > 2) if (fields[f].length () > 2)
task.setAttribute ("priority", fields[f].substr (1, fields[f].length () - 2)); task.set ("priority", fields[f].substr (1, fields[f].length () - 2));
break; break;
case 10: // 'fg' case 10: // 'fg'
if (fields[f].length () > 2) if (fields[f].length () > 2)
task.setAttribute ("fg", fields[f].substr (1, fields[f].length () - 2)); task.set ("fg", fields[f].substr (1, fields[f].length () - 2));
break; break;
case 11: // 'bg' case 11: // 'bg'
if (fields[f].length () > 2) if (fields[f].length () > 2)
task.setAttribute ("bg", fields[f].substr (1, fields[f].length () - 2)); task.set ("bg", fields[f].substr (1, fields[f].length () - 2));
break; break;
case 12: // 'description' case 12: // 'description'
@ -583,47 +583,47 @@ static std::string importTask_1_6_0 (
break; break;
case 3: // entry case 3: // entry
task.setAttribute ("entry", fields[f]); task.set ("entry", fields[f]);
break; break;
case 4: // start case 4: // start
if (fields[f].length ()) if (fields[f].length ())
task.setAttribute ("start", fields[f]); task.set ("start", fields[f]);
break; break;
case 5: // due case 5: // due
if (fields[f].length ()) if (fields[f].length ())
task.setAttribute ("due", fields[f]); task.set ("due", fields[f]);
break; break;
case 6: // recur case 6: // recur
if (fields[f].length ()) if (fields[f].length ())
task.setAttribute ("recur", fields[f]); task.set ("recur", fields[f]);
break; break;
case 7: // end case 7: // end
if (fields[f].length ()) if (fields[f].length ())
task.setAttribute ("end", fields[f]); task.set ("end", fields[f]);
break; break;
case 8: // 'project' case 8: // 'project'
if (fields[f].length () > 2) if (fields[f].length () > 2)
task.setAttribute ("project", fields[f].substr (1, fields[f].length () - 2)); task.set ("project", fields[f].substr (1, fields[f].length () - 2));
break; break;
case 9: // 'priority' case 9: // 'priority'
if (fields[f].length () > 2) if (fields[f].length () > 2)
task.setAttribute ("priority", fields[f].substr (1, fields[f].length () - 2)); task.set ("priority", fields[f].substr (1, fields[f].length () - 2));
break; break;
case 10: // 'fg' case 10: // 'fg'
if (fields[f].length () > 2) if (fields[f].length () > 2)
task.setAttribute ("fg", fields[f].substr (1, fields[f].length () - 2)); task.set ("fg", fields[f].substr (1, fields[f].length () - 2));
break; break;
case 11: // 'bg' case 11: // 'bg'
if (fields[f].length () > 2) if (fields[f].length () > 2)
task.setAttribute ("bg", fields[f].substr (1, fields[f].length () - 2)); task.set ("bg", fields[f].substr (1, fields[f].length () - 2));
break; break;
case 12: // 'description' case 12: // 'description'
@ -805,7 +805,7 @@ static std::string importTodoSh_2_0 (
char end[16]; char end[16];
sprintf (end, "%u", (unsigned int) endDate.toEpoch ()); sprintf (end, "%u", (unsigned int) endDate.toEpoch ());
task.setAttribute ("end", end); task.set ("end", end);
} }
if (! tdb.addT (task)) if (! tdb.addT (task))
@ -1085,35 +1085,35 @@ static std::string importCSV (
} }
if ((f = mapping["entry"]) != -1) if ((f = mapping["entry"]) != -1)
task.setAttribute ("entry", lowerCase (unquoteText (trim (fields[f])))); task.set ("entry", lowerCase (unquoteText (trim (fields[f]))));
if ((f = mapping["start"]) != -1) if ((f = mapping["start"]) != -1)
task.setAttribute ("start", lowerCase (unquoteText (trim (fields[f])))); task.set ("start", lowerCase (unquoteText (trim (fields[f]))));
if ((f = mapping["due"]) != -1) if ((f = mapping["due"]) != -1)
task.setAttribute ("due", lowerCase (unquoteText (trim (fields[f])))); task.set ("due", lowerCase (unquoteText (trim (fields[f]))));
if ((f = mapping["recur"]) != -1) if ((f = mapping["recur"]) != -1)
task.setAttribute ("recur", lowerCase (unquoteText (trim (fields[f])))); task.set ("recur", lowerCase (unquoteText (trim (fields[f]))));
if ((f = mapping["end"]) != -1) if ((f = mapping["end"]) != -1)
task.setAttribute ("end", lowerCase (unquoteText (trim (fields[f])))); task.set ("end", lowerCase (unquoteText (trim (fields[f]))));
if ((f = mapping["project"]) != -1) if ((f = mapping["project"]) != -1)
task.setAttribute ("project", unquoteText (trim (fields[f]))); task.set ("project", unquoteText (trim (fields[f])));
if ((f = mapping["priority"]) != -1) if ((f = mapping["priority"]) != -1)
{ {
std::string value = upperCase (unquoteText (trim (fields[f]))); std::string value = upperCase (unquoteText (trim (fields[f])));
if (value == "H" || value == "M" || value == "L") if (value == "H" || value == "M" || value == "L")
task.setAttribute ("priority", value); task.set ("priority", value);
} }
if ((f = mapping["fg"]) != -1) if ((f = mapping["fg"]) != -1)
task.setAttribute ("fg", lowerCase (unquoteText (trim (fields[f])))); task.set ("fg", lowerCase (unquoteText (trim (fields[f]))));
if ((f = mapping["bg"]) != -1) if ((f = mapping["bg"]) != -1)
task.setAttribute ("bg", lowerCase (unquoteText (trim (fields[f])))); task.set ("bg", lowerCase (unquoteText (trim (fields[f]))));
if ((f = mapping["description"]) != -1) if ((f = mapping["description"]) != -1)
task.setDescription (unquoteText (trim (fields[f]))); task.setDescription (unquoteText (trim (fields[f])));

3
src/main.h
View file

@ -30,7 +30,6 @@
#include <map> #include <map>
#include <sys/types.h> #include <sys/types.h>
#include "Context.h" #include "Context.h"
#include "T.h"
#include "Table.h" #include "Table.h"
#include "Date.h" #include "Date.h"
#include "color.h" #include "color.h"
@ -49,7 +48,7 @@ void onChangeCallback ();
void handleRecurrence (); void handleRecurrence ();
Date getNextRecurrence (Date&, std::string&); Date getNextRecurrence (Date&, std::string&);
bool generateDueDates (Task&, std::vector <Date>&); bool generateDueDates (Task&, std::vector <Date>&);
void updateRecurrenceMask (/*TDB&,*/ std::vector <T>&, Task&); void updateRecurrenceMask (/*TDB&,*/ std::vector <Task>&, Task&);
int getDueState (const std::string&); int getDueState (const std::string&);
void nag (/*TDB&,*/ Task&); void nag (/*TDB&,*/ Task&);

7
src/recur.cpp
View file

@ -39,7 +39,6 @@
#include "Context.h" #include "Context.h"
#include "Date.h" #include "Date.h"
#include "Duration.h" #include "Duration.h"
#include "T.h"
#include "text.h" #include "text.h"
#include "util.h" #include "util.h"
#include "main.h" #include "main.h"
@ -329,8 +328,8 @@ Date getNextRecurrence (Date& current, std::string& period)
// update it's mask. // update it's mask.
void updateRecurrenceMask ( void updateRecurrenceMask (
// TDB& tdb, // TDB& tdb,
std::vector <T>& all, std::vector <Task>& all,
T& task) Task& task)
{ {
/* /*
std::string parent = task.getAttribute ("parent"); std::string parent = task.getAttribute ("parent");
@ -399,7 +398,7 @@ int getDueState (const std::string& due)
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
void nag (/*TDB& tdb,*/ T& task) void nag (/*TDB& tdb,*/ Task& task)
{ {
/* /*
std::string nagMessage = context.config.get ("nag", std::string ("")); std::string nagMessage = context.config.get ("nag", std::string (""));