diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-05-25 01:37:20 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-05-25 01:37:20 +0100 |
| commit | 5229b795b9d7cafe174496fbc6bca8d62f4a3ff0 (patch) | |
| tree | 0031aed06535e7a190f12bde5fe0a6dd66e87f6a /src/wx/content_colour_conversion_dialog.cc | |
| parent | 8041bb9729662176eeb8d78ce4dac9dfb6896557 (diff) | |
Remove user-configurable colour conversion presets.
Diffstat (limited to 'src/wx/content_colour_conversion_dialog.cc')
| -rw-r--r-- | src/wx/content_colour_conversion_dialog.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/wx/content_colour_conversion_dialog.cc b/src/wx/content_colour_conversion_dialog.cc index 500a168f5..b382c3429 100644 --- a/src/wx/content_colour_conversion_dialog.cc +++ b/src/wx/content_colour_conversion_dialog.cc @@ -17,13 +17,14 @@ */ -#include <wx/statline.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> using std::string; using std::vector; @@ -61,9 +62,8 @@ ContentColourConversionDialog::ContentColourConversionDialog (wxWindow* parent) _editor_connection = _editor->Changed.connect (boost::bind (&ContentColourConversionDialog::check_for_preset, this)); - vector<PresetColourConversion> presets = Config::instance()->colour_conversions (); - for (vector<PresetColourConversion>::const_iterator i = presets.begin(); i != presets.end(); ++i) { - _preset_choice->Append (std_to_wx (i->name)); + BOOST_FOREACH (PresetColourConversion const &i, PresetColourConversion::all ()) { + _preset_choice->Append (std_to_wx (i.name)); } } @@ -116,7 +116,7 @@ ContentColourConversionDialog::preset_check_clicked () void ContentColourConversionDialog::preset_choice_changed () { - vector<PresetColourConversion> presets = Config::instance()->colour_conversions (); + vector<PresetColourConversion> presets = PresetColourConversion::all (); int const s = _preset_choice->GetCurrentSelection(); if (s != -1) { set (presets[s].conversion); |
