X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fuploader.h;h=a68be8dd0b59169666f2e78851d9f481187decdf;hb=924f4edb20d14bc697956254951fb87513cf2e19;hp=fcb9c504533e8229d12ee3710e807cdb0c29ef2c;hpb=b00389305af83dfd1e3b41ab3b108cb591f18c5d;p=dcpomatic.git

diff --git a/src/lib/uploader.h b/src/lib/uploader.h
index fcb9c5045..a68be8dd0 100644
--- a/src/lib/uploader.h
+++ b/src/lib/uploader.h
@@ -1,32 +1,40 @@
 /*
-    Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2015-2021 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
-#include <boost/shared_ptr.hpp>
+
+#ifndef DCPOMATIC_UPLOADER_H
+#define DCPOMATIC_UPLOADER_H
+
+
 #include <boost/filesystem.hpp>
-#include <boost/function.hpp>
+
 
 class Job;
 
+
 class Uploader
 {
 public:
-	Uploader (boost::function<void (std::string)> set_status, boost::function<void (float)> set_progress);
+	Uploader (std::function<void (std::string)> set_status, std::function<void (float)> set_progress);
+	virtual ~Uploader () {}
+
 	void upload (boost::filesystem::path directory);
 
 protected:
@@ -34,11 +42,14 @@ protected:
 	virtual void create_directory (boost::filesystem::path directory) = 0;
 	virtual void upload_file (boost::filesystem::path from, boost::filesystem::path to, boost::uintmax_t& transferred, boost::uintmax_t total_size) = 0;
 
-	boost::function<void (std::string)> _set_status;
-	boost::function<void (float)> _set_progress;
+	std::function<void (float)> _set_progress;
 
 private:
 	void upload_directory (boost::filesystem::path base, boost::filesystem::path directory, boost::uintmax_t& transferred, boost::uintmax_t total_size);
 	boost::uintmax_t count_file_sizes (boost::filesystem::path) const;
 	boost::filesystem::path remove_prefix (boost::filesystem::path prefix, boost::filesystem::path target) const;
+
+	std::function<void (std::string)> _set_status;
 };
+
+#endif