Use default member initializers and constructor delegation

[builder.git] / source / internaltask.cpp

diff --git a/source/internaltask.cpp b/source/internaltask.cpp
index 37c9b75de91a9fb5962cb58584749245308cc9a0..0f3cbc2ba603771d93df9e7a945e8fcc4de447c0 100644 (file)
--- a/source/internaltask.cpp
+++ b/source/internaltask.cpp
@@ -6,22 +6,27 @@ InternalTask::InternalTask(Worker *w):
 
 InternalTask::~InternalTask()
 {
+       worker->join();
        delete worker;
 }
 
 void InternalTask::start()
 {
+       prepare();
        worker->launch();
 }
 
 Task::Status InternalTask::check()
 {
-       if(worker->get_status()!=RUNNING)
-               signal_finished.emit(worker->get_status()==SUCCESS);
-       return worker->get_status();
+       Status result = worker->get_status();
+       if(result!=RUNNING)
+               signal_finished.emit(result==SUCCESS);
+       return result;
 }
 
-
-InternalTask::Worker::Worker():
-       status(RUNNING)
-{ }
+Task::Status InternalTask::wait()
+{
+       Status result;
+       while((result = check())==RUNNING) ;
+       return result;
+}