From 51e97eb90d68f101cbcac720c1a30d1a55874a1b Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Tue, 25 Jul 2023 14:58:02 +0200
Subject: [PATCH 1/1] Cleanup: include sorting.

---
 src/mono_picture_asset.cc   |  8 ++++----
 src/picture_asset.cc        | 10 +++++-----
 src/reel.cc                 | 30 +++++++++++++++---------------
 src/stereo_picture_asset.cc |  8 ++++----
 src/subtitle.cc             |  2 +-
 5 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/src/mono_picture_asset.cc b/src/mono_picture_asset.cc
index b58a5d89..934d3aa9 100644
--- a/src/mono_picture_asset.cc
+++ b/src/mono_picture_asset.cc
@@ -37,13 +37,13 @@
  */
 
 
+#include "compose.hpp"
+#include "dcp_assert.h"
+#include "exceptions.h"
 #include "mono_picture_asset.h"
-#include "mono_picture_asset_writer.h"
 #include "mono_picture_asset_reader.h"
-#include "exceptions.h"
-#include "dcp_assert.h"
+#include "mono_picture_asset_writer.h"
 #include "mono_picture_frame.h"
-#include "compose.hpp"
 #include <asdcp/AS_DCP.h>
 #include <asdcp/KM_fileio.h>
 
diff --git a/src/picture_asset.cc b/src/picture_asset.cc
index 56f383e0..426dbdb1 100644
--- a/src/picture_asset.cc
+++ b/src/picture_asset.cc
@@ -37,14 +37,14 @@
  */
 
 
-#include "picture_asset.h"
-#include "util.h"
+#include "compose.hpp"
+#include "dcp_assert.h"
 #include "exceptions.h"
+#include "j2k_transcode.h"
 #include "openjpeg_image.h"
+#include "picture_asset.h"
 #include "picture_asset_writer.h"
-#include "dcp_assert.h"
-#include "compose.hpp"
-#include "j2k_transcode.h"
+#include "util.h"
 #include <asdcp/AS_DCP.h>
 #include <asdcp/KM_fileio.h>
 #include <libxml++/nodes/element.h>
diff --git a/src/reel.cc b/src/reel.cc
index 454028cd..33a852cc 100644
--- a/src/reel.cc
+++ b/src/reel.cc
@@ -37,28 +37,28 @@
  */
 
 
-#include "reel.h"
-#include "util.h"
-#include "picture_asset.h"
+#include "decrypted_kdm.h"
+#include "decrypted_kdm_key.h"
+#include "interop_subtitle_asset.h"
 #include "mono_picture_asset.h"
-#include "stereo_picture_asset.h"
-#include "sound_asset.h"
-#include "subtitle_asset.h"
-#include "reel_mono_picture_asset.h"
-#include "reel_stereo_picture_asset.h"
-#include "reel_sound_asset.h"
+#include "picture_asset.h"
+#include "reel.h"
+#include "reel_atmos_asset.h"
+#include "reel_closed_caption_asset.h"
 #include "reel_interop_closed_caption_asset.h"
 #include "reel_interop_subtitle_asset.h"
+#include "reel_markers_asset.h"
+#include "reel_mono_picture_asset.h"
 #include "reel_smpte_closed_caption_asset.h"
 #include "reel_smpte_subtitle_asset.h"
+#include "reel_sound_asset.h"
+#include "reel_stereo_picture_asset.h"
 #include "reel_subtitle_asset.h"
-#include "reel_markers_asset.h"
-#include "decrypted_kdm_key.h"
-#include "decrypted_kdm.h"
-#include "interop_subtitle_asset.h"
 #include "smpte_subtitle_asset.h"
-#include "reel_atmos_asset.h"
-#include "reel_closed_caption_asset.h"
+#include "sound_asset.h"
+#include "stereo_picture_asset.h"
+#include "subtitle_asset.h"
+#include "util.h"
 #include <libxml++/nodes/element.h>
 #include <stdint.h>
 
diff --git a/src/stereo_picture_asset.cc b/src/stereo_picture_asset.cc
index 35e39093..19382902 100644
--- a/src/stereo_picture_asset.cc
+++ b/src/stereo_picture_asset.cc
@@ -37,12 +37,12 @@
  */
 
 
-#include "stereo_picture_asset.h"
-#include "stereo_picture_frame.h"
+#include "dcp_assert.h"
 #include "exceptions.h"
-#include "stereo_picture_asset_writer.h"
+#include "stereo_picture_asset.h"
 #include "stereo_picture_asset_reader.h"
-#include "dcp_assert.h"
+#include "stereo_picture_asset_writer.h"
+#include "stereo_picture_frame.h"
 #include <asdcp/AS_DCP.h>
 
 
diff --git a/src/subtitle.cc b/src/subtitle.cc
index 65ea9ff5..ecf36464 100644
--- a/src/subtitle.cc
+++ b/src/subtitle.cc
@@ -38,8 +38,8 @@
 
 
 #include "compose.hpp"
-#include "subtitle.h"
 #include "dcp_time.h"
+#include "subtitle.h"
 
 
 using std::shared_ptr;
-- 
2.30.2