Refactor InternalTask to take a functor

[builder.git] / source / copy.h

diff --git a/source/copy.h b/source/copy.h
index 6150fadfefa660c287d8f2a850da098489f51893..c0a433996a9c0a14625ebf918c9c6092eac6d9e0 100644 (file)
--- a/source/copy.h
+++ b/source/copy.h
@@ -1,38 +1,23 @@
 #ifndef COPY_H_
 #define COPY_H_
 
-#include <msp/core/thread.h>
-#include <msp/fs/path.h>
-#include "internaltask.h"
 #include "tool.h"
 
-class Install;
+class InstalledFile;
 
 /**
-Copies a file to another place.  Used by the Install target.
+Copies a file to another place.  Used by the InstalledFile target.
 */
 class Copy: public Tool
 {
-private:
-       /**
-       A worker thread that actually does the data transfer.
-       */
-       class Worker: public InternalTask::Worker
-       {
-       private:
-               const Install &target;
-
-       public:
-               Worker(const Install &);
-       private:
-               virtual void main();
-       };
-
 public:
-       Copy(Builder &);
+       Copy(Builder &b): Tool(b, "CP") { }
 
-       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 InstalledFile &);
 };
 
 #endif