Merge branch 'dev' into newlocallab

rtgui/myflatcurve.h

@@ -16,24 +16,16 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef _MYFLATCURVE_
-#define _MYFLATCURVE_
+#pragma once
+
+#include <vector>
 
 #include <gtkmm.h>
-#include <vector>
-#include "curvelistener.h"
-#include "cursormanager.h"
-#include "mycurve.h"
 
-// For compatibility and simplicity reason, order shouldn't change, and must be identical to the order specified in the curveType widget
-enum FlatCurveType {
-    FCT_Empty = -1,     // Also used for identity curves
-    FCT_Linear,         // 0
-    FCT_MinMaxCPoints,  // 1
-    //FCT_Parametric,   // 2
-    // Insert new curve type above this line
-    FCT_Unchanged       // Must remain the last of the enum
-};
+#include "cursormanager.h"
+#include "curvelistener.h"
+#include "mycurve.h"
+#include "../rtengine/flatcurvetypes.h"
 
 enum MouseOverAreas {
     FCT_Area_None       = 1 << 0,   // over a zone that don't have any
@@ -143,5 +135,3 @@ public:
 
     void updateLocallabBackground(double ref);
 };
-
-#endif