Merge branch 'master' of https://git.oftal.dk/munia

Conflicts:
	src/taskmanager.cc

1 files changed, 5 insertions, 1 deletions

diff --git a/src/taskmanager.h b/src/taskmanager.h
index 0f0d96e..52daa05 100644
--- a/src/taskmanager.h
+++ b/src/taskmanager.h
@@ -40,7 +40,7 @@ typedef std::pair<TaskIdList, TaskIdList> TaskIdListPair;
 
 class TaskManager {
 public:
-  TaskManager();
+  TaskManager(std::string file = "/tmp/munia.xml");
   ~TaskManager();
 
   TaskIdList createTask(taskid_t parentid, taskid_t *id) throw (std::exception);
@@ -55,11 +55,15 @@ public:
 
   task_t task(taskid_t t);
 
+  void flushTasks();
+
 private:
   //  TaskIdList ancestorList(taskid_t task);
   taskid_t createId();
   taskid_t idCount;
   task_t nextTask();
+
+  std::string file;
 };
 
 extern TaskManager task_manager;