Refactor InternalTask to take a functor

[builder.git] / source / tar.h

diff --git a/source/tar.h b/source/tar.h
index c11587ecbf1ba17cfe35e5928dc47720c01c21fd..fa4a4d6070100098f3da70520caa7efa696cac4f 100644 (file)
--- a/source/tar.h
+++ b/source/tar.h
@@ -1,33 +1,21 @@
 #ifndef TAR_H_
 #define TAR_H_
 
-#include <msp/core/thread.h>
-#include "internaltask.h"
 #include "tool.h"
 
 class TarBall;
 
 class Tar: public Tool
 {
-private:
-       class Worker: public InternalTask::Worker
-       {
-       private:
-               const TarBall &tarball;
-
-       public:
-               Worker(const TarBall &);
-
-       private:
-               virtual void main();
-               void store_number(char *, unsigned, unsigned);
-       };
-
 public:
        Tar(Builder &);
 
-       virtual Target *create_target(const std::list<Target *> &, const std::string &) const;
-       virtual Task *run(const Target &) const;
+       Target *create_target(const std::vector<Target *> &, const std::string &) override;
+       Task *run(const Target &) const override;
+
+private:
+       static bool _run(const TarBall &);
+       static void store_number(char *, unsigned, unsigned);
 };
 
 #endif