More header file rearrangement.

diff --git a/hacks/check_includes b/hacks/check_includes
index bd0ea636fd51188499eafa5fbe2ef1467fe6de69..8a4f901143156e861af264e0c2a6e8e046e4b05a 100755 (executable)
--- a/hacks/check_includes
+++ b/hacks/check_includes
@@ -8,7 +8,7 @@ for a in sys.argv[1:]:
         if line.startswith('#include'):
             includes.append(line.strip()[9:])
 
-    std = ['<cstdio>', '<unistd.h>', '<stdexcept>', '<iostream>', '<algorithm>', '<fstream>', '<cstdlib>', '<iomanip>', '<stdint.h>', '<cmath>', '<cassert>', '<cstring>', '<mntent.h>', '<windows.h>', '<shlwapi.h>', '<sys/sysctl.h>', '<mach-o/dyld.h>', '<IOKit/pwr_mgt/IOPMLib.h>', '<sys/types.h>', '<ifaddrs.h>', '<netinet/in.h>', '<arpa/inet.h>']
+    std = ['<cstdio>', '<unistd.h>', '<stdexcept>', '<iostream>', '<algorithm>', '<fstream>', '<cstdlib>', '<iomanip>', '<stdint.h>', '<cmath>', '<cassert>', '<cstring>', '<mntent.h>', '<windows.h>', '<shlwapi.h>', '<sys/sysctl.h>', '<mach-o/dyld.h>', '<IOKit/pwr_mgt/IOPMLib.h>', '<sys/types.h>', '<ifaddrs.h>', '<netinet/in.h>', '<arpa/inet.h>', '<cerrno>']
 
     current_group = 0
     for i in includes:
@@ -28,11 +28,9 @@ for a in sys.argv[1:]:
         else:
             group = 0
 
-        print '%s: %d' % (i, group)
-
         if group < current_group:
             print '%s: first wrong order is %s' % (a, i)
-            sys.exit(1)
+            break
 
         current_group = group
 

diff --git a/src/lib/log.cc b/src/lib/log.cc
index daef13f77aa1fae64eaf8a7fffced1eae016f6b0..a3466538e8924a9880521ddc632f703127665745 100644 (file)
--- a/src/lib/log.cc
+++ b/src/lib/log.cc
@@ -21,12 +21,12 @@
  *  @brief A very simple logging class.
  */
 
-#include <time.h>
-#include <cstdio>
 #include "log.h"
 #include "cross.h"
 #include "config.h"
 #include "safe_stringstream.h"
+#include <time.h>
+#include <cstdio>
 
 #include "i18n.h"
 

diff --git a/src/lib/util.cc b/src/lib/util.cc
index bf4c7424417e92dde0de6a1127415a72fe061ee5..20b7ba4706d97ecb6ee989a2a8b62a16629319fd 100644 (file)
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -22,46 +22,6 @@
  *  @brief Some utility functions and classes.
  */
 
-#include <iomanip>
-#include <iostream>
-#include <fstream>
-#include <climits>
-#include <stdexcept>
-#ifdef DCPOMATIC_POSIX
-#include <execinfo.h>
-#include <cxxabi.h>
-#endif
-#include <libssh/libssh.h>
-#include <signal.h>
-#include <boost/algorithm/string.hpp>
-#include <boost/bind.hpp>
-#include <boost/lambda/lambda.hpp>
-#include <boost/thread.hpp>
-#include <boost/filesystem.hpp>
-#ifdef DCPOMATIC_WINDOWS
-#include <boost/locale.hpp>
-#endif
-#include <glib.h>
-#include <openjpeg.h>
-#include <pangomm/init.h>
-#ifdef DCPOMATIC_IMAGE_MAGICK
-#include <magick/MagickCore.h>
-#else
-#include <magick/common.h>
-#include <magick/magick_config.h>
-#endif
-#include <magick/version.h>
-#include <dcp/version.h>
-#include <dcp/util.h>
-#include <dcp/signer.h>
-#include <dcp/raw_convert.h>
-extern "C" {
-#include <libavcodec/avcodec.h>
-#include <libavformat/avformat.h>
-#include <libswscale/swscale.h>
-#include <libavfilter/avfiltergraph.h>
-#include <libavutil/pixfmt.h>
-}
 #include "util.h"
 #include "exceptions.h"
 #include "scaler.h"
