Trim some unused stream includes / usings.

15 files changed, 6 insertions, 43 deletions

diff --git a/src/cpl.cc b/src/cpl.cc
index 33ef647e..0abf864a 100644
--- a/src/cpl.cc
+++ b/src/cpl.cc
@@ -49,8 +49,6 @@
 #include <boost/foreach.hpp>
 
 using std::string;
-using std::stringstream;
-using std::ostream;
 using std::list;
 using std::pair;
 using std::make_pair;
@@ -207,9 +205,8 @@ CPL::equals (shared_ptr<const Asset> other, EqualityOptions opt, NoteHandler not
 	}
 
 	if (_annotation_text != other_cpl->_annotation_text && !opt.cpl_annotation_texts_can_differ) {
-		stringstream s;
-		s << "CPL: annotation texts differ: " << _annotation_text << " vs " << other_cpl->_annotation_text << "\n";
-		note (DCP_ERROR, s.str ());
+		string const s = "CPL: annotation texts differ: " + _annotation_text + " vs " + other_cpl->_annotation_text + "\n";
+		note (DCP_ERROR, s);
 		return false;
 	}
 
diff --git a/src/dcp.cc b/src/dcp.cc
index 215c6002..d2fc9745 100644
--- a/src/dcp.cc
+++ b/src/dcp.cc
@@ -62,12 +62,10 @@
 #include <boost/filesystem.hpp>
 #include <boost/algorithm/string.hpp>
 #include <boost/foreach.hpp>
-#include <iostream>
 
 using std::string;
 using std::list;
 using std::cout;
-using std::ostream;
 using std::make_pair;
 using std::map;
 using std::cout;
diff --git a/src/metadata.cc b/src/metadata.cc
index 0e3d7c76..dbe80919 100644
--- a/src/metadata.cc
+++ b/src/metadata.cc
@@ -39,7 +39,6 @@
 #include "util.h"
 #include "local_time.h"
 #include <asdcp/AS_DCP.h>
-#include <sstream>
 #include <iomanip>
 #include <time.h>
 
diff --git a/src/mono_picture_asset_writer.cc b/src/mono_picture_asset_writer.cc
index 7c955c1d..1ef079dc 100644
--- a/src/mono_picture_asset_writer.cc
+++ b/src/mono_picture_asset_writer.cc
@@ -44,8 +44,6 @@
 
 #include "picture_asset_writer_common.cc"
 
-using std::istream;
-using std::ostream;
 using std::string;
 using boost::shared_ptr;
 using namespace dcp;
diff --git a/src/mono_picture_asset_writer.h b/src/mono_picture_asset_writer.h
index e694e085..532f7ad7 100644
--- a/src/mono_picture_asset_writer.h
+++ b/src/mono_picture_asset_writer.h
@@ -43,7 +43,6 @@
 #include <boost/utility.hpp>
 #include <stdint.h>
 #include <string>
