From 8f7efc8c704891a9c5499c17fa89fe84cdf5bde4 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 19 Nov 2015 16:02:04 +0000 Subject: [PATCH] Remove unused parameter. --- src/lib/cinema_kdms.cc | 4 ++-- src/lib/cinema_kdms.h | 1 - src/lib/emailer.cc | 3 +-- src/lib/emailer.h | 2 +- src/lib/send_kdm_email_job.cc | 2 +- src/lib/send_problem_report_job.cc | 2 +- 6 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/lib/cinema_kdms.cc b/src/lib/cinema_kdms.cc index 15aaaa731..d95e02854 100644 --- a/src/lib/cinema_kdms.cc +++ b/src/lib/cinema_kdms.cc @@ -119,7 +119,7 @@ CinemaKDMs::write_zip_files (string film_name, list cinema_kdms, boo /* XXX: should probably get from/to from the KDMs themselves */ void CinemaKDMs::email ( - string film_name, string cpl_name, list cinema_kdms, dcp::LocalTime from, dcp::LocalTime to, shared_ptr job, shared_ptr log + string film_name, string cpl_name, list cinema_kdms, dcp::LocalTime from, dcp::LocalTime to, shared_ptr 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 4458869db..318d62e8d 100644 --- a/src/lib/cinema_kdms.h +++ b/src/lib/cinema_kdms.h @@ -36,7 +36,6 @@ public: std::list cinema_kdms, dcp::LocalTime from, dcp::LocalTime to, - boost::shared_ptr job, boost::shared_ptr log ); diff --git a/src/lib/emailer.cc b/src/lib/emailer.cc index 2d4cf3976..50ced3340 100644 --- 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) +Emailer::send () { char date_buffer[32]; time_t now = time (0); diff --git a/src/lib/emailer.h b/src/lib/emailer.h index c8ebac7b6..8ec983f43 100644 --- 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); + 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 7eff1b719..4d17123f1 100644 --- 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 8142b173c..8979316ac 100644 --- 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); } -- 2.30.2