ignore loadsa warnings.

diff --git a/src/tools/dcpomatic_batch.cc b/src/tools/dcpomatic_batch.cc
index ef8816708bbdd4017ef267c5c490fe00a889a2eb..e9c93f030c3115de9df5b608576bfa539890a4fc 100644 (file)
--- a/src/tools/dcpomatic_batch.cc
+++ b/src/tools/dcpomatic_batch.cc
@@ -36,11 +36,14 @@
 #include "lib/transcode_job.h"
 #include "lib/util.h"
 #include "lib/version.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/aboutdlg.h>
 #include <wx/cmdline.h>
 #include <wx/preferences.h>
 #include <wx/splash.h>
 #include <wx/stdpaths.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <wx/wx.h>
 #include <iostream>
 #include <set>

diff --git a/src/tools/dcpomatic_disk.cc b/src/tools/dcpomatic_disk.cc
index 1907a604522149e1b642ee84022d4ef2fea6ccb2..8d6b5df8c608e22232e889e2e320045f984d88a4 100644 (file)
--- a/src/tools/dcpomatic_disk.cc
+++ b/src/tools/dcpomatic_disk.cc
@@ -38,9 +38,9 @@
 #include "lib/util.h"
 #include "lib/version.h"
 #include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/cmdline.h>
 #include <wx/wx.h>
-DCPOMATIC_DISABLE_WARNINGS
 #include <boost/process.hpp>
 DCPOMATIC_ENABLE_WARNINGS
 #ifdef DCPOMATIC_WINDOWS

diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc
index 4d4531eeed035a9c94f04f0187a24b82c354b5c5..1ab83a23079436e9d9323a84aadc65f18f3f4414 100644 (file)
--- a/src/tools/dcpomatic_player.cc
+++ b/src/tools/dcpomatic_player.cc
@@ -57,11 +57,13 @@
 #include "lib/util.h"
 #include "lib/verify_dcp_job.h"
 #include "lib/video_content.h"
+#include "lib/warnings.h"
 #include <dcp/cpl.h>
 #include <dcp/dcp.h>
 #include <dcp/raw_convert.h>
 #include <dcp/exceptions.h>
 #include <dcp/search.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/cmdline.h>
 #include <wx/display.h>
 #include <wx/preferences.h>
@@ -69,6 +71,7 @@
 #include <wx/splash.h>
 #include <wx/stdpaths.h>
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #ifdef __WXGTK__
 #include <X11/Xlib.h>
 #endif

diff --git a/src/tools/dcpomatic_playlist.cc b/src/tools/dcpomatic_playlist.cc
index dbc5e81ddf673b445876b42863260daddfdd936e..36432818214dfa7bab40ccfdc8f5d03b04ed8e71 100644 (file)
--- a/src/tools/dcpomatic_playlist.cc
+++ b/src/tools/dcpomatic_playlist.cc
@@ -32,11 +32,14 @@
 #include "lib/spl.h"
 #include "lib/spl_entry.h"
 #include "lib/util.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
 #include <wx/listctrl.h>
 #include <wx/imaglist.h>
 #include <wx/spinctrl.h>
 #include <wx/preferences.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 
 using std::cout;

diff --git a/src/wx/audio_plot.cc b/src/wx/audio_plot.cc
index e08e07e0505bb3f6ba4d246c5a4d39f72dd6c364..0e9e815e1cce07d83c095a8be90a6ba9f864cf94 100644 (file)
--- a/src/wx/audio_plot.cc
+++ b/src/wx/audio_plot.cc
@@ -26,13 +26,14 @@
 #include "lib/audio_analysis.h"
 #include "lib/compose.hpp"
 #include "lib/maths_util.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/graphics.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/bind/bind.hpp>
 #include <cfloat>
-#include <iostream>
 
 
-using std::cout;
 using std::list;
 using std::map;
 using std::max;

diff --git a/src/wx/check_box.h b/src/wx/check_box.h
index 5176cd2e8cce4d3245e58a2d13eb3ce8aa1f4fe2..65952040aba803bc32a02a82beec353faa08f769 100644 (file)
--- a/src/wx/check_box.h
+++ b/src/wx/check_box.h
@@ -24,7 +24,10 @@
 
 
 #include "i18n_hook.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 
 class CheckBox : public wxCheckBox, public I18NHook