@@ -80,6 +40,46 @@ extern "C" {
 #ifdef DCPOMATIC_WINDOWS
 #include "stack.hpp"
 #endif
+#include <dcp/version.h>
+#include <dcp/util.h>
+#include <dcp/signer.h>
+#include <dcp/raw_convert.h>
+extern "C" {
+#include <libavcodec/avcodec.h>
+#include <libavformat/avformat.h>
+#include <libswscale/swscale.h>
+#include <libavfilter/avfiltergraph.h>
+#include <libavutil/pixfmt.h>
+}
+#include <glib.h>
+#include <openjpeg.h>
+#include <pangomm/init.h>
+#ifdef DCPOMATIC_IMAGE_MAGICK
+#include <magick/MagickCore.h>
+#else
+#include <magick/common.h>
+#include <magick/magick_config.h>
+#endif
+#include <magick/version.h>
+#include <libssh/libssh.h>
+#include <boost/algorithm/string.hpp>
+#include <boost/bind.hpp>
+#include <boost/lambda/lambda.hpp>
+#include <boost/thread.hpp>
+#include <boost/filesystem.hpp>
+#ifdef DCPOMATIC_WINDOWS
+#include <boost/locale.hpp>
+#endif
+#include <signal.h>
+#include <iomanip>
+#include <iostream>
+#include <fstream>
+#include <climits>
+#include <stdexcept>
+#ifdef DCPOMATIC_POSIX
+#include <execinfo.h>
+#include <cxxabi.h>
+#endif
 
 #include "i18n.h"
 

diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc
index ca0c687a791d9a1b15996cb0cf2f488b64d05a48..1fe02bae4551134e02a57873e2c1eb5ebd1dc3ed 100644 (file)
--- a/src/lib/video_content.cc
+++ b/src/lib/video_content.cc
@@ -17,10 +17,6 @@
 
 */
 
-#include <iomanip>
-#include <libcxml/cxml.h>
-#include <dcp/colour_matrix.h>
-#include <dcp/raw_convert.h>
 #include "video_content.h"
 #include "video_examiner.h"
 #include "compose.hpp"
@@ -33,6 +29,10 @@
 #include "frame_rate_change.h"
 #include "log.h"
 #include "safe_stringstream.h"
+#include <libcxml/cxml.h>
+#include <dcp/colour_matrix.h>
+#include <dcp/raw_convert.h>
+#include <iomanip>
 
 #include "i18n.h"
 

diff --git a/src/lib/video_content_scale.cc b/src/lib/video_content_scale.cc
index 418c46eecd121fbf1d4019f27ae1f752758d5105..9bb35189e1eeb050d1b39bf5aab6dedee74277de 100644 (file)
--- a/src/lib/video_content_scale.cc
+++ b/src/lib/video_content_scale.cc
@@ -17,13 +17,13 @@
 
 */
 
-#include <boost/optional.hpp>
-#include <libxml++/libxml++.h>
-#include <libcxml/cxml.h>
 #include "video_content_scale.h"
 #include "ratio.h"
 #include "safe_stringstream.h"
 #include "util.h"
+#include <libcxml/cxml.h>
+#include <libxml++/libxml++.h>
+#include <boost/optional.hpp>
 
 #include "i18n.h"
 

diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index 6262525c85d3a5777ead7a9dda416d7752622d52..11a4f9d0393cd2675c87782bdd30598c5e23a92a 100644 (file)
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -17,20 +17,6 @@
 
 */
 
-#include <fstream>
-#include <cerrno>
-#include <dcp/mono_picture_mxf.h>
-#include <dcp/stereo_picture_mxf.h>
-#include <dcp/sound_mxf.h>
-#include <dcp/sound_mxf_writer.h>
-#include <dcp/reel.h>
-#include <dcp/reel_mono_picture_asset.h>
-#include <dcp/reel_stereo_picture_asset.h>
-#include <dcp/reel_sound_asset.h>
-#include <dcp/reel_subtitle_asset.h>
-#include <dcp/dcp.h>
-#include <dcp/cpl.h>
-#include <dcp/signer.h>
 #include "writer.h"
 #include "compose.hpp"
 #include "film.h"
@@ -46,6 +32,20 @@
 #include "md5_digester.h"
 #include "encoded_data.h"
 #include "version.h"
+#include <dcp/mono_picture_mxf.h>
+#include <dcp/stereo_picture_mxf.h>
+#include <dcp/sound_mxf.h>
+#include <dcp/sound_mxf_writer.h>
+#include <dcp/reel.h>
+#include <dcp/reel_mono_picture_asset.h>
+#include <dcp/reel_stereo_picture_asset.h>
+#include <dcp/reel_sound_asset.h>
+#include <dcp/reel_subtitle_asset.h>
+#include <dcp/dcp.h>
+#include <dcp/cpl.h>
+#include <dcp/signer.h>
+#include <fstream>
+#include <cerrno>
 
 #include "i18n.h"