-#include <fstream>
 
 namespace dcp {
 
diff --git a/src/picture_asset.cc b/src/picture_asset.cc
index 674180c3..a0a7d7d7 100644
--- a/src/picture_asset.cc
+++ b/src/picture_asset.cc
@@ -45,19 +45,13 @@
 #include <boost/filesystem.hpp>
 #include <list>
 #include <stdexcept>
-#include <iostream>
-#include <sstream>
 
 using std::string;
-using std::ostream;
 using std::list;
 using std::vector;
 using std::max;
-using std::stringstream;
 using std::pair;
 using std::make_pair;
-using std::istream;
-using std::cout;
 using boost::shared_ptr;
 using namespace dcp;
 
diff --git a/src/picture_asset_writer.cc b/src/picture_asset_writer.cc
index baa98a4f..e3d7b70e 100644
--- a/src/picture_asset_writer.cc
+++ b/src/picture_asset_writer.cc
@@ -39,8 +39,6 @@
 #include <inttypes.h>
 #include <stdint.h>
 
-using std::istream;
-using std::ostream;
 using std::string;
 using boost::shared_ptr;
 using namespace dcp;
diff --git a/src/picture_asset_writer.h b/src/picture_asset_writer.h
index 5527537d..1ef519ba 100644
--- a/src/picture_asset_writer.h
+++ b/src/picture_asset_writer.h
@@ -45,7 +45,6 @@
 #include <boost/utility.hpp>
 #include <stdint.h>
 #include <string>
-#include <fstream>
 
 namespace dcp {
 
diff --git a/src/reel_asset.cc b/src/reel_asset.cc
index c4432f21..6e1b024e 100644
--- a/src/reel_asset.cc
+++ b/src/reel_asset.cc
@@ -41,12 +41,10 @@
 #include "compose.hpp"
 #include <libcxml/cxml.h>
 #include <libxml++/libxml++.h>
-#include <iostream>
 
 using std::pair;
 using std::cout;
 using std::string;
-using std::stringstream;
 using std::make_pair;
 using boost::shared_ptr;
 using namespace dcp;
@@ -122,13 +120,12 @@ bool
 ReelAsset::equals (shared_ptr<const ReelAsset> other, EqualityOptions opt, NoteHandler note) const
 {
 	if (_annotation_text != other->_annotation_text) {
-		stringstream s;
-		s << "Reel: annotation texts differ (" << _annotation_text << " vs " << other->_annotation_text << ")\n";
+		string const s = "Reel: annotation texts differ (" + _annotation_text + " vs " + other->_annotation_text + ")\n";
 		if (!opt.reel_annotation_texts_can_differ) {
-			note (DCP_ERROR, s.str ());
+			note (DCP_ERROR, s);
 			return false;
 		} else {
-			note (DCP_NOTE, s.str ());
+			note (DCP_NOTE, s);
 		}
 	}
 
diff --git a/src/reel_picture_asset.cc b/src/reel_picture_asset.cc
index 1c745e4a..de106c79 100644
--- a/src/reel_picture_asset.cc
+++ b/src/reel_picture_asset.cc
@@ -47,7 +47,6 @@
 
 using std::bad_cast;
 using std::string;
-using std::stringstream;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 using boost::optional;
diff --git a/src/smpte_subtitle_asset.cc b/src/smpte_subtitle_asset.cc
index 5bb88621..0c0181f4 100644
--- a/src/smpte_subtitle_asset.cc
+++ b/src/smpte_subtitle_asset.cc
@@ -52,8 +52,6 @@
 
 using std::string;
 using std::list;
-using std::stringstream;
-using std::cout;
 using std::vector;
 using std::map;
 using boost::shared_ptr;
@@ -85,9 +83,7 @@ SMPTESubtitleAsset::SMPTESubtitleAsset (boost::filesystem::path file)
 	if (!ASDCP_FAILURE (r)) {
 		string s;
 		reader->ReadTimedTextResource (s, 0, 0);
-		stringstream t;
-		t << s;
-		xml->read_stream (t);
+		xml->read_string (s);
 		ASDCP::WriterInfo info;
 		reader->FillWriterInfo (info);
 		_id = read_writer_info (info);
diff --git a/src/sound_asset.cc b/src/sound_asset.cc
index 613fa576..e3adff45 100644
--- a/src/sound_asset.cc
+++ b/src/sound_asset.cc
@@ -47,12 +47,9 @@
 #include <asdcp/AS_DCP.h>
 #include <libxml++/nodes/element.h>
 #include <boost/filesystem.hpp>
-#include <iostream>
 #include <stdexcept>
 
 using std::string;
-using std::stringstream;
-using std::ostream;
 using std::vector;
 using std::list;
 using boost::shared_ptr;
diff --git a/src/stereo_picture_asset_writer.cc b/src/stereo_picture_asset_writer.cc
index d98df6ae..6e43de10 100644
--- a/src/stereo_picture_asset_writer.cc
+++ b/src/stereo_picture_asset_writer.cc
@@ -40,8 +40,6 @@
 
 #include "picture_asset_writer_common.cc"
 
-using std::istream;
-using std::ostream;
 using std::string;
 using boost::shared_ptr;
 using namespace dcp;
diff --git a/src/subtitle_asset.cc b/src/subtitle_asset.cc
index cb757673..b9f6336c 100644
--- a/src/subtitle_asset.cc
+++ b/src/subtitle_asset.cc
@@ -45,13 +45,9 @@
 #include <boost/algorithm/string.hpp>
 #include <boost/shared_array.hpp>
 #include <boost/foreach.hpp>
-#include <fstream>
 
 using std::string;
 using std::list;
-using std::ostream;
-using std::ofstream;
-using std::stringstream;
 using std::cout;
 using std::cerr;
 using std::map;
diff --git a/src/util.cc b/src/util.cc
index 359ac317..0c3cea08 100644
--- a/src/util.cc
+++ b/src/util.cc
@@ -55,14 +55,12 @@
 #include <boost/filesystem.hpp>
 #include <boost/algorithm/string.hpp>
 #include <stdexcept>
-#include <sstream>
 #include <iostream>
 #include <iomanip>
 
 using std::string;
 using std::wstring;
 using std::cout;
-using std::stringstream;
 using std::min;
 using std::max;
 using std::list;