C++11 tidying.

diff --git a/src/wx/config_dialog.h b/src/wx/config_dialog.h
index ce5df2c5b84b43badb59a4fbcee7cd77c8c3729f..eade690437e2b19456b8631ee7bd575f6ba8d593 100644 (file)
--- a/src/wx/config_dialog.h
+++ b/src/wx/config_dialog.h
@@ -18,36 +18,40 @@
 
 */
 
+
 #ifndef DCPOMATIC_CONFIG_DIALOG_H
 #define DCPOMATIC_CONFIG_DIALOG_H
 
-#include "wx_util.h"
+
 #include "editable_list.h"
 #include "make_chain_dialog.h"
+#include "wx_util.h"
 #include "lib/config.h"
-#include "lib/ratio.h"
-#include "lib/filter.h"
+#include "lib/cross.h"
 #include "lib/dcp_content_type.h"
+#include "lib/exceptions.h"
+#include "lib/filter.h"
 #include "lib/log.h"
+#include "lib/ratio.h"
 #include "lib/util.h"
-#include "lib/cross.h"
-#include "lib/exceptions.h"
 #include "lib/warnings.h"
-#include <dcp/locale_convert.h>
-#include <dcp/exceptions.h>
 #include <dcp/certificate_chain.h>
+#include <dcp/exceptions.h>
+#include <dcp/locale_convert.h>
 DCPOMATIC_DISABLE_WARNINGS
-#include <wx/stdpaths.h>
+#include <wx/filepicker.h>
 #include <wx/preferences.h>
 #include <wx/spinctrl.h>
-#include <wx/filepicker.h>
-DCPOMATIC_ENABLE_WARNINGS
+#include <wx/stdpaths.h>
 #include <RtAudio.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/filesystem.hpp>
 #include <iostream>
 
+
 class AudioMappingView;
 
+
 class Page : public wxPreferencesPage
 {
 public:
@@ -74,6 +78,7 @@ private:
        bool _window_exists;
 };
 
+
 class GeneralPage : public Page
 {
 public:
@@ -106,6 +111,7 @@ private:
        wxCheckBox* _check_for_test_updates;
 };
 
+
 class CertificateChainEditor : public wxDialog
 {
 public:
@@ -214,6 +220,7 @@ private:
        Button* _reset_to_default;
 };
 
+
 class LocationsPage : public Page
 {
 public:
@@ -236,4 +243,5 @@ private:
        wxDirPickerCtrl* _playlist_directory;
        wxDirPickerCtrl* _kdm_directory;
 };
+
 #endif

diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index 64ac885e37bdcbe73b0637332c8a2007c28534be..0569131ea300fedf58a6daa621a5fc5bf0fbd1f7 100644 (file)
--- a/src/wx/film_viewer.h
+++ b/src/wx/film_viewer.h
@@ -31,21 +31,21 @@
 #include "lib/timer.h"
 #include "lib/signaller.h"
 #include "lib/warnings.h"
-#include <RtAudio.h>
 DCPOMATIC_DISABLE_WARNINGS
+#include <RtAudio.h>
 #include <wx/wx.h>
 DCPOMATIC_ENABLE_WARNINGS
 #include <vector>
 
 
-class wxToggleButton;
+class Butler;
+class ClosedCaptionsDialog;
 class FFmpegPlayer;
 class Image;
-class RGBPlusAlphaImage;
-class PlayerVideo;
 class Player;
-class Butler;
-class ClosedCaptionsDialog;
+class PlayerVideo;
+class RGBPlusAlphaImage;
+class wxToggleButton;
 
 
 /** @class FilmViewer

diff --git a/src/wx/playlist_controls.h b/src/wx/playlist_controls.h
index 57a84c128671187e35ff07f24cc4e08a8905fca1..bc283f288db3936fa6dd5b740c5a52b4863571f8 100644 (file)
--- a/src/wx/playlist_controls.h
+++ b/src/wx/playlist_controls.h
@@ -18,11 +18,14 @@
 
 */
 
+
 #include "controls.h"
 #include "lib/spl.h"
 
+
 class DCPContent;
 
+
 class PlaylistControls : public Controls
 {
 public:

diff --git a/src/wx/playlist_editor_config_dialog.cc b/src/wx/playlist_editor_config_dialog.cc
index 63a28b5dd728771fb420fa32c69e8ce29610ca60..d5c4106eabb46eb0e5c4f377ec71fe162a9998e4 100644 (file)
--- a/src/wx/playlist_editor_config_dialog.cc
+++ b/src/wx/playlist_editor_config_dialog.cc
@@ -28,17 +28,17 @@
 wxPreferencesEditor*
 create_playlist_editor_config_dialog ()
 {
-       wxPreferencesEditor* e = new wxPreferencesEditor (_("DCP-o-matic Playlist Editor Preferences"));
+       auto e = new wxPreferencesEditor (_("DCP-o-matic Playlist Editor Preferences"));
 
 #ifdef DCPOMATIC_OSX
        /* Width that we force some of the config panels to be on OSX so that
           the containing window doesn't shrink too much when we select those panels.
           This is obviously an unpleasant hack.
        */
-       wxSize ps = wxSize (520, -1);
+       auto ps = wxSize (520, -1);
        int const border = 16;
 #else
-       wxSize ps = wxSize (-1, -1);
+       auto ps = wxSize (-1, -1);
        int const border = 8;
 #endif