Merge branch 'dev' into spot-removal-tool

rtgui/curveeditor.h

@@ -16,20 +16,19 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef _CURVEEDITOR_
-#define _CURVEEDITOR_
+#pragma once
 
-#include "popuptogglebutton.h"
-#include "../rtengine/LUT.h"
 #include "coloredbar.h"
 #include "editcallbacks.h"
-#include "mydiagonalcurve.h"
-#include "myflatcurve.h"
+
+#include "../rtengine/diagonalcurvetypes.h"
+#include "../rtengine/flatcurvetypes.h"
+#include "../rtengine/LUT.h"
 #include "../rtengine/noncopyable.h"
 
 class CurveEditorGroup;
 class CurveEditorSubGroup;
-
+class PopUpToggleButton;
 
 /*
  *********************** Curve Editor ***********************
@@ -144,7 +143,7 @@ public:
  */
 
 
-class DiagonalCurveEditor : public CurveEditor
+class DiagonalCurveEditor final : public CurveEditor
 {
 
     friend class DiagonalCurveEditorSubGroup;
@@ -180,9 +179,8 @@ public:
  */
 
 
-class FlatCurveEditor : public CurveEditor
+class FlatCurveEditor final : public CurveEditor
 {
-
     friend class FlatCurveEditorSubGroup;
 
 protected:
@@ -207,5 +205,3 @@ public:
     // set the reset curve for a given curve type. This is optional; all curve type have a default reset curve
     void setResetCurve(FlatCurveType cType, const std::vector<double> &resetCurve);
 };
-
-#endif