Remove unused parameter.

diff --git a/src/lib/cinema_kdms.cc b/src/lib/cinema_kdms.cc
index 15aaaa731316b6c8ee0eeda6d0ce09ca6ab8c3f6..d95e0285425059afae27a7f344cc4170b7e6db00 100644 (file)
--- a/src/lib/cinema_kdms.cc
+++ b/src/lib/cinema_kdms.cc
@@ -119,7 +119,7 @@ CinemaKDMs::write_zip_files (string film_name, list<CinemaKDMs> cinema_kdms, boo
 /* XXX: should probably get from/to from the KDMs themselves */
 void
 CinemaKDMs::email (
-       string film_name, string cpl_name, list<CinemaKDMs> cinema_kdms, dcp::LocalTime from, dcp::LocalTime to, shared_ptr<Job> job, shared_ptr<Log> log
+       string film_name, string cpl_name, list<CinemaKDMs> cinema_kdms, dcp::LocalTime from, dcp::LocalTime to, shared_ptr<Log> log
        )
 {
        Config* config = Config::instance ();
@@ -163,7 +163,7 @@ CinemaKDMs::email (
 
                string const name = tidy_for_filename(i.cinema->name) + "_" + tidy_for_filename(film_name) + ".zip";
                email.add_attachment (zip_file, name, "application/zip");
-               email.send (job);
+               email.send ();
 
                if (log) {
                        log->log (email.notes(), LogEntry::TYPE_DEBUG_EMAIL);

diff --git a/src/lib/cinema_kdms.h b/src/lib/cinema_kdms.h
index 4458869db8cd56bac83e2c97daeee01914ed8d09..318d62e8d84c50724c51da231ed3eee448f5be1b 100644 (file)
--- a/src/lib/cinema_kdms.h
+++ b/src/lib/cinema_kdms.h
@@ -36,7 +36,6 @@ public:
                std::list<CinemaKDMs> cinema_kdms,
                dcp::LocalTime from,
                dcp::LocalTime to,
-               boost::shared_ptr<Job> job,
                boost::shared_ptr<Log> log
                );
 

diff --git a/src/lib/emailer.cc b/src/lib/emailer.cc
index 2d4cf3976ba1334b62c3628abd75d94ef498d5ad..50ced3340e9d9879377e67f522fc4ce184129783 100644 (file)
--- a/src/lib/emailer.cc
+++ b/src/lib/emailer.cc
@@ -18,7 +18,6 @@
 */
 
 #include "compose.hpp"
-#include "job.h"
 #include "data.h"
 #include "config.h"
 #include "emailer.h"
@@ -92,7 +91,7 @@ Emailer::get_data (void* ptr, size_t size, size_t nmemb)
 }
 
 void
-Emailer::send (shared_ptr<Job> job)
+Emailer::send ()
 {
        char date_buffer[32];
        time_t now = time (0);

diff --git a/src/lib/emailer.h b/src/lib/emailer.h
index c8ebac7b6c1a1fac883d2a463005349f05fba727..8ec983f4368511e04d1cbfded031e3c6cddf380a 100644 (file)
--- a/src/lib/emailer.h
+++ b/src/lib/emailer.h
@@ -29,7 +29,7 @@ public:
        void add_bcc (std::string bcc);
        void add_attachment (boost::filesystem::path file, std::string name, std::string mime_type);
 
-       void send (boost::shared_ptr<Job> job);
+       void send ();
 
        std::string notes () const {
                return _notes;

diff --git a/src/lib/send_kdm_email_job.cc b/src/lib/send_kdm_email_job.cc
index 7eff1b719bf5eadc74c7967aa86ffd561b239f36..4d17123f1f2897a01701743216f772271a5822a9 100644 (file)
--- a/src/lib/send_kdm_email_job.cc
+++ b/src/lib/send_kdm_email_job.cc
@@ -69,7 +69,7 @@ void
 SendKDMEmailJob::run ()
 {
        set_progress_unknown ();
-       CinemaKDMs::email (_film_name, _cpl_name, _cinema_kdms, _from, _to, shared_from_this(), _log);
+       CinemaKDMs::email (_film_name, _cpl_name, _cinema_kdms, _from, _to, _log);
        set_progress (1);
        set_state (FINISHED_OK);
 }

diff --git a/src/lib/send_problem_report_job.cc b/src/lib/send_problem_report_job.cc
index 8142b173c3d42e89171ed6fbafb5b5e7c1e79aed..8979316ac6d4b40bc8bcf83002b0a87d0cd43a35 100644 (file)
--- a/src/lib/send_problem_report_job.cc
+++ b/src/lib/send_problem_report_job.cc
@@ -85,7 +85,7 @@ SendProblemReportJob::run ()
        to.push_back ("carl@dcpomatic.com");
 
        Emailer emailer (_from, to, "DCP-o-matic problem report", body);
-       emailer.send (shared_from_this ());
+       emailer.send ();
 
        set_progress (1);
 }