Refactor InternalTask to take a functor

[builder.git] / source / internaltask.cpp

diff --git a/source/internaltask.cpp b/source/internaltask.cpp
index 5810be12670b7cecae652ae375666926fcd45e31..fc929ce02b2f843c2bd6de87331bbe081f11017c 100644 (file)
--- a/source/internaltask.cpp
+++ b/source/internaltask.cpp
@@ -2,19 +2,18 @@
 
 InternalTask::~InternalTask()
 {
-       worker->join();
-       delete worker;
+       worker.join();
 }
 
 void InternalTask::start()
 {
        prepare();
-       worker->launch();
+       worker.launch();
 }
 
 Task::Status InternalTask::check()
 {
-       Status result = worker->get_status();
+       Status result = worker.get_status();
        if(result!=RUNNING)
                signal_finished.emit(result==SUCCESS);
        return result;
@@ -26,3 +25,12 @@ Task::Status InternalTask::wait()
        while((result = check())==RUNNING) ;
        return result;
 }
+
+
+void InternalTask::Worker::main()
+{
+       if(func())
+               status = Task::SUCCESS;
+       else
+               status = Task::ERROR;
+}