Merge master.

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

diff --git a/src/lib/job.h b/src/lib/job.h
index 37fa56d2082e83e4b6ea49c484152d8b75142e11..40e90b73c72b3c136f0570cf7198018746610a29 100644 (file)
--- a/src/lib/job.h
+++ b/src/lib/job.h
@@ -21,8 +21,8 @@
  *  @brief A parent class to represent long-running tasks which are run in their own thread.
  */
 
-#ifndef DVDOMATIC_JOB_H
-#define DVDOMATIC_JOB_H
+#ifndef DCPOMATIC_JOB_H
+#define DCPOMATIC_JOB_H
 
 #include <string>
 #include <boost/thread/mutex.hpp>
@@ -38,7 +38,7 @@ class Film;
 class Job : public boost::enable_shared_from_this<Job>
 {
 public:
-       Job (boost::shared_ptr<Film> s);
+       Job (boost::shared_ptr<Film>);
        virtual ~Job() {}
 
        /** @return user-readable name of this job */
@@ -91,7 +91,6 @@ protected:
        void set_state (State);
        void set_error (std::string s, std::string d);
 
-       /** Film for this job */
        boost::shared_ptr<Film> _film;
 
 private: