Tidy up careful_string_filter and add some extra transliterations.

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

diff --git a/src/lib/curl_uploader.h b/src/lib/curl_uploader.h
index 9fb3022f2f7ab0048224849c511f093ad56d6d8c..ea017eb8349f302b2d2c3b6fe8871a5242cc443b 100644 (file)
--- a/src/lib/curl_uploader.h
+++ b/src/lib/curl_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,25 +18,28 @@
 
 */
 
+
 #include "uploader.h"
+#include <dcp/file.h>
 #include <curl/curl.h>
 
+
 class CurlUploader : public Uploader
 {
 public:
-       CurlUploader (boost::function<void (std::string)> set_status, boost::function<void (float)> set_progress);
+       CurlUploader (std::function<void (std::string)> set_status, std::function<void (float)> set_progress);
        ~CurlUploader ();
 
        size_t read_callback (void* ptr, size_t size, size_t nmemb);
 
 protected:
-       virtual void create_directory (boost::filesystem::path directory);
-       virtual void upload_file (boost::filesystem::path from, boost::filesystem::path to, boost::uintmax_t& transferred, boost::uintmax_t total_size);
+       void create_directory (boost::filesystem::path directory) override;
+       void upload_file (boost::filesystem::path from, boost::filesystem::path to, boost::uintmax_t& transferred, boost::uintmax_t total_size) override;
 
 private:
        CURL* _curl;
 
-       FILE* _file;
-       boost::uintmax_t* _transferred;
-       boost::uintmax_t _total_size;
+       FILE* _file = nullptr;
+       boost::uintmax_t* _transferred = nullptr;
+       boost::uintmax_t _total_size = 0;
 };