Merge with dev - save provisory work

rtgui/paramsedited.h

@@ -365,7 +365,8 @@ public:
 };
 
 
-class FattalToneMappingParamsEdited {
+class FattalToneMappingParamsEdited
+{
 public:
     bool enabled;
     bool threshold;
@@ -454,6 +455,7 @@ public:
     bool lightness;
     bool contrast;
     bool chroma;
+    bool warm;
     bool expcomp;
     bool hlcompr;
     bool hlcomprthresh;
@@ -676,7 +678,6 @@ public:
     bool gamma;
     bool gampos;
     bool slpos;
-    bool gamfree;
     bool freegamma;
 };
 class WaveletParamsEdited
@@ -873,14 +874,14 @@ public:
     BayerSensor bayersensor;
     XTransSensor xtranssensor;
 
-    bool caCorrection;
-    bool caRed;
-    bool caBlue;
+    bool ca_autocorrect;
+    bool cared;
+    bool cablue;
     bool hotPixelFilter;
     bool deadPixelFilter;
-    bool hotDeadPixelThresh;
+    bool hotdeadpix_thresh;
     bool darkFrame;
-    bool dfAuto;
+    bool df_autoselect;
     bool ff_file;
     bool ff_AutoSelect;
     bool ff_BlurRadius;
@@ -944,13 +945,10 @@ public:
     bool                          exif;
     bool                          iptc;
 
-    explicit ParamsEdited (bool value = false);
+    explicit ParamsEdited(bool value = false);
 
-    void set   (bool v);
-    void initFrom (const std::vector<rtengine::procparams::ProcParams>& src);
-    void combine (rtengine::procparams::ProcParams& toEdit, const rtengine::procparams::ProcParams& mods, bool forceSet);
-
-    bool operator== (const ParamsEdited& other);
-    bool operator!= (const ParamsEdited& other);
+    void set(bool v);
+    void initFrom(const std::vector<rtengine::procparams::ProcParams>& src);
+    void combine(rtengine::procparams::ProcParams& toEdit, const rtengine::procparams::ProcParams& mods, bool forceSet);
 };
 #endif