Reorder class members

[builder.git] / source / copy.h

diff --git a/source/copy.h b/source/copy.h
index a25ea7105cdbfa6dfd7c14305eb1f9cd90f6c8b9..0f30ecfee28fa270c5920e5c34866e5009ba6a2c 100644 (file)
--- a/source/copy.h
+++ b/source/copy.h
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of builder
-Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
+Copyright © 2006-2009  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
@@ -9,41 +9,35 @@ Distributed under the LGPL
 #define COPY_H_
 
 #include <msp/core/thread.h>
-#include <msp/path/path.h>
-#include "action.h"
+#include <msp/fs/path.h>
+#include "internalaction.h"
 
 class Package;
 
 /**
 Copies a file to another place.  Used by the Install target.
 */
-class Copy: public Action
+class Copy: public InternalAction
 {
-public:
-       Copy(Builder &, const Package &, const Msp::Path::Path &, const Msp::Path::Path &);
-       int check();
-       ~Copy();
 private:
        /**
        A worker thread that actually does the data transfer.
        */
-       class Worker: public Msp::Thread
+       class Worker: public InternalAction::Worker
        {
        public:
-               Worker(Copy &i): copy(i), done(false), error(false) { launch(); }
-               bool get_done() const  { return done; }
-               bool get_error() const { return error; }
+               Worker(Copy &);
        private:
                Copy &copy;
-               bool done;
-               bool error;
 
                void main();
        };
 
-       Msp::Path::Path src;
-       Msp::Path::Path dest;
-       Worker *worker;
+       Msp::FS::Path src;
+       Msp::FS::Path dest;
+
+public:
+       Copy(Builder &, const Package &, const Msp::FS::Path &, const Msp::FS::Path &);
 };
 
 #endif