C++11 tidying.

[dcpomatic.git] / src / lib / uploader.h

diff --git a/src/lib/uploader.h b/src/lib/uploader.h
index f57ed8c4fe6f47034dc9ebe6fea99bbd4ff264d5..a68be8dd0b59169666f2e78851d9f481187decdf 100644 (file)
--- a/src/lib/uploader.h
+++ b/src/lib/uploader.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2015-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,18 +18,21 @@
 
 */
 
+
 #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);
@@ -39,14 +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 (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;
 
-       boost::function<void (std::string)> _set_status;
+       std::function<void (std::string)> _set_status;
 };
 
 #endif