Remove compose.hpp includes.

sed -i "/include.*compose.hpp/d;" src/lib/*.cc src/wx/*.cc src/wx/*.h src/tools/*.cc src/lib/*.h test/*.cc

22 files changed, 0 insertions, 22 deletions

diff --git a/src/wx/about_dialog.cc b/src/wx/about_dialog.cc
index c4cbde70a..df85fe782 100644
--- a/src/wx/about_dialog.cc
+++ b/src/wx/about_dialog.cc
@@ -27,7 +27,6 @@
 #include "static_text.h"
 #include "wx_util.h"
 #include "wx_variant.h"
-#include "lib/compose.hpp"
 #include "lib/variant.h"
 #include "lib/version.h"
 #include <dcp/warnings.h>
diff --git a/src/wx/audio_plot.cc b/src/wx/audio_plot.cc
index d1d9b9769..3982f9705 100644
--- a/src/wx/audio_plot.cc
+++ b/src/wx/audio_plot.cc
@@ -24,7 +24,6 @@
 #include "wx_util.h"
 #include "lib/audio_decoder.h"
 #include "lib/audio_analysis.h"
-#include "lib/compose.hpp"
 #include "lib/constants.h"
 #include "lib/maths_util.h"
 #include <dcp/warnings.h>
diff --git a/src/wx/barco_alchemy_certificate_panel.cc b/src/wx/barco_alchemy_certificate_panel.cc
index f5475fa76..879097e48 100644
--- a/src/wx/barco_alchemy_certificate_panel.cc
+++ b/src/wx/barco_alchemy_certificate_panel.cc
@@ -23,7 +23,6 @@
 #include "download_certificate_dialog.h"
 #include "wx_util.h"
 #include "lib/internet.h"
-#include "lib/compose.hpp"
 #include "lib/config.h"
 #include <boost/algorithm/string.hpp>
 
diff --git a/src/wx/christie_certificate_panel.cc b/src/wx/christie_certificate_panel.cc
index 1218657f7..de4c6969d 100644
--- a/src/wx/christie_certificate_panel.cc
+++ b/src/wx/christie_certificate_panel.cc
@@ -22,7 +22,6 @@
 #include "download_certificate_dialog.h"
 #include "wx_util.h"
 #include "lib/internet.h"
-#include "lib/compose.hpp"
 #include "lib/config.h"
 
 using std::string;
diff --git a/src/wx/closed_captions_dialog.cc b/src/wx/closed_captions_dialog.cc
index e95da4863..34c5681a7 100644
--- a/src/wx/closed_captions_dialog.cc
+++ b/src/wx/closed_captions_dialog.cc
@@ -23,7 +23,6 @@
 #include "film_viewer.h"
 #include "wx_util.h"
 #include "lib/butler.h"
-#include "lib/compose.hpp"
 #include "lib/constants.h"
 #include "lib/film.h"
 #include "lib/string_text.h"
diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc
index 218dd2c36..06a257dbb 100644
--- a/src/wx/content_panel.cc
+++ b/src/wx/content_panel.cc
@@ -34,7 +34,6 @@
 #include "wx_variant.h"
 #include "lib/audio_content.h"
 #include "lib/case_insensitive_sorter.h"
-#include "lib/compose.hpp"
 #include "lib/config.h"
 #include "lib/content_factory.h"
 #include "lib/cross.h"
diff --git a/src/wx/content_sub_panel.cc b/src/wx/content_sub_panel.cc
index 10fdfa232..8b60c740e 100644
--- a/src/wx/content_sub_panel.cc
+++ b/src/wx/content_sub_panel.cc
@@ -23,7 +23,6 @@
 #include "content_panel.h"
 #include "wx_util.h"
 #include "lib/dcp_content.h"
-#include "lib/compose.hpp"
 #include "lib/log.h"
 #include <dcp/warnings.h>
 LIBDCP_DISABLE_WARNINGS
diff --git a/src/wx/content_timeline_dialog.cc b/src/wx/content_timeline_dialog.cc
index 697e6561f..4d1bbb1d4 100644
--- a/src/wx/content_timeline_dialog.cc
+++ b/src/wx/content_timeline_dialog.cc
@@ -23,7 +23,6 @@
 #include "content_timeline_dialog.h"
 #include "film_editor.h"
 #include "wx_util.h"
-#include "lib/compose.hpp"
 #include "lib/cross.h"
 #include "lib/film.h"
 #include "lib/playlist.h"
diff --git a/src/wx/dcp_timeline_dialog.cc b/src/wx/dcp_timeline_dialog.cc
index 2cf6a74f1..45c58aed9 100644
--- a/src/wx/dcp_timeline_dialog.cc
+++ b/src/wx/dcp_timeline_dialog.cc
@@ -23,7 +23,6 @@
 #include "dcp_timeline_dialog.h"
 #include "film_editor.h"
 #include "wx_util.h"
-#include "lib/compose.hpp"
 #include "lib/cross.h"
 #include "lib/film.h"
 #include "lib/playlist.h"
diff --git a/src/wx/dolby_doremi_certificate_panel.cc b/src/wx/dolby_doremi_certificate_panel.cc
index 4ddb8fc8f..5b7b40cf8 100644
--- a/src/wx/dolby_doremi_certificate_panel.cc
+++ b/src/wx/dolby_doremi_certificate_panel.cc
@@ -22,7 +22,6 @@
 #include "dolby_doremi_certificate_panel.h"
 #include "download_certificate_dialog.h"
 #include "wx_util.h"
-#include "lib/compose.hpp"
 #include "lib/internet.h"
 #include "lib/signal_manager.h"
 #include "lib/util.h"
diff --git a/src/wx/download_certificate_panel.cc b/src/wx/download_certificate_panel.cc
index 1a3896773..5995b0385 100644
--- a/src/wx/download_certificate_panel.cc
+++ b/src/wx/download_certificate_panel.cc
@@ -22,7 +22,6 @@
 #include "download_certificate_dialog.h"
 #include "download_certificate_panel.h"
 #include "wx_util.h"
-#include "lib/compose.hpp"
 #include "lib/signal_manager.h"
 #include <dcp/certificate_chain.h>
 #include <dcp/exceptions.h>
diff --git a/src/wx/film_name_location_dialog.cc b/src/wx/film_name_location_dialog.cc
index 2933c1b31..893b789f9 100644
--- a/src/wx/film_name_location_dialog.cc
+++ b/src/wx/film_name_location_dialog.cc
@@ -26,7 +26,6 @@
 #ifdef DCPOMATIC_USE_OWN_PICKER
 #include "dir_picker_ctrl.h"
 #endif
-#include "lib/compose.hpp"
 #include "lib/config.h"
 #include <dcp/warnings.h>
 LIBDCP_DISABLE_WARNINGS
diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 7b22999b0..45476c75d 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -34,7 +34,6 @@
 #include "simple_video_view.h"
 #include "wx_util.h"
 #include "lib/butler.h"
-#include "lib/compose.hpp"
 #include "lib/config.h"
 #include "lib/dcp_content.h"
 #include "lib/dcpomatic_log.h"
diff --git a/src/wx/gdc_certificate_panel.cc b/src/wx/gdc_certificate_panel.cc
index e937cff2a..bbbafd61b 100644
--- a/src/wx/gdc_certificate_panel.cc
+++ b/src/wx/gdc_certificate_panel.cc
@@ -22,7 +22,6 @@
 #include "download_certificate_dialog.h"
 #include "gdc_certificate_panel.h"
 #include "wx_util.h"
-#include "lib/compose.hpp"
 #include "lib/config.h"
 #include "lib/internet.h"
 #include <boost/algorithm/string.hpp>
diff --git a/src/wx/job_manager_view.cc b/src/wx/job_manager_view.cc
index 9c3c29baa..7e445a9db 100644
--- a/src/wx/job_manager_view.cc
+++ b/src/wx/job_manager_view.cc
@@ -29,7 +29,6 @@
 #include "job_manager_view.h"
 #include "normal_job_view.h"
 #include "wx_util.h"
-#include "lib/compose.hpp"
 #include "lib/exceptions.h"
 #include "lib/job.h"
 #include "lib/job_manager.h"
diff --git a/src/wx/job_view.cc b/src/wx/job_view.cc
index aa175816d..7ed44ee1e 100644
--- a/src/wx/job_view.cc
+++ b/src/wx/job_view.cc
@@ -27,7 +27,6 @@
 #include "wx_util.h"
 #include "wx_variant.h"
 #include "lib/analyse_audio_job.h"
-#include "lib/compose.hpp"
 #include "lib/config.h"
 #include "lib/job.h"
 #include "lib/job_manager.h"
diff --git a/src/wx/name_format_editor.h b/src/wx/name_format_editor.h
index b4fe5691e..70a02a902 100644
--- a/src/wx/name_format_editor.h
+++ b/src/wx/name_format_editor.h
@@ -23,7 +23,6 @@
 #define DCPOMATIC_NAME_FORMAT_EDITOR_H
 
 
-#include "lib/compose.hpp"
 #include <dcp/name_format.h>
 #include <dcp/warnings.h>
 LIBDCP_DISABLE_WARNINGS
diff --git a/src/wx/player_information.cc b/src/wx/player_information.cc
index da73ec933..6eed7ae2f 100644
--- a/src/wx/player_information.cc
+++ b/src/wx/player_information.cc
@@ -23,7 +23,6 @@
 #include "wx_util.h"
 #include "film_viewer.h"
 #include "lib/playlist.h"
-#include "lib/compose.hpp"
 #include "lib/video_content.h"
 #include "lib/audio_content.h"
 #include "lib/dcp_content.h"
diff --git a/src/wx/playlist_controls.cc b/src/wx/playlist_controls.cc
index 87a0e9a4a..c7dad4139 100644
--- a/src/wx/playlist_controls.cc
+++ b/src/wx/playlist_controls.cc
@@ -26,7 +26,6 @@
 #include "static_text.h"
 #include "wx_util.h"
 #include "wx_variant.h"
-#include "lib/compose.hpp"
 #include "lib/constants.h"
 #include "lib/cross.h"
 #include "lib/dcp_content.h"
diff --git a/src/wx/qube_certificate_panel.cc b/src/wx/qube_certificate_panel.cc
index 5e098a047..f246ea384 100644
--- a/src/wx/qube_certificate_panel.cc
+++ b/src/wx/qube_certificate_panel.cc
@@ -22,7 +22,6 @@
 #include "download_certificate_dialog.h"
 #include "qube_certificate_panel.h"
 #include "wx_util.h"
-#include "lib/compose.hpp"
 #include "lib/config.h"
 #include "lib/internet.h"
 #include <boost/algorithm/string.hpp>
diff --git a/src/wx/recipient_dialog.cc b/src/wx/recipient_dialog.cc
index 85c01c97e..69caa3251 100644
--- a/src/wx/recipient_dialog.cc
+++ b/src/wx/recipient_dialog.cc
@@ -25,7 +25,6 @@
 #include "static_text.h"
 #include "table_dialog.h"
 #include "wx_util.h"
-#include "lib/compose.hpp"
 #include "lib/util.h"
 #include <dcp/exceptions.h>
 #include <dcp/certificate_chain.h>
diff --git a/src/wx/screen_dialog.cc b/src/wx/screen_dialog.cc
index 21786b8a2..84d798065 100644
--- a/src/wx/screen_dialog.cc
+++ b/src/wx/screen_dialog.cc
@@ -26,7 +26,6 @@
 #include "static_text.h"
 #include "table_dialog.h"
 #include "wx_util.h"
-#include "lib/compose.hpp"
 #include "lib/util.h"
 #include <dcp/warnings.h>
 #include <dcp/exceptions.h>