Support subs and tidy up a few things.

[dcpomatic.git] / src / wx / content_colour_conversion_dialog.cc

diff --git a/src/wx/content_colour_conversion_dialog.cc b/src/wx/content_colour_conversion_dialog.cc
index 100d766f2d50a91579a77604898529645d365a20..b970618a7b973126311be88ce30ab4392c5dcf6a 100644 (file)
--- a/src/wx/content_colour_conversion_dialog.cc
+++ b/src/wx/content_colour_conversion_dialog.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,31 +18,34 @@
 
 */
 
+
+#include "check_box.h"
+#include "colour_conversion_editor.h"
+#include "content_colour_conversion_dialog.h"
+#include "wx_util.h"
 #include "lib/colour_conversion.h"
 #include "lib/config.h"
 #include "lib/util.h"
-#include "wx_util.h"
-#include "content_colour_conversion_dialog.h"
-#include "colour_conversion_editor.h"
 #include <wx/statline.h>
-#include <boost/foreach.hpp>
 #include <iostream>
 
+
+using std::cout;
 using std::string;
 using std::vector;
-using std::cout;
 using boost::optional;
 
+
 ContentColourConversionDialog::ContentColourConversionDialog (wxWindow* parent, bool yuv)
        : wxDialog (parent, wxID_ANY, _("Colour conversion"))
-       , _editor (new ColourConversionEditor (this, yuv))
+       , _editor (new ColourConversionEditor(this, yuv))
        , _setting (false)
 {
-       wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
+       auto overall_sizer = new wxBoxSizer (wxVERTICAL);
        SetSizer (overall_sizer);
 
-       wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_Y_GAP - 2, DCPOMATIC_SIZER_X_GAP);
-       _preset_check = new wxCheckBox (this, wxID_ANY, _("Use preset"));
+       auto table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_Y_GAP - 2, DCPOMATIC_SIZER_X_GAP);
+       _preset_check = new CheckBox (this, _("Use preset"));
        table->Add (_preset_check, 0, wxALIGN_CENTER_VERTICAL);
        _preset_choice = new wxChoice (this, wxID_ANY);
        table->Add (_preset_choice);
@@ -51,7 +54,7 @@ ContentColourConversionDialog::ContentColourConversionDialog (wxWindow* parent,
        overall_sizer->Add (new wxStaticLine (this, wxID_ANY), 0, wxEXPAND);
        overall_sizer->Add (_editor);
 
-       wxSizer* buttons = CreateSeparatedButtonSizer (wxOK | wxCANCEL);
+       auto buttons = CreateSeparatedButtonSizer (wxOK | wxCANCEL);
        if (buttons) {
                overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
        }
@@ -64,17 +67,19 @@ ContentColourConversionDialog::ContentColourConversionDialog (wxWindow* parent,
 
        _editor_connection = _editor->Changed.connect (boost::bind (&ContentColourConversionDialog::check_for_preset, this));
 
-       BOOST_FOREACH (PresetColourConversion const &i, PresetColourConversion::all ()) {
+       for (auto const& i: PresetColourConversion::all ()) {
                _preset_choice->Append (std_to_wx (i.name));
        }
 }
 
+
 ColourConversion
 ContentColourConversionDialog::get () const
 {
        return _editor->get ();
 }
 
+
 void
 ContentColourConversionDialog::set (ColourConversion c)
 {
@@ -85,6 +90,7 @@ ContentColourConversionDialog::set (ColourConversion c)
        check_for_preset ();
 }
 
+
 void
 ContentColourConversionDialog::check_for_preset ()
 {
@@ -92,7 +98,7 @@ ContentColourConversionDialog::check_for_preset ()
                return;
        }
 
-       optional<size_t> preset = _editor->get().preset ();
+       auto preset = _editor->get().preset ();
 
        _preset_check->SetValue (static_cast<bool>(preset));
        _preset_choice->Enable (static_cast<bool>(preset));
@@ -103,6 +109,7 @@ ContentColourConversionDialog::check_for_preset ()
        }
 }
 
+
 void
 ContentColourConversionDialog::preset_check_clicked ()
 {
@@ -115,10 +122,11 @@ ContentColourConversionDialog::preset_check_clicked ()
        }
 }
 
+
 void
 ContentColourConversionDialog::preset_choice_changed ()
 {
-       vector<PresetColourConversion> presets = PresetColourConversion::all ();
+       auto presets = PresetColourConversion::all ();
        int const s = _preset_choice->GetCurrentSelection();
        if (s != -1) {
                set (presets[s].conversion);