Merge branch 'dev' into favorites-gui

rtgui/colorappearance.h

@@ -70,7 +70,6 @@ public:
     bool adapCamComputed_ ();
     void ybCamChanged (int yb) override;
     bool ybCamComputed_ ();
-    void presetcat02pressed ();
     void curveChanged        (CurveEditor* ce) override;
     void curveMode1Changed   ();
     bool curveMode1Changed_  ();
@@ -108,7 +107,6 @@ public:
     void writeOptions (std::vector<int> &tpOpen);
 
 private:
-    rtengine::ProcEvent Evcatpreset;
     rtengine::ProcEvent EvCATAutotempout;
     rtengine::ProcEvent EvCATillum;
     rtengine::ProcEvent EvCATcomplex;
@@ -161,8 +159,6 @@ private:
     Gtk::CheckButton* tonecie;
     //  Gtk::CheckButton* sharpcie;
     Gtk::Button* neutral;
-    Gtk::CheckButton* presetcat02;
-    sigc::connection  presetcat02conn;
 
     MyComboBoxText* surrsrc;
     sigc::connection  surrsrcconn;
@@ -200,7 +196,6 @@ private:
     bool lastgamut;
     bool lastdatacie;
     bool lasttonecie;
-    bool lastpresetcat02;
     double nexttemp;
     double nextgreen;