X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Finternaltask.cpp;h=fc929ce02b2f843c2bd6de87331bbe081f11017c;hb=d1eb133ab529cdae131be7b150209f03189248f3;hp=c117bad897365f9e4159f7c58b9f9b764f6ae13c;hpb=afeb81fb97b8ee4e50a3679707deb17e5b79a74f;p=builder.git

diff --git a/source/internaltask.cpp b/source/internaltask.cpp
index c117bad..fc929ce 100644
--- a/source/internaltask.cpp
+++ b/source/internaltask.cpp
@@ -1,35 +1,36 @@
 #include "internaltask.h"
 
-InternalTask::InternalTask(Worker *w):
-	worker(w)
-{ }
-
 InternalTask::~InternalTask()
 {
-	worker->join();
-	delete worker;
+	worker.join();
 }
 
 void InternalTask::start()
 {
-	worker->launch();
+	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;
 }
 
 Task::Status InternalTask::wait()
 {
 	Status result;
-	while((result = worker->get_status())==RUNNING) ;
+	while((result = check())==RUNNING) ;
 	return result;
 }
 
 
-InternalTask::Worker::Worker():
-	status(RUNNING)
-{ }
+void InternalTask::Worker::main()
+{
+	if(func())
+		status = Task::SUCCESS;
+	else
+		status = Task::ERROR;
+}