diff --git a/src/wx/confirm_kdm_email_dialog.h b/src/wx/confirm_kdm_email_dialog.h
index 311cb08ea6dbddcd8a171e4f5bbf417011d893eb..7b4ff41975a1e86b05cdc4f3afcbcdf73686e99c 100644 (file)
--- a/src/wx/confirm_kdm_email_dialog.h
+++ b/src/wx/confirm_kdm_email_dialog.h
@@ -19,7 +19,10 @@
 */
 
 #include "question_dialog.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <list>
 
 class ConfirmKDMEmailDialog : public QuestionDialog

diff --git a/src/wx/content_colour_conversion_dialog.cc b/src/wx/content_colour_conversion_dialog.cc
index b970618a7b973126311be88ce30ab4392c5dcf6a..ca625f0f2c13fd5791435fb919be9aeb46b16929 100644 (file)
--- a/src/wx/content_colour_conversion_dialog.cc
+++ b/src/wx/content_colour_conversion_dialog.cc
@@ -26,11 +26,12 @@
 #include "lib/colour_conversion.h"
 #include "lib/config.h"
 #include "lib/util.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/statline.h>
-#include <iostream>
+DCPOMATIC_ENABLE_WARNINGS
 
 
-using std::cout;
 using std::string;
 using std::vector;
 using boost::optional;

diff --git a/src/wx/content_colour_conversion_dialog.h b/src/wx/content_colour_conversion_dialog.h
index d0fb74823e97bc518e3e35bcdfbc06001f25b791..ec9d374b7e7b70f937e28bbf7f023edc7b34a5e0 100644 (file)
--- a/src/wx/content_colour_conversion_dialog.h
+++ b/src/wx/content_colour_conversion_dialog.h
@@ -20,7 +20,10 @@
 
 
 #include "lib/colour_conversion.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
 
 

diff --git a/src/wx/content_menu.cc b/src/wx/content_menu.cc
index 137ef97dca981f1b4081ad0163225ec914c7568d..4faa53e2442874d8ada6fca69b2a279310bac975 100644 (file)
--- a/src/wx/content_menu.cc
+++ b/src/wx/content_menu.cc
@@ -19,32 +19,35 @@
 */
 
 
+#include "content_advanced_dialog.h"
 #include "content_menu.h"
+#include "content_properties_dialog.h"
 #include "repeat_dialog.h"
-#include "wx_util.h"
-#include "timeline_video_content_view.h"
 #include "timeline_audio_content_view.h"
-#include "content_properties_dialog.h"
-#include "content_advanced_dialog.h"
-#include "lib/playlist.h"
-#include "lib/film.h"
-#include "lib/image_content.h"
+#include "timeline_video_content_view.h"
+#include "wx_util.h"
+#include "lib/audio_content.h"
+#include "lib/config.h"
 #include "lib/content_factory.h"
-#include "lib/examine_content_job.h"
-#include "lib/job_manager.h"
-#include "lib/exceptions.h"
+#include "lib/copy_dcp_details_to_film.h"
 #include "lib/dcp_content.h"
 #include "lib/dcp_examiner.h"
+#include "lib/examine_content_job.h"
+#include "lib/exceptions.h"
 #include "lib/ffmpeg_content.h"
-#include "lib/audio_content.h"
-#include "lib/config.h"
-#include "lib/copy_dcp_details_to_film.h"
+#include "lib/film.h"
+#include "lib/image_content.h"
+#include "lib/job_manager.h"
+#include "lib/playlist.h"
+#include "lib/warnings.h"
 #include <dcp/cpl.h>
-#include <dcp/exceptions.h>
 #include <dcp/decrypted_kdm.h>
+#include <dcp/exceptions.h>
 #include <dcp/search.h>
-#include <wx/wx.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/dirdlg.h>
+#include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <iostream>
 
 

diff --git a/src/wx/content_menu.h b/src/wx/content_menu.h
index 8a3548419aac8d7a9f5067b4a834004fb772f6b8..3fed75747b13e8d31ef7e4390268c87cd5d4c4ef 100644 (file)
--- a/src/wx/content_menu.h
+++ b/src/wx/content_menu.h
@@ -23,7 +23,10 @@
 
 #include "timeline_content_view.h"
 #include "lib/types.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <memory>
 
 class Film;

diff --git a/src/wx/content_view.cc b/src/wx/content_view.cc
index 8055e2f2d2fb2f043c147984bf30ecd99dd542ec..a020f81486f458fbad053f1b541727555cb997c4 100644 (file)
--- a/src/wx/content_view.cc
+++ b/src/wx/content_view.cc
@@ -21,17 +21,20 @@
 
 #include "content_view.h"
 #include "wx_util.h"
