Tidying.

[dcpomatic.git] / src / lib / util.h

diff --git a/src/lib/util.h b/src/lib/util.h
index 1296dc78940ccd196d6c5a27015c08dfc38bb5be..0f3351dbf864e68c134cf618699af498a4beb227 100644 (file)
--- a/src/lib/util.h
+++ b/src/lib/util.h
@@ -34,13 +34,13 @@
 #include "types.h"
 #include <dcp/atmos_asset.h>
 #include <dcp/decrypted_kdm.h>
-#include <dcp/util.h>
 #include <dcp/subtitle_image.h>
-#include <boost/optional.hpp>
-#include <boost/filesystem.hpp>
+#include <dcp/util.h>
 #include <boost/date_time/gregorian/gregorian.hpp>
-#include <string>
+#include <boost/filesystem.hpp>
+#include <boost/optional.hpp>
 #include <map>
+#include <string>
 #include <vector>
 
 #undef check
@@ -130,29 +130,6 @@ extern dcp::DecryptedKDM decrypt_kdm_with_helpful_error (dcp::EncryptedKDM kdm);
 extern boost::filesystem::path default_font_file ();
 extern std::string to_upper (std::string s);
 extern void start_of_thread (std::string name);
-
-template <class T>
-std::list<T>
-vector_to_list (std::vector<T> v)
-{
-       std::list<T> l;
-       for (auto& i: v) {
-               l.push_back (i);
-       }
-       return l;
-}
-
-template <class T>
-std::vector<T>
-list_to_vector (std::list<T> v)
-{
-       std::vector<T> l;
-       for (auto& i: v) {
-               l.push_back (i);
-       }
-       return l;
-}
-
 extern double db_to_linear (double db);
 extern double linear_to_db (double linear);