C++11 tidying.

diff --git a/src/lib/examine_content_job.cc b/src/lib/examine_content_job.cc
index fb943915517ca215e0566ce86c804276059ea88d..baa11ac93218820152ab5f3230d110fa0a9446df 100644 (file)
--- a/src/lib/examine_content_job.cc
+++ b/src/lib/examine_content_job.cc
@@ -1,5 +1,5 @@
 /*
 /*

-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>

 
     This file is part of DCP-o-matic.
 
 
     This file is part of DCP-o-matic.
 


@@ -18,19 +18,22 @@
 
 */
 
 
 */
 

-#include <boost/filesystem.hpp>
-#include "examine_content_job.h"
-#include "log.h"
+

 #include "content.h"
 #include "content.h"

+#include "examine_content_job.h"

 #include "film.h"
 #include "film.h"

+#include "log.h"
+#include <boost/filesystem.hpp>

 #include <iostream>
 
 #include "i18n.h"
 
 #include <iostream>
 
 #include "i18n.h"
 

+

 using std::string;
 using std::cout;
 using std::shared_ptr;
 
 using std::string;
 using std::cout;
 using std::shared_ptr;
 

+

 ExamineContentJob::ExamineContentJob (shared_ptr<const Film> film, shared_ptr<Content> c)
        : Job (film)
        , _content (c)
 ExamineContentJob::ExamineContentJob (shared_ptr<const Film> film, shared_ptr<Content> c)
        : Job (film)
        , _content (c)


@@ -38,23 +41,27 @@ ExamineContentJob::ExamineContentJob (shared_ptr<const Film> film, shared_ptr<Co
 
 }
 
 
 }
 

+

 ExamineContentJob::~ExamineContentJob ()
 {
        stop_thread ();
 }
 
 ExamineContentJob::~ExamineContentJob ()
 {
        stop_thread ();
 }
 

+

 string
 ExamineContentJob::name () const
 {
        return _("Examining content");
 }
 
 string
 ExamineContentJob::name () const
 {
        return _("Examining content");
 }
 

+

 string
 ExamineContentJob::json_name () const
 {
        return N_("examine_content");
 }
 
 string
 ExamineContentJob::json_name () const
 {
        return N_("examine_content");
 }
 

+

 void
 ExamineContentJob::run ()
 {
 void
 ExamineContentJob::run ()
 {

diff --git a/src/lib/examine_content_job.h b/src/lib/examine_content_job.h
index 00d27a342391f4f9681cb60358898442cc54afc1..9437942dc0aa659e748c8d507fe2d75e776b40ef 100644 (file)
--- a/src/lib/examine_content_job.h
+++ b/src/lib/examine_content_job.h
@@ -1,5 +1,5 @@
 /*
 /*

-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>

 
     This file is part of DCP-o-matic.
 
 
     This file is part of DCP-o-matic.
 


@@ -18,10 +18,13 @@
 
 */
 
 
 */
 

+

 #include "job.h"
 
 #include "job.h"
 

+

 class Content;
 
 class Content;
 

+

 class ExamineContentJob : public Job
 {
 public:
 class ExamineContentJob : public Job
 {
 public:

diff --git a/src/lib/signaller.h b/src/lib/signaller.h
index b67a639173cf3e4a5547568bf17797c266f0b761..44650de871cbbd4109aa403d6e465ce7899c7b6b 100644 (file)
--- a/src/lib/signaller.h
+++ b/src/lib/signaller.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.
 
 
     This file is part of DCP-o-matic.
 


@@ -18,20 +18,18 @@
 
 */
 
 
 */
 

+

 #ifndef DCPOMATIC_SIGNALLER_H
 #define DCPOMATIC_SIGNALLER_H
 
 #ifndef DCPOMATIC_SIGNALLER_H
 #define DCPOMATIC_SIGNALLER_H
 

+

 #include "signal_manager.h"
 #include <boost/thread/mutex.hpp>
 
 #include "signal_manager.h"
 #include <boost/thread/mutex.hpp>
 

+

 class WrapperBase
 {
 public:
 class WrapperBase
 {
 public:

-       WrapperBase ()
-               : _valid (true)
-               , _finished (false)
-       {}
-

        virtual ~WrapperBase () {}
 
        /* Can be called from any thread */
        virtual ~WrapperBase () {}
 
        /* Can be called from any thread */


@@ -59,10 +57,11 @@ public:
 protected:
        /* Protect _valid and _finished */
        mutable boost::mutex _mutex;
 protected:
        /* Protect _valid and _finished */
        mutable boost::mutex _mutex;

-       bool _valid;
-       bool _finished;
+       bool _valid = true;
+       bool _finished = false;

 };
 
 };
 

+

 /** Helper class to manage lifetime of signals, specifically to address
  *  the problem where an object containing a signal is deleted before
  *  its signal is emitted.
 /** Helper class to manage lifetime of signals, specifically to address
  *  the problem where an object containing a signal is deleted before
  *  its signal is emitted.


@@ -91,6 +90,7 @@ private:
        T _signal;
 };
 
        T _signal;
 };
 

+

 /** Parent for any class which needs to raise cross-thread signals (from non-UI
  *  to UI).  Subclasses should call, e.g. emit (boost::bind (boost::ref (MySignal), foo, bar));
  */
 /** Parent for any class which needs to raise cross-thread signals (from non-UI
  *  to UI).  Subclasses should call, e.g. emit (boost::bind (boost::ref (MySignal), foo, bar));
  */


@@ -100,8 +100,8 @@ public:
        /* Can be called from any thread */
        virtual ~Signaller () {
                boost::mutex::scoped_lock lm (_signaller_mutex);
        /* Can be called from any thread */
        virtual ~Signaller () {
                boost::mutex::scoped_lock lm (_signaller_mutex);

-               for (std::list<WrapperBase*>::iterator i = _wrappers.begin(); i != _wrappers.end(); ++i) {
-                       (*i)->invalidate ();
+               for (auto i: _wrappers) {
+                       i->invalidate();

                }
        }
 
                }
        }
 


@@ -109,17 +109,17 @@ public:
        template <class T>
        void emit (T signal)
        {
        template <class T>
        void emit (T signal)
        {

-               Wrapper<T>* w = new Wrapper<T> (signal);
+               auto w = new Wrapper<T> (signal);

                if (signal_manager) {
                if (signal_manager) {

-                       signal_manager->emit (boost::bind (&Wrapper<T>::signal, w));
+                       signal_manager->emit (boost::bind(&Wrapper<T>::signal, w));

                }
 
                boost::mutex::scoped_lock lm (_signaller_mutex);
 
                /* Clean up finished Wrappers */
                }
 
                boost::mutex::scoped_lock lm (_signaller_mutex);
 
                /* Clean up finished Wrappers */

-               std::list<WrapperBase*>::iterator i = _wrappers.begin ();
+               auto i = _wrappers.begin ();

                while (i != _wrappers.end ()) {
                while (i != _wrappers.end ()) {

-                       std::list<WrapperBase*>::iterator tmp = i;
+                       auto tmp = i;

                        ++tmp;
                        if ((*i)->finished ()) {
                                delete *i;
                        ++tmp;
                        if ((*i)->finished ()) {
                                delete *i;


@@ -138,4 +138,5 @@ private:
        std::list<WrapperBase*> _wrappers;
 };
 
        std::list<WrapperBase*> _wrappers;
 };
 

+

 #endif
 #endif

diff --git a/src/lib/upload_job.cc b/src/lib/upload_job.cc
index ec474abdfd49879517b92243ded556fbea60fa84..113e3a7e88bd8740456b6e8a30b7ace771f38621 100644 (file)
--- a/src/lib/upload_job.cc
+++ b/src/lib/upload_job.cc
@@ -1,5 +1,5 @@
 /*
 /*

-    Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>

 
     This file is part of DCP-o-matic.
 
 
     This file is part of DCP-o-matic.
 


@@ -18,22 +18,25 @@
 
 */
 
 
 */
 

+

 /** @file src/upload_job.cc
  *  @brief A job to copy DCPs to a server using libcurl.
  */
 
 /** @file src/upload_job.cc
  *  @brief A job to copy DCPs to a server using libcurl.
  */
 

+

 #include "compose.hpp"
 #include "compose.hpp"

-#include "upload_job.h"

 #include "config.h"
 #include "config.h"

-#include "log.h"
+#include "curl_uploader.h"

 #include "dcpomatic_log.h"
 #include "film.h"
 #include "dcpomatic_log.h"
 #include "film.h"

+#include "log.h"

 #include "scp_uploader.h"
 #include "scp_uploader.h"

-#include "curl_uploader.h"
+#include "upload_job.h"

 #include <iostream>
 
 #include "i18n.h"
 
 #include <iostream>
 
 #include "i18n.h"
 

+

 using std::string;
 using std::min;
 using std::shared_ptr;
 using std::string;
 using std::min;
 using std::shared_ptr;


@@ -42,6 +45,7 @@ using boost::scoped_ptr;
 using namespace boost::placeholders;
 #endif
 
 using namespace boost::placeholders;
 #endif
 

+

 UploadJob::UploadJob (shared_ptr<const Film> film)
        : Job (film)
        , _status (_("Waiting"))
 UploadJob::UploadJob (shared_ptr<const Film> film)
        : Job (film)
        , _status (_("Waiting"))


@@ -49,23 +53,27 @@ UploadJob::UploadJob (shared_ptr<const Film> film)
 
 }
 
 
 }
 

+

 UploadJob::~UploadJob ()
 {
        stop_thread ();
 }
 
 UploadJob::~UploadJob ()
 {
        stop_thread ();
 }
 

+

 string
 UploadJob::name () const
 {
        return _("Copy DCP to TMS");
 }
 
 string
 UploadJob::name () const
 {
        return _("Copy DCP to TMS");
 }
 

+

 string
 UploadJob::json_name () const
 {
        return N_("upload");
 }
 
 string
 UploadJob::json_name () const
 {
        return N_("upload");
 }
 

+

 void
 UploadJob::run ()
 {
 void
 UploadJob::run ()
 {


@@ -88,17 +96,19 @@ UploadJob::run ()
        set_state (FINISHED_OK);
 }
 
        set_state (FINISHED_OK);
 }
 

+

 string
 UploadJob::status () const
 {
        boost::mutex::scoped_lock lm (_status_mutex);
 string
 UploadJob::status () const
 {
        boost::mutex::scoped_lock lm (_status_mutex);

-       string s = Job::status ();
-       if (!_status.empty () && !finished_in_error ()) {
+       auto s = Job::status ();
+       if (!_status.empty() && !finished_in_error()) {

                s += N_("; ") + _status;
        }
        return s;
 }
 
                s += N_("; ") + _status;
        }
        return s;
 }
 

+

 void
 UploadJob::set_status (string s)
 {
 void
 UploadJob::set_status (string s)
 {

diff --git a/src/lib/upload_job.h b/src/lib/upload_job.h
index ef9b6b451af7996ea971290ab5feea08b2aaf78a..afd5ebda431488d0bac516061ab23b59860c0c6e 100644 (file)
--- a/src/lib/upload_job.h
+++ b/src/lib/upload_job.h
@@ -1,5 +1,5 @@
 /*
 /*

-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>

 
     This file is part of DCP-o-matic.
 
 
     This file is part of DCP-o-matic.
 


@@ -18,12 +18,15 @@
 
 */
 
 
 */
 

+

 /** @file src/upload_job.h
  *  @brief A job to copy DCPs to a server using libcurl.
  */
 
 /** @file src/upload_job.h
  *  @brief A job to copy DCPs to a server using libcurl.
  */
 

+

 #include "job.h"
 
 #include "job.h"
 

+

 class UploadJob : public Job
 {
 public:
 class UploadJob : public Job
 {
 public: