merge with dev

2019-11-14 14:07:04 +01:00
parent d621721ffe c2ed31991b
commit c58d2a1d75
113 changed files with 700 additions and 368 deletions
--- a/rtgui/wavelet.h
+++ b/rtgui/wavelet.h
@@ -22,15 +22,18 @@
 #include <gtkmm.h>
 #include "adjuster.h"
 #include "toolpanel.h"
-#include "curveeditor.h"
-#include "curveeditorgroup.h"
+#include "curvelistener.h"
 #include "thresholdadjuster.h"
 #include "colorprovider.h"
 #include "guiutils.h"

+class CurveEditor;
+class CurveEditorGroup;
+class DiagonalCurveEditor;
 class EditDataProvider;
+class FlatCurveEditor;

-class Wavelet :
+class Wavelet final :
    public ToolParamBlock,
    public ThresholdAdjusterListener,
    public AdjusterListener,