Refactor InternalTask to take a functor

[builder.git] / source / androidmanifestgenerator.cpp

diff --git a/source/androidmanifestgenerator.cpp b/source/androidmanifestgenerator.cpp
index 8268bb80984d0ff075f89d2a6539b86803357315..70b1e20754d06d2b72db97a070894b8a3c571c41 100644 (file)
--- a/source/androidmanifestgenerator.cpp
+++ b/source/androidmanifestgenerator.cpp
@@ -3,6 +3,7 @@
 #include "androidmanifestfile.h"
 #include "androidmanifestgenerator.h"
 #include "component.h"
+#include "internaltask.h"
 #include "sharedlibrary.h"
 #include "sourcepackage.h"
 
@@ -17,12 +18,10 @@ Target *AndroidManifestGenerator::create_target(const vector<Target *> &, const
 Task *AndroidManifestGenerator::run(const Target &target) const
 {
        const AndroidManifestFile &manifest = dynamic_cast<const AndroidManifestFile &>(target);
-       Worker *worker = new Worker(manifest);
-       return new InternalTask(worker);
+       return new InternalTask([&manifest]{ return _run(manifest); });
 }
 
-
-void AndroidManifestGenerator::Worker::main()
+bool AndroidManifestGenerator::_run(const AndroidManifestFile &manifest)
 {
        const Component &comp = *manifest.get_component();
        const SourcePackage &pkg = comp.get_package();
@@ -56,5 +55,5 @@ void AndroidManifestGenerator::Worker::main()
                IO::print(out, "\t<uses-permission android:name=\"%s\" />\n", p);
        out.write("</manifest>\n");
 
-       status = Task::SUCCESS;
+       return true;
 }