Merge 1.0 in.

[dcpomatic.git] / src / wx / config_dialog.h

diff --git a/src/wx/config_dialog.h b/src/wx/config_dialog.h
index 60d9229c46ab63650c2ad6c5a4f909976f474bcc..82c4ee2a03b7a972f3796261dabc468046fe8848 100644 (file)
--- a/src/wx/config_dialog.h
+++ b/src/wx/config_dialog.h
@@ -31,8 +31,8 @@
 class DirPickerCtrl;
 class wxNotebook;
 class ServerDescription;
-class ColourConversion;
-class ColourConversionDialog;
+class PresetColourConversion;
+class PresetColourConversionDialog;
 class ServerDialog;
 
 /** @class ConfigDialog
@@ -71,7 +71,7 @@ private:
        wxNotebook* _notebook;
        wxPanel* _misc_panel;
        wxPanel* _tms_panel;
-       EditableList<ColourConversion, ColourConversionDialog>* _colour_conversions_panel;
+       EditableList<PresetColourConversion, PresetColourConversionDialog>* _colour_conversions_panel;
        EditableList<ServerDescription, ServerDialog>* _servers_panel;
        wxPanel* _metadata_panel;
        wxCheckBox* _set_language;