Refactor InternalTask to take a functor

[builder.git] / source / internaltask.cpp

diff --git a/source/internaltask.cpp b/source/internaltask.cpp
index 68a5e25355f213223d8dc0c707ad6f84f95ede98..fc929ce02b2f843c2bd6de87331bbe081f11017c 100644 (file)
--- a/source/internaltask.cpp
+++ b/source/internaltask.cpp
@@ -1,20 +1,36 @@
 #include "internaltask.h"
 
-InternalTask::InternalTask(Worker *w):
-       worker(w)
-{ }
-
 InternalTask::~InternalTask()
 {
-       delete worker;
+       worker.join();
+}
+
+void InternalTask::start()
+{
+       prepare();
+       worker.launch();
 }
 
 Task::Status InternalTask::check()
 {
-       return worker->get_status();
+       Status result = worker.get_status();
+       if(result!=RUNNING)
+               signal_finished.emit(result==SUCCESS);
+       return result;
+}
+
+Task::Status InternalTask::wait()
+{
+       Status result;
+       while((result = check())==RUNNING) ;
+       return result;
 }
 
 
-InternalTask::Worker::Worker():
-       status(RUNNING)
-{ }
+void InternalTask::Worker::main()
+{
+       if(func())
+               status = Task::SUCCESS;
+       else
+               status = Task::ERROR;
+}