From f021a24c9db4df2afb096392f9da18dba80b25d3 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Wed, 23 Jul 2014 11:47:05 +0100
Subject: [PATCH] #include trimming.

---
 src/tools/dcpomatic.cc      |  1 +
 src/wx/audio_panel.cc       |  2 +-
 src/wx/content_sub_panel.cc |  2 +-
 src/wx/film_editor.cc       |  1 +
 src/wx/film_editor.h        | 13 ++-----------
 src/wx/subtitle_panel.cc    |  1 +
 src/wx/timeline.cc          |  1 +
 src/wx/timeline_dialog.cc   |  1 +
 src/wx/timing_panel.cc      |  2 +-
 src/wx/video_panel.cc       |  2 +-
 10 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index 95d0d22a5..e67703b22 100644
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -45,6 +45,7 @@
 #include "wx/servers_list_dialog.h"
 #include "wx/hints_dialog.h"
 #include "wx/update_dialog.h"
+#include "wx/content_panel.h"
 #include "lib/film.h"
 #include "lib/config.h"
 #include "lib/util.h"
diff --git a/src/wx/audio_panel.cc b/src/wx/audio_panel.cc
index b3e78397d..82604763c 100644
--- a/src/wx/audio_panel.cc
+++ b/src/wx/audio_panel.cc
@@ -29,7 +29,7 @@
 #include "audio_mapping_view.h"
 #include "wx_util.h"
 #include "gain_calculator_dialog.h"
-#include "film_editor.h"
+#include "content_panel.h"
 
 using std::vector;
 using std::cout;
diff --git a/src/wx/content_sub_panel.cc b/src/wx/content_sub_panel.cc
index f0962cc24..7ea17c15c 100644
--- a/src/wx/content_sub_panel.cc
+++ b/src/wx/content_sub_panel.cc
@@ -19,7 +19,7 @@
 
 #include <wx/notebook.h>
 #include "content_sub_panel.h"
-#include "film_editor.h"
+#include "content_panel.h"
 
 using boost::shared_ptr;
 
diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index c80a2a16c..d037ccd50 100644
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -54,6 +54,7 @@
 #include "subtitle_panel.h"
 #include "audio_panel.h"
 #include "video_panel.h"
+#include "content_panel.h"
 
 using std::string;
 using std::cout;
diff --git a/src/wx/film_editor.h b/src/wx/film_editor.h
index aad2ad9f7..12a314abb 100644
--- a/src/wx/film_editor.h
+++ b/src/wx/film_editor.h
@@ -22,23 +22,14 @@
  */
 
 #include <wx/wx.h>
-#include <wx/spinctrl.h>
-#include <wx/filepicker.h>
-#include <wx/collpane.h>
 #include <boost/signals2.hpp>
 #include "lib/film.h"
-#include "content_menu.h"
-#include "content_panel.h"
 
 class wxNotebook;
-class wxListCtrl;
-class wxListEvent;
+class wxSpinCtrl;
 class Film;
-class TimelineDialog;
 class Ratio;
-class Timecode;
-class FilmEditorPanel;
-class SubtitleContent;
+class ContentPanel;
 
 /** @class FilmEditor
  *  @brief A wx widget to edit a film's metadata, and perform various functions.
diff --git a/src/wx/subtitle_panel.cc b/src/wx/subtitle_panel.cc
index 9025e5ddc..fecc85106 100644
--- a/src/wx/subtitle_panel.cc
+++ b/src/wx/subtitle_panel.cc
@@ -29,6 +29,7 @@
 #include "film_editor.h"
 #include "wx_util.h"
 #include "subtitle_view.h"
+#include "content_panel.h"
 
 using std::vector;
 using std::string;
diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc
index d728bd47c..1096a435a 100644
--- a/src/wx/timeline.cc
+++ b/src/wx/timeline.cc
@@ -25,6 +25,7 @@
 #include "lib/image_content.h"
 #include "film_editor.h"
 #include "timeline.h"
+#include "content_panel.h"
 #include "wx_util.h"
 
 using std::list;
diff --git a/src/wx/timeline_dialog.cc b/src/wx/timeline_dialog.cc
index 2f7ade765..8ac90b8de 100644
--- a/src/wx/timeline_dialog.cc
+++ b/src/wx/timeline_dialog.cc
@@ -23,6 +23,7 @@
 #include "film_editor.h"
 #include "timeline_dialog.h"
 #include "wx_util.h"
+#include "content_panel.h"
 
 using std::list;
 using std::cout;
diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc
index 4345e7136..021ab6ab0 100644
--- a/src/wx/timing_panel.cc
+++ b/src/wx/timing_panel.cc
@@ -23,7 +23,7 @@
 #include "timing_panel.h"
 #include "wx_util.h"
 #include "timecode.h"
-#include "film_editor.h"
+#include "content_panel.h"
 
 using std::cout;
 using std::string;
diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc
index facd0f3d4..f00edd8ff 100644
--- a/src/wx/video_panel.cc
+++ b/src/wx/video_panel.cc
@@ -28,9 +28,9 @@
 #include "filter_dialog.h"
 #include "video_panel.h"
 #include "wx_util.h"
-#include "film_editor.h"
 #include "content_colour_conversion_dialog.h"
 #include "content_widget.h"
+#include "content_panel.h"
 
 using std::vector;
 using std::string;
-- 
2.30.2