X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilter_dialog.cc;h=517978c746b145040422f86706c25ae224bd848a;hb=151a21e155c77f50b7c06904a925e176e3cb482d;hp=a65f5153a2f95e9733619123997bc2d1180285bc;hpb=a5d004b0773f633401528392fc28e66d70e13ac8;p=dcpomatic.git

diff --git a/src/wx/filter_dialog.cc b/src/wx/filter_dialog.cc
index a65f5153a..517978c74 100644
--- a/src/wx/filter_dialog.cc
+++ b/src/wx/filter_dialog.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,10 +18,12 @@
 
 */
 
+
 /** @file  src/filter_dialog.cc
  *  @brief A dialog to select FFmpeg filters.
  */
 
+
 #include "check_box.h"
 #include "filter_dialog.h"
 #include "static_text.h"
@@ -34,57 +36,54 @@ using namespace std;
 using boost::bind;
 
 
-FilterDialog::FilterDialog (wxWindow* parent, vector<Filter const *> const & active)
+FilterDialog::FilterDialog(wxWindow* parent, vector<Filter> const& active)
 	: wxDialog (parent, wxID_ANY, wxString(_("Filters")))
 {
-	wxPanel* panel = new wxPanel (this);
-	wxBoxSizer* sizer = new wxBoxSizer (wxVERTICAL);
+	auto panel = new wxPanel (this);
+	auto sizer = new wxBoxSizer (wxVERTICAL);
 
-	vector<Filter const *> filters = Filter::all ();
+	auto filters = Filter::all ();
 
-	typedef map<string, list<Filter const *> > CategoryMap;
-	CategoryMap categories;
+	map<string, list<Filter>> categories;
 
 	for (auto i: filters) {
-		CategoryMap::iterator j = categories.find (i->category());
+		auto j = categories.find(i.category());
 		if (j == categories.end ()) {
-			list<Filter const *> c;
-			c.push_back (i);
-			categories[i->category()] = c;
+			categories[i.category()] = { i };
 		} else {
 			j->second.push_back (i);
 		}
 	}
 
-	for (CategoryMap::iterator i = categories.begin(); i != categories.end(); ++i) {
-
-		wxStaticText* c = new StaticText (panel, std_to_wx(i->first));
-		wxFont font = c->GetFont();
+	for (auto const& category: categories) {
+		auto c = new StaticText(panel, std_to_wx(category.first));
+		auto font = c->GetFont();
 		font.SetWeight(wxFONTWEIGHT_BOLD);
 		c->SetFont(font);
 		sizer->Add (c, 1, wxTOP | wxBOTTOM, DCPOMATIC_SIZER_GAP);
 
-		for (auto j: i->second) {
-			wxCheckBox* b = new CheckBox(panel, std_to_wx(j->name()));
-			bool const a = find (active.begin(), active.end(), j) != active.end();
+		for (auto const& filter: category.second) {
+			auto b = new CheckBox(panel, std_to_wx(filter.name()));
+			bool const a = find(active.begin(), active.end(), filter) != active.end();
 			b->SetValue (a);
-			_filters[j] = b;
-			b->Bind (wxEVT_CHECKBOX, boost::bind(&FilterDialog::filter_toggled, this));
+			_filters[filter] = b;
+			b->bind(&FilterDialog::filter_toggled, this);
 			sizer->Add (b);
 		}
 
 		sizer->AddSpacer (6);
 	}
 
-	wxSizer* buttons = CreateSeparatedButtonSizer (wxOK);
-	if (buttons) {
-		sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
-	}
-
 	panel->SetSizer (sizer);
 
-	wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
+	auto overall_sizer = new wxBoxSizer (wxVERTICAL);
 	overall_sizer->Add (panel, 1, wxTOP | wxLEFT | wxRIGHT, DCPOMATIC_SIZER_GAP);
+
+	auto buttons = CreateSeparatedButtonSizer(wxOK);
+	if (buttons) {
+		overall_sizer->Add(buttons, wxSizerFlags().Expand().DoubleBorder());
+	}
+
 	SetSizerAndFit (overall_sizer);
 }
 
@@ -96,13 +95,13 @@ FilterDialog::filter_toggled ()
 }
 
 
-vector<Filter const*>
+vector<Filter>
 FilterDialog::active () const
 {
-	vector<Filter const *> active;
-	for (map<Filter const *, wxCheckBox*>::const_iterator i = _filters.begin(); i != _filters.end(); ++i) {
-		if (i->second->IsChecked()) {
-			active.push_back(i->first);
+	vector<Filter> active;
+	for (auto const& i: _filters) {
+		if (i.second->IsChecked()) {
+			active.push_back(i.first);
 		}
 	}