-#include "lib/dcpomatic_assert.h"
 #include "lib/config.h"
-#include "lib/dcp_content.h"
 #include "lib/content_factory.h"
+#include "lib/cross.h"
+#include "lib/dcp_content.h"
+#include "lib/dcpomatic_assert.h"
 #include "lib/examine_content_job.h"
 #include "lib/job_manager.h"
-#include "lib/cross.h"
+#include "lib/warnings.h"
 #include <dcp/exceptions.h>
 #include <boost/filesystem.hpp>
 #include <boost/optional.hpp>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/progdlg.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 
 using std::cout;

diff --git a/src/wx/content_widget.h b/src/wx/content_widget.h
index 34755e4b5a7e1707b710f45487bc9cdf4934dfd3..871781c65cd75ce58f2558c1c5b6f746a9ebeac4 100644 (file)
--- a/src/wx/content_widget.h
+++ b/src/wx/content_widget.h
@@ -27,9 +27,12 @@
 
 #include "wx_util.h"
 #include "lib/content.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
 #include <wx/gbsizer.h>
 #include <wx/spinctrl.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <vector>
 
 /** @class ContentWidget

diff --git a/src/wx/controls.cc b/src/wx/controls.cc
index a90ac79b40e5b89ab706a55a9e0a1a3ecb4b368d..91a67be51ddb5135f6848e62b992a26e189a7800 100644 (file)
--- a/src/wx/controls.cc
+++ b/src/wx/controls.cc
@@ -35,14 +35,17 @@
 #include "lib/job.h"
 #include "lib/job_manager.h"
 #include "lib/player_video.h"
+#include "lib/warnings.h"
 #include <dcp/dcp.h>
 #include <dcp/cpl.h>
 #include <dcp/reel.h>
 #include <dcp/reel_picture_asset.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
 #include <wx/tglbtn.h>
 #include <wx/listctrl.h>
 #include <wx/progdlg.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 
 using std::string;

diff --git a/src/wx/dcp_panel.cc b/src/wx/dcp_panel.cc
index 61dfd7507d4c2ddcd47d63413ab7a495a36efbba..d84b04eba2b8ad08aeaf27275d5dded6ad2c627b 100644 (file)
--- a/src/wx/dcp_panel.cc
+++ b/src/wx/dcp_panel.cc
@@ -32,22 +32,25 @@
 #include "smpte_metadata_dialog.h"
 #include "static_text.h"
 #include "wx_util.h"
-#include "lib/ratio.h"
+#include "lib/audio_content.h"
+#include "lib/audio_processor.h"
 #include "lib/config.h"
+#include "lib/dcp_content.h"
 #include "lib/dcp_content_type.h"
-#include "lib/util.h"
-#include "lib/film.h"
 #include "lib/ffmpeg_content.h"
-#include "lib/audio_processor.h"
-#include "lib/video_content.h"
+#include "lib/film.h"
+#include "lib/ratio.h"
 #include "lib/text_content.h"
-#include "lib/dcp_content.h"
-#include "lib/audio_content.h"
+#include "lib/util.h"
+#include "lib/video_content.h"
+#include "lib/warnings.h"
 #include <dcp/locale_convert.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
 #include <wx/notebook.h>
 #include <wx/gbsizer.h>
 #include <wx/spinctrl.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/lexical_cast.hpp>
 #include <iostream>
 

diff --git a/src/wx/dcpomatic_button.h b/src/wx/dcpomatic_button.h
index aba41b12562908ecadc3bda3a283183e7ec1ddb8..854d2a787b86a15475de46bb50c1c74a15efa096 100644 (file)
--- a/src/wx/dcpomatic_button.h
+++ b/src/wx/dcpomatic_button.h
@@ -22,7 +22,10 @@
 #define DCPOMATIC_BUTTON_H
 
 #include "i18n_hook.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/button.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 class Button : public wxButton, public I18NHook
 {

diff --git a/src/wx/dcpomatic_spin_ctrl.cc b/src/wx/dcpomatic_spin_ctrl.cc
index a050704104ee74e3a331d21a862ace98e4901daf..7e001ac4ff634835035105b811511318d995612e 100644 (file)
--- a/src/wx/dcpomatic_spin_ctrl.cc
+++ b/src/wx/dcpomatic_spin_ctrl.cc
@@ -20,9 +20,12 @@
 
 
 #include "dcpomatic_spin_ctrl.h"
+#include "lib/warnings.h"
 #include <boost/bind/bind.hpp>
 #include <boost/version.hpp>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;

diff --git a/src/wx/dkdm_dialog.h b/src/wx/dkdm_dialog.h
index 7b20e88ec000f2bd523debc6d4e2feb37f9dd3c9..6d0787e04af2b8d2c0367e455b4c1a035d236e9d 100644 (file)
--- a/src/wx/dkdm_dialog.h
+++ b/src/wx/dkdm_dialog.h
@@ -19,8 +19,11 @@
 */
 
 
+#include "lib/warnings.h"
 #include "wx_util.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <map>
 
 

diff --git a/src/wx/editable_list.h b/src/wx/editable_list.h
index 3f2ea0ca2fe0afad40f7a1e2b5512e6c817282ac..c194d473ae8bfaf442c67d383b9d63f8cd49e17d 100644 (file)
--- a/src/wx/editable_list.h
+++ b/src/wx/editable_list.h
@@ -23,8 +23,11 @@
 
 #include "wx_util.h"
 #include "dcpomatic_button.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
 #include <wx/listctrl.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <vector>
 
 class EditableListColumn

diff --git a/src/wx/fonts_dialog.cc b/src/wx/fonts_dialog.cc
index d5e0aacbea0a01bc7fb5f43710b76c70f8a339c9..31a7c4203ac546b7caf9c7c5d06ec3324e96f913 100644 (file)
--- a/src/wx/fonts_dialog.cc
+++ b/src/wx/fonts_dialog.cc
@@ -26,7 +26,10 @@
 #include "lib/font.h"
 #include "lib/content.h"
 #include "lib/text_content.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <iostream>
 #include <memory>
 

diff --git a/src/wx/job_view.cc b/src/wx/job_view.cc
index 06d10401f578c23a980fc92279aceea1d380930b..64083a3e1a758a32730b418ca544c96fcc911407 100644 (file)
--- a/src/wx/job_view.cc
+++ b/src/wx/job_view.cc
@@ -19,20 +19,23 @@
 */
 
 
+#include "check_box.h"
+#include "dcpomatic_button.h"
 #include "job_view.h"
-#include "wx_util.h"
 #include "message_dialog.h"
 #include "static_text.h"
-#include "check_box.h"
-#include "dcpomatic_button.h"
-#include "lib/job.h"
-#include "lib/job_manager.h"
+#include "wx_util.h"
+#include "lib/analyse_audio_job.h"
 #include "lib/compose.hpp"
 #include "lib/config.h"
+#include "lib/job.h"
+#include "lib/job_manager.h"
 #include "lib/send_notification_email_job.h"
 #include "lib/transcode_job.h"
-#include "lib/analyse_audio_job.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/algorithm/string.hpp>
 
 

diff --git a/src/wx/kdm_advanced_dialog.cc b/src/wx/kdm_advanced_dialog.cc
index f5ed88b41c80afef5d4030cd65b0ded5f61b57b9..eef7b9da6f1247dcef9e38c17f58c4b1f2016e8e 100644 (file)
--- a/src/wx/kdm_advanced_dialog.cc
+++ b/src/wx/kdm_advanced_dialog.cc
@@ -18,13 +18,19 @@
 
 */
 
-#include "kdm_advanced_dialog.h"
+
 #include "check_box.h"
+#include "kdm_advanced_dialog.h"
 #include "wx_util.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/spinctrl.h>
+DCPOMATIC_ENABLE_WARNINGS
+
 
 using boost::optional;
 
+
 KDMAdvancedDialog::KDMAdvancedDialog (wxWindow* parent, bool forensic_mark_video, bool forensic_mark_audio, optional<int> forensic_mark_audio_up_to)
        : TableDialog (parent, _("Advanced KDM options"), 2, 1, false)
 {
@@ -62,28 +68,32 @@ KDMAdvancedDialog::KDMAdvancedDialog (wxWindow* parent, bool forensic_mark_video
        _forensic_mark_some_audio->Bind (wxEVT_RADIOBUTTON, boost::bind(&KDMAdvancedDialog::setup_sensitivity, this));
 }
 
+
 bool
 KDMAdvancedDialog::forensic_mark_video () const
 {
        return _forensic_mark_video->GetValue ();
 }
 
+
 bool
 KDMAdvancedDialog::forensic_mark_audio () const
 {
        return _forensic_mark_audio->GetValue ();
 }
 
+
 optional<int>
 KDMAdvancedDialog::forensic_mark_audio_up_to () const
 {
        if (!_forensic_mark_some_audio->GetValue()) {
-               return optional<int>();
+               return {};
        }
 
        return _forensic_mark_audio_up_to->GetValue();
 }
 
+
 void
 KDMAdvancedDialog::setup_sensitivity ()
 {

diff --git a/src/wx/kdm_choice.h b/src/wx/kdm_choice.h
index 109c552f087d3fc0468508cb9e663681aac06425..8b216924a23f04590fd08fe21c098175aa25be62 100644 (file)
--- a/src/wx/kdm_choice.h
+++ b/src/wx/kdm_choice.h
@@ -19,8 +19,11 @@
 */
 
 
+#include "lib/warnings.h"
 #include <dcp/types.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 
 class KDMChoice : public wxChoice

diff --git a/src/wx/kdm_dialog.cc b/src/wx/kdm_dialog.cc
index 9b6b0927c089bb32ab6b38e97d11a3db236692dc..bc0241d15ad05b4f94c94655799fb4d0e57d159e 100644 (file)
--- a/src/wx/kdm_dialog.cc
+++ b/src/wx/kdm_dialog.cc
@@ -34,10 +34,13 @@
 #include "lib/job_manager.h"
 #include "lib/config.h"
 #include "lib/cinema.h"
+#include "lib/warnings.h"
 #include <libcxml/cxml.h>
 #include <dcp/exceptions.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/treectrl.h>
 #include <wx/listctrl.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <iostream>
 
 

diff --git a/src/wx/language_tag_dialog.cc b/src/wx/language_tag_dialog.cc
index ca08996c681d01a5d2c47b24ecbfd9000948316b..91ac3512dfa96a1fb0d993d89e6cf53389a10a27 100644 (file)
--- a/src/wx/language_tag_dialog.cc
+++ b/src/wx/language_tag_dialog.cc
@@ -23,8 +23,11 @@
 #include "language_tag_dialog.h"
 #include "wx_util.h"
 #include "lib/config.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/listctrl.h>
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <dcp/language_tag.h>
 
 

diff --git a/src/wx/language_tag_widget.h b/src/wx/language_tag_widget.h
index 16c00e3a63cc1fc0186a37a10a1781456bd43def..422c97918c876df4a570f8794a461d23344aa53e 100644 (file)
--- a/src/wx/language_tag_widget.h
+++ b/src/wx/language_tag_widget.h
@@ -19,8 +19,11 @@
 */
 
 
+#include "lib/warnings.h"
 #include <dcp/language_tag.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
 
 

diff --git a/src/wx/move_to_dialog.cc b/src/wx/move_to_dialog.cc
index fdd118520999b50a67367d9f637ec6180aefe24f..db62297119ce28b7794552d295c781292de3d15a 100644 (file)
--- a/src/wx/move_to_dialog.cc
+++ b/src/wx/move_to_dialog.cc
@@ -21,7 +21,10 @@
 
 #include "move_to_dialog.h"
 #include "lib/film.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/spinctrl.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 
 using std::list;

diff --git a/src/wx/normal_job_view.cc b/src/wx/normal_job_view.cc
index 6d2b7e9f207b3386e3a2633be4aa4b3bc6d1b609..9d29efd578a8f313e28412e3b7e030dc7d624002 100644 (file)
--- a/src/wx/normal_job_view.cc
+++ b/src/wx/normal_job_view.cc
@@ -19,10 +19,13 @@
 */
 
 
-#include "normal_job_view.h"
 #include "dcpomatic_button.h"
+#include "normal_job_view.h"
 #include "lib/job.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 
 using std::shared_ptr;

diff --git a/src/wx/player_stress_tester.cc b/src/wx/player_stress_tester.cc
index 6dd2dd67473451f5bdcbb45f1f2fd03c0ea4a076..4101a8239ef628fcf90962258bebdd114d85061a 100644 (file)
--- a/src/wx/player_stress_tester.cc
+++ b/src/wx/player_stress_tester.cc
@@ -18,11 +18,14 @@
 
 */
 
-#include "player_stress_tester.h"
 #include "controls.h"
+#include "player_stress_tester.h"
+#include "lib/warnings.h"
 #include <dcp/raw_convert.h>
 #include <dcp/util.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/algorithm/string.hpp>
 #include <boost/bind/bind.hpp>
 #include <string>

diff --git a/src/wx/rating_dialog.cc b/src/wx/rating_dialog.cc
index 9f64c2c660fdec32dbd26163d7ee1a6059f20417..e0a18e9af2005139018aa3a452a6674ac27efc2c 100644 (file)
--- a/src/wx/rating_dialog.cc
+++ b/src/wx/rating_dialog.cc
@@ -22,11 +22,13 @@
 #include "dcpomatic_spin_ctrl.h"
 #include "rating_dialog.h"
 #include "wx_util.h"
+#include "lib/warnings.h"
 #include <unicode/unistr.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/listctrl.h>
 #include <wx/notebook.h>
 #include <wx/srchctrl.h>
-
+DCPOMATIC_ENABLE_WARNINGS
 
 using std::string;
 using std::vector;

diff --git a/src/wx/report_problem_dialog.cc b/src/wx/report_problem_dialog.cc
index 13ddb0539f31f86f50de4b9b67db73c04cda2c15..52c1e70bed2ae63c3124a17fdef366b9b175da38 100644 (file)
--- a/src/wx/report_problem_dialog.cc
+++ b/src/wx/report_problem_dialog.cc
@@ -26,7 +26,10 @@
 #include "lib/config.h"
 #include "lib/job_manager.h"
 #include "lib/send_problem_report_job.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/sizer.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 
 using std::make_shared;

diff --git a/src/wx/screen_dialog.h b/src/wx/screen_dialog.h
index fcb3fba5d651b00c6f1adb0c220cb24724efa051..7d315b5333286a9aebb1ab8e4258d501895616a6 100644 (file)
--- a/src/wx/screen_dialog.h
+++ b/src/wx/screen_dialog.h
@@ -21,8 +21,11 @@
 
 #include "editable_list.h"
 #include "lib/screen.h"
+#include "lib/warnings.h"
 #include <dcp/certificate.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/optional.hpp>
 
 

diff --git a/src/wx/send_i18n_dialog.cc b/src/wx/send_i18n_dialog.cc
index 05cd87d44281fdbd1d18900901348eded428b381..42883b29f2f5b25d1fbb08929da656ca0bfbaf1b 100644 (file)
--- a/src/wx/send_i18n_dialog.cc
+++ b/src/wx/send_i18n_dialog.cc
@@ -22,11 +22,14 @@
 #include "i18n_hook.h"
 #include "send_i18n_dialog.h"
 #include "wx_util.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/listctrl.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 
-using std::string;
 using std::map;
+using std::string;
 
 
 SendI18NDialog::SendI18NDialog (wxWindow* parent)

diff --git a/src/wx/send_i18n_dialog.h b/src/wx/send_i18n_dialog.h
index f8d2b53549e536821a752e3b2546634a5765c9e3..63ff40242d32ea49975a389f566581e2bd635ca0 100644 (file)
--- a/src/wx/send_i18n_dialog.h
+++ b/src/wx/send_i18n_dialog.h
@@ -19,7 +19,10 @@
 */
 
 #include "wx_util.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 class SendI18NDialog : public wxDialog
 {

diff --git a/src/wx/simple_video_view.cc b/src/wx/simple_video_view.cc
index 8d5cb95f864a960a0e37f015d85c26610640f9e6..c6a4f1e74816cd8ec7c43bc5774677206e70adf2 100644 (file)
--- a/src/wx/simple_video_view.cc
+++ b/src/wx/simple_video_view.cc
@@ -26,8 +26,11 @@
 #include "lib/butler.h"
 #include "lib/dcpomatic_log.h"
 #include "lib/image.h"
+#include "lib/warnings.h"
 #include <dcp/util.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/bind/bind.hpp>
 
 

diff --git a/src/wx/smpte_metadata_dialog.h b/src/wx/smpte_metadata_dialog.h
index d1a792a363239edadf8fb11fab1c6b171febbfd2..4f510c1fbe602f3a0cbc22e7bc4eea7d0db3fc00 100644 (file)
--- a/src/wx/smpte_metadata_dialog.h
+++ b/src/wx/smpte_metadata_dialog.h
@@ -24,9 +24,12 @@
 #include "metadata_dialog.h"
 #include "lib/film.h"
 #include "lib/weak_film.h"
+#include "lib/warnings.h"
 #include <dcp/language_tag.h>
 #include <dcp/types.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <vector>
 
 

diff --git a/src/wx/standard_controls.cc b/src/wx/standard_controls.cc
index 6196c1b5c29e10c39fcb55277a7e833116d7cf3c..cef06d29cf695c1af92e8e9e1255b2fc7ac2b2f0 100644 (file)
--- a/src/wx/standard_controls.cc
+++ b/src/wx/standard_controls.cc
@@ -21,8 +21,11 @@
 
 #include "film_viewer.h"
 #include "standard_controls.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/tglbtn.h>
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 
 using std::shared_ptr;

diff --git a/src/wx/static_text.h b/src/wx/static_text.h
index 325e1f6d807ffa1a0708c5281e813b7ea0cb9d0d..c99dd2cb12baf276ab8eb0f6c57a036267bdc219 100644 (file)
--- a/src/wx/static_text.h
+++ b/src/wx/static_text.h
@@ -19,7 +19,10 @@
 */
 
 #include "i18n_hook.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 class StaticText : public wxStaticText, public I18NHook
 {

diff --git a/src/wx/system_font_dialog.cc b/src/wx/system_font_dialog.cc
index df5b8e21b647a531ec2914592f0079876f4c0cdc..68722789e804ab5e7f8c7c876e3b0ac55fecb634 100644 (file)
--- a/src/wx/system_font_dialog.cc
+++ b/src/wx/system_font_dialog.cc
@@ -21,12 +21,13 @@
 
 #include "system_font_dialog.h"
 #include "wx_util.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/listctrl.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/filesystem.hpp>
-#include <iostream>
 
 
-using std::cout;
 using std::string;
 using boost::optional;
 

diff --git a/src/wx/templates_dialog.cc b/src/wx/templates_dialog.cc
index 259989d4761e945d74106f550f0ae04c47b62b4e..b4ce31e43ef1c998321cd0e58ecfa8861f6ced6e 100644 (file)
--- a/src/wx/templates_dialog.cc
+++ b/src/wx/templates_dialog.cc
@@ -24,7 +24,10 @@
 #include "rename_template_dialog.h"
 #include "dcpomatic_button.h"
 #include "lib/config.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 
 using std::string;

diff --git a/src/wx/time_picker.cc b/src/wx/time_picker.cc
index 966671be9ac100f8c876707a4ad8b8ff038068b3..fee1c5f2f85116579bf8649df98ed9915213703f 100644 (file)
--- a/src/wx/time_picker.cc
+++ b/src/wx/time_picker.cc
@@ -21,8 +21,11 @@
 #include "time_picker.h"
 #include "wx_util.h"
 #include "static_text.h"
+#include "lib/warnings.h"
 #include <dcp/locale_convert.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/spinctrl.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/bind/bind.hpp>
 #include <iomanip>
 

diff --git a/src/wx/timecode.h b/src/wx/timecode.h
index 84ef5cc1ba2bdae4da4af268d4728617d652eee6..529cc2943b4f03bbbae694dcdf993ed834ee553e 100644 (file)
--- a/src/wx/timecode.h
+++ b/src/wx/timecode.h
@@ -26,8 +26,11 @@
 #include "wx_util.h"
 #include "lib/dcpomatic_time.h"
 #include "lib/types.h"
+#include "lib/warnings.h"
 #include <dcp/raw_convert.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
 
 

diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc
index 359de9bf9f1b93d65e64e2045487ad120f6d6071..99a25ee9acfb2a4d42494299f7ac78a1c249b388 100644 (file)
--- a/src/wx/timeline.cc
+++ b/src/wx/timeline.cc
@@ -18,40 +18,45 @@
 
 */
 
+
+#include "content_panel.h"
 #include "film_editor.h"
+#include "film_viewer.h"
 #include "timeline.h"
-#include "timeline_time_axis_view.h"
-#include "timeline_reels_view.h"
-#include "timeline_labels_view.h"
-#include "timeline_video_content_view.h"
+#include "timeline_atmos_content_view.h"
 #include "timeline_audio_content_view.h"
+#include "timeline_labels_view.h"
+#include "timeline_reels_view.h"
 #include "timeline_text_content_view.h"
-#include "timeline_atmos_content_view.h"
-#include "content_panel.h"
+#include "timeline_time_axis_view.h"
+#include "timeline_video_content_view.h"
 #include "wx_util.h"
-#include "film_viewer.h"
+#include "lib/atmos_mxf_content.h"
+#include "lib/audio_content.h"
 #include "lib/film.h"
-#include "lib/playlist.h"
 #include "lib/image_content.h"
-#include "lib/timer.h"
-#include "lib/audio_content.h"
+#include "lib/playlist.h"
 #include "lib/text_content.h"
+#include "lib/timer.h"
 #include "lib/video_content.h"
-#include "lib/atmos_mxf_content.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/graphics.h>
-#include <list>
-#include <iterator>
+DCPOMATIC_ENABLE_WARNINGS
 #include <iostream>
+#include <iterator>
+#include <list>
 
-using std::list;
+
+using std::abs;
 using std::cout;
-using std::min;
+using std::dynamic_pointer_cast;
+using std::list;
+using std::make_shared;
 using std::max;
-using std::abs;
+using std::min;
 using std::shared_ptr;
 using std::weak_ptr;
-using std::dynamic_pointer_cast;
-using std::make_shared;
 using boost::bind;
 using boost::optional;
 using namespace dcpomatic;
@@ -59,10 +64,12 @@ using namespace dcpomatic;
 using namespace boost::placeholders;
 #endif
 
+
 /* 3 hours in 640 pixels */
 double const Timeline::_minimum_pixels_per_second = 640.0 / (60 * 60 * 3);
 int const Timeline::_minimum_pixels_per_track = 16;
 
+
 Timeline::Timeline (wxWindow* parent, ContentPanel* cp, shared_ptr<Film> film, weak_ptr<FilmViewer> viewer)
        : wxPanel (parent, wxID_ANY)
        , _labels_canvas (new wxScrolledCanvas (this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxFULL_REPAINT_ON_RESIZE))

diff --git a/src/wx/timeline_labels_view.cc b/src/wx/timeline_labels_view.cc
index 4450fef0552ec2dd4f60e4ef59f24370655b09df..b48f98a886b602c341656958d692725afc3fea40 100644 (file)
--- a/src/wx/timeline_labels_view.cc
+++ b/src/wx/timeline_labels_view.cc
@@ -21,8 +21,11 @@
 
 #include "timeline_labels_view.h"
 #include "timeline.h"
-#include <wx/wx.h>
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/graphics.h>
+#include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 
 using std::list;

diff --git a/src/wx/timeline_reels_view.cc b/src/wx/timeline_reels_view.cc
index cf1abb34f6b961f21fd6552ab66c6a4911e562d9..5344554f43aac11c98ee92181eeb666bb17f3e8a 100644 (file)
--- a/src/wx/timeline_reels_view.cc
+++ b/src/wx/timeline_reels_view.cc
@@ -21,8 +21,11 @@
 
 #include "timeline_reels_view.h"
 #include "timeline.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
 #include <wx/graphics.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 
 using std::min;

diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc
index ff249a7acd386a7f34b6c1258aecb88cae820bd7..74b2d22192925be9df1447d9ff77bbd80f5f1095 100644 (file)
--- a/src/wx/video_panel.cc
+++ b/src/wx/video_panel.cc
@@ -38,8 +38,11 @@
 #include "lib/ratio.h"
 #include "lib/util.h"
 #include "lib/video_content.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/spinctrl.h>
 #include <wx/tglbtn.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/functional/hash.hpp>
 #include <boost/unordered_set.hpp>
 #include <set>

diff --git a/src/wx/video_view.h b/src/wx/video_view.h
index 5353f213f8803e3e2a9865c6a0567610edf51fc9..2aa43055768319afb9ae9db6d31e8cc9f2ccda5d 100644 (file)
--- a/src/wx/video_view.h
+++ b/src/wx/video_view.h
@@ -28,7 +28,10 @@
 #include "lib/signaller.h"
 #include "lib/timer.h"
 #include "lib/types.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
 #include <boost/thread.hpp>
 

diff --git a/src/wx/video_waveform_plot.cc b/src/wx/video_waveform_plot.cc
index 07b2955b37d6d4da579ee227b1fa8bd5178b3aa1..4b17c2896c100cc1b3e96da1487dff960b6a7b56 100644 (file)
--- a/src/wx/video_waveform_plot.cc
+++ b/src/wx/video_waveform_plot.cc
@@ -26,10 +26,13 @@
 #include "lib/film.h"
 #include "lib/image.h"
 #include "lib/player_video.h"
+#include "lib/warnings.h"
 #include <dcp/locale_convert.h>
 #include <dcp/openjpeg_image.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/rawbmp.h>
 #include <wx/graphics.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/bind/bind.hpp>
 #include <iostream>