C++11 tidying.

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

diff --git a/src/lib/job.h b/src/lib/job.h
index cb85059a61875c470a5a750d225fe51930dd7ee2..96f0acbe5a0c886d54a9b96128eed3c5a11a439d 100644 (file)
--- a/src/lib/job.h
+++ b/src/lib/job.h
@@ -27,7 +27,6 @@
 
 #include "signaller.h"
 #include <boost/thread/mutex.hpp>
-#include <boost/enable_shared_from_this.hpp>
 #include <boost/signals2.hpp>
 #include <boost/thread.hpp>
 #include <string>
@@ -37,12 +36,15 @@ class Film;
 /** @class Job
  *  @brief A parent class to represent long-running tasks which are run in their own thread.
  */
-class Job : public boost::enable_shared_from_this<Job>, public Signaller, public boost::noncopyable
+class Job : public std::enable_shared_from_this<Job>, public Signaller
 {
 public:
-       explicit Job (boost::shared_ptr<const Film> film);
+       explicit Job (std::shared_ptr<const Film> film);
        virtual ~Job ();
 
+       Job (Job const&) = delete;
+       Job& operator= (Job const&) = delete;
+
        /** @return user-readable name of this job */
        virtual std::string name () const = 0;
        virtual std::string json_name () const = 0;
@@ -80,11 +82,11 @@ public:
        void sub (std::string);
        boost::optional<float> progress () const;
 
-       boost::shared_ptr<const Film> film () const {
+       std::shared_ptr<const Film> film () const {
                return _film;
        }
 
-       void when_finished (boost::signals2::connection& connection, boost::function<void()> finished);
+       void when_finished (boost::signals2::connection& connection, std::function<void()> finished);
 
        boost::signals2::signal<void()> Progress;
        /** Emitted from the UI thread when the job is finished */
@@ -114,14 +116,14 @@ protected:
        void check_for_interruption_or_pause ();
        void stop_thread ();
 
-       boost::shared_ptr<const Film> _film;
+       std::shared_ptr<const Film> _film;
 
 private:
 
        void run_wrapper ();
        void set_progress_common (boost::optional<float> p);
 
-       boost::thread* _thread;
+       boost::thread _thread;
 
        /** mutex for _state, _error*, _message */
        mutable boost::mutex _state_mutex;