Cleanup some unused using statements and other bits.

diff --git a/src/lib/dcp_subtitle_decoder.cc b/src/lib/dcp_subtitle_decoder.cc
index 024d62f3424f3138f2f84f190e5f99119d4a8984..b3240491f829dd0d64fa92f0128569e13b5214d4 100644 (file)
--- a/src/lib/dcp_subtitle_decoder.cc
+++ b/src/lib/dcp_subtitle_decoder.cc
@@ -28,13 +28,11 @@
 
 using std::cout;
 using std::list;
-using std::map;
 using std::string;
 using std::vector;
 using std::shared_ptr;
 using std::dynamic_pointer_cast;
 using std::make_shared;
-using boost::bind;
 using namespace dcpomatic;
 
 

diff --git a/src/lib/string_text_file_decoder.cc b/src/lib/string_text_file_decoder.cc
index f24147851847e1ee120354984f2dbd40f20630a7..d366bedc0fa84ebd578650eed2c18fb94ef012c6 100644 (file)
--- a/src/lib/string_text_file_decoder.cc
+++ b/src/lib/string_text_file_decoder.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014-2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,6 +18,7 @@
 
 */
 
+
 #include "string_text_file_decoder.h"
 #include "string_text_file_content.h"
 #include "text_content.h"
@@ -25,16 +26,15 @@
 #include <dcp/subtitle_string.h>
 #include <iostream>
 
-using std::list;
-using std::vector;
-using std::string;
+
 using std::cout;
-using std::max;
+using std::make_shared;
 using std::shared_ptr;
-using boost::optional;
-using std::dynamic_pointer_cast;
+using std::string;
+using std::vector;
 using namespace dcpomatic;
 
+
 StringTextFileDecoder::StringTextFileDecoder (shared_ptr<const Film> film, shared_ptr<const StringTextFileContent> content)
        : Decoder (film)
        , StringTextFile (content)
@@ -44,9 +44,10 @@ StringTextFileDecoder::StringTextFileDecoder (shared_ptr<const Film> film, share
        if (!_subtitles.empty()) {
                first = content_time_period(_subtitles[0]).from;
        }
-       text.push_back (shared_ptr<TextDecoder> (new TextDecoder (this, content->only_text(), first)));
+       text.push_back (make_shared<TextDecoder>(this, content->only_text(), first));
 }
 
+
 void
 StringTextFileDecoder::seek (ContentTime time, bool accurate)
 {
@@ -66,6 +67,7 @@ StringTextFileDecoder::seek (ContentTime time, bool accurate)
        }
 }
 
+
 bool
 StringTextFileDecoder::pass ()
 {
@@ -80,6 +82,7 @@ StringTextFileDecoder::pass ()
        return false;
 }
 
+
 ContentTimePeriod
 StringTextFileDecoder::content_time_period (sub::Subtitle s) const
 {

diff --git a/src/lib/text_decoder.cc b/src/lib/text_decoder.cc
index 8111154e348f00b619e0f81229f3d9e7b04993a2..88f7cd4a9bab0f2d10f9efc1da79c036305a454b 100644 (file)
--- a/src/lib/text_decoder.cc
+++ b/src/lib/text_decoder.cc
@@ -36,7 +36,6 @@ using std::min;
 using std::max;
 using std::shared_ptr;
 using boost::optional;
-using std::function;
 using namespace dcpomatic;
 
 

diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index 66239c537c9a2a1489950ed4076fe4a4a5249e79..8b51eb58759a1364ed9af4fc80ff388401b164e1 100644 (file)
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -54,13 +54,9 @@
 
 using std::cout;
 using std::dynamic_pointer_cast;
-using std::list;
-using std::make_pair;
 using std::make_shared;
-using std::map;
 using std::max;
 using std::min;
-using std::pair;
 using std::shared_ptr;
 using std::string;
 using std::vector;