further reduction of include dependencies, also finalised some classes

rtengine/pipettebuffer.h

@@ -19,7 +19,6 @@
 #pragma once
 
 #include "array2D.h"
-#include "coord.h"
 #include "iimage.h"
 
 class EditDataProvider;

rtgui/batchqueue.cc

@@ -31,6 +31,7 @@
 #include "cachemanager.h"
 #include "thumbnail.h"
 #include "batchqueue.h"
+#include "batchqueueentry.h"
 #include "multilangmgr.h"
 #include "filecatalog.h"
 #include "batchqueuebuttonset.h"

rtgui/batchqueue.h

@@ -21,7 +21,6 @@
 
 #include <gtkmm.h>
 
-#include "batchqueueentry.h"
 #include "lwbutton.h"
 #include "lwbuttonset.h"
 #include "threadutils.h"
@@ -30,6 +29,8 @@
 #include "../rtengine/rtengine.h"
 #include "../rtengine/noncopyable.h"
 
+class BatchQueueEntry;
+
 class BatchQueueListener
 {
 

rtgui/batchqueuepanel.h

@@ -29,6 +29,7 @@
 class RTWindow;
 class FileCatalog;
 class Thumbnail;
+
 class BatchQueuePanel : public Gtk::VBox,
     public BatchQueueListener,
     public FormatChangeListener

rtgui/bayerpreprocess.h

@@ -23,7 +23,7 @@
 #include "adjuster.h"
 #include "toolpanel.h"
 
-class BayerPreProcess : public ToolParamBlock, public AdjusterListener, public FoldableToolPanel
+class BayerPreProcess final : public ToolParamBlock, public AdjusterListener, public FoldableToolPanel
 {
 
 protected:

rtgui/bayerprocess.h

@@ -25,7 +25,7 @@
 #include "guiutils.h"
 #include "toolpanel.h"
 
-class BayerProcess :
+class BayerProcess final :
     public ToolParamBlock,
     public AdjusterListener,
     public CheckBoxListener,

rtgui/bayerrawexposure.h

@@ -24,7 +24,7 @@
 #include "checkbox.h"
 #include "toolpanel.h"
 
-class BayerRAWExposure :
+class BayerRAWExposure final :
     public ToolParamBlock,
     public AdjusterListener,
     public CheckBoxListener,

rtgui/blackwhite.cc

@@ -21,6 +21,8 @@
 
 #include "blackwhite.h"
 
+#include "curveeditor.h"
+#include "curveeditorgroup.h"
 #include "guiutils.h"
 #include "rtimage.h"
 #include "options.h"

rtgui/blackwhite.h

@@ -22,13 +22,14 @@
 
 #include "adjuster.h"
 #include "colorprovider.h"
-#include "curveeditor.h"
+#include "curvelistener.h"
-#include "curveeditorgroup.h"
 #include "guiutils.h"
-#include "mycurve.h"
 #include "toolpanel.h"
 
+class DiagonalCurveEditor;
+class CurveEditorGroup;
 class EditDataProvider;
+class FlatCurveEditor;
 
 class BlackWhite final :
     public ToolParamBlock,

rtgui/cacorrection.h

@@ -23,7 +23,7 @@
 #include "adjuster.h"
 #include "toolpanel.h"
 
-class CACorrection :
+class CACorrection final:
     public ToolParamBlock,
     public AdjusterListener,
     public FoldableToolPanel

rtgui/chmixer.h

@@ -23,7 +23,7 @@
 #include "adjuster.h"
 #include "toolpanel.h"
 
-class ChMixer :
+class ChMixer final:
     public ToolParamBlock,
     public AdjusterListener,
     public FoldableToolPanel

rtgui/coarsepanel.h

@@ -22,7 +22,7 @@
 
 #include "toolpanel.h"
 
-class CoarsePanel :
+class CoarsePanel final :
     public Gtk::HBox,
     public ToolPanel
 {

rtgui/colorappearance.cc

@@ -20,6 +20,8 @@
 
 #include "colorappearance.h"
 
+#include "curveeditor.h"
+#include "curveeditorgroup.h"
 #include "guiutils.h"
 #include "options.h"
 #include "rtimage.h"

rtgui/colorappearance.h

@@ -22,11 +22,14 @@
 
 #include "adjuster.h"
 #include "colorprovider.h"
-#include "curveeditor.h"
+#include "curvelistener.h"
-#include "curveeditorgroup.h"
 #include "guiutils.h"
 #include "toolpanel.h"
 
+class DiagonalCurveEditor;
+class CurveEditorGroup;
+class CurveEditor;
+
 class ColorAppearance final :
     public ToolParamBlock,
     public AdjusterListener,

rtgui/colortoning.cc

@@ -2,6 +2,8 @@
  *  This file is part of RawTherapee.
  */
 #include "colortoning.h"
+#include "curveeditor.h"
+#include "curveeditorgroup.h"
 #include "mycurve.h"
 #include "rtimage.h"
 #include "eventmapper.h"

rtgui/colortoning.h

@@ -7,15 +7,19 @@
 
 #include "adjuster.h"
 #include "colorprovider.h"
-#include "curveeditor.h"
+#include "curvelistener.h"
-#include "curveeditorgroup.h"
 #include "guiutils.h"
-#include "labgrid.h"
 #include "thresholdadjuster.h"
 #include "toolpanel.h"
 
 #include "../rtengine/procparams.h"
 
+class CurveEditor;
+class CurveEditorGroup;
+class DiagonalCurveEditor;
+class FlatCurveEditor;
+class LabGrid;
+
 class ColorToning final :
     public ToolParamBlock,
     public FoldableToolPanel,

rtgui/curveeditor.cc

@@ -21,6 +21,7 @@
 #include <string>
 #include "guiutils.h"
 #include "multilangmgr.h"
+#include "popuptogglebutton.h"
 #include "../rtengine/LUT.h"
 
 #include <cstring>

rtgui/curveeditor.h

@@ -20,7 +20,6 @@
 
 #include "coloredbar.h"
 #include "editcallbacks.h"
-#include "popuptogglebutton.h"
 
 #include "../rtengine/diagonalcurvetypes.h"
 #include "../rtengine/flatcurvetypes.h"
@@ -29,6 +28,7 @@
 
 class CurveEditorGroup;
 class CurveEditorSubGroup;
+class PopUpToggleButton;
 
 /*
  *********************** Curve Editor ***********************
@@ -143,7 +143,7 @@ public:
  */
 
 
-class DiagonalCurveEditor : public CurveEditor
+class DiagonalCurveEditor final : public CurveEditor
 {
 
     friend class DiagonalCurveEditorSubGroup;
@@ -179,7 +179,7 @@ public:
  */
 
 
-class FlatCurveEditor : public CurveEditor
+class FlatCurveEditor final : public CurveEditor
 {
     friend class FlatCurveEditorSubGroup;
 

rtgui/curveeditorgroup.cc

@@ -24,6 +24,7 @@
 #include "diagonalcurveeditorsubgroup.h"
 #include "flatcurveeditorsubgroup.h"
 #include "multilangmgr.h"
+#include "popuptogglebutton.h"
 #include "rtimage.h"
 #include "options.h"
 #include "pathutils.h"

rtgui/curveeditorgroup.h

@@ -41,7 +41,7 @@ class FlatCurveEditorSubGroup;
  * - to start a new line of curve button, use the 'newLine' method
  * - if you add more than one curve, you must add a "CurveEditor* ce" parameter to your listener
  */
-class CurveEditorGroup : public Gtk::Grid, public CurveListener
+class CurveEditorGroup final : public Gtk::Grid, public CurveListener
 {
 
     friend class CurveEditor;

rtgui/darkframe.h

@@ -41,7 +41,7 @@ public:
     // add other info here
 };
 
-class DarkFrame :
+class DarkFrame final:
     public ToolParamBlock,
     public FoldableToolPanel
 {

rtgui/defringe.cc

@@ -20,6 +20,8 @@
 #include <iomanip>
 
 #include "defringe.h"
+#include "curveeditor.h"
+#include "curveeditorgroup.h"
 #include "options.h"
 
 #include "../rtengine/color.h"

rtgui/defringe.h

@@ -22,12 +22,14 @@
 
 #include "adjuster.h"
 #include "colorprovider.h"
-#include "curveeditor.h"
+#include "curvelistener.h"
-#include "curveeditorgroup.h"
 #include "guiutils.h"
 #include "toolpanel.h"
 
-class Defringe :
+class CurveEditorGroup;
+class FlatCurveEditor;
+
+class Defringe final :
     public ToolParamBlock,
     public AdjusterListener,
     public FoldableToolPanel,

rtgui/dehaze.h

@@ -23,7 +23,7 @@
 #include "adjuster.h"
 #include "toolpanel.h"
 
-class Dehaze: public ToolParamBlock, public AdjusterListener, public FoldableToolPanel
+class Dehaze final : public ToolParamBlock, public AdjusterListener, public FoldableToolPanel
 {
 private:
     Adjuster *strength;

rtgui/diagonalcurveeditorsubgroup.cc

@@ -32,6 +32,7 @@
 #include "diagonalcurveeditorsubgroup.h"
 #include "rtimage.h"
 #include "options.h"
+#include "popuptogglebutton.h"
 
 #include "../rtengine/curves.h"
 

rtgui/dirpyrdenoise.cc

@@ -21,6 +21,8 @@
 
 #include "dirpyrdenoise.h"
 
+#include "curveeditor.h"
+#include "curveeditorgroup.h"
 #include "editbuffer.h"
 #include "guiutils.h"
 #include "options.h"

rtgui/dirpyrdenoise.h

@@ -22,11 +22,13 @@
 
 #include "adjuster.h"
 #include "colorprovider.h"
-#include "curveeditor.h"
+#include "curvelistener.h"
-#include "curveeditorgroup.h"
 #include "guiutils.h"
 #include "toolpanel.h"
 
+class CurveEditor;
+class CurveEditorGroup;
+class FlatCurveEditor;
 class EditDataProvider;
 
 class DirPyrDenoise final :

rtgui/dirpyrequalizer.h

@@ -25,7 +25,7 @@
 #include "thresholdadjuster.h"
 #include "toolpanel.h"
 
-class DirPyrEqualizer :
+class DirPyrEqualizer final :
     public ToolParamBlock,
     public ThresholdAdjusterListener,
     public AdjusterListener,

rtgui/distortion.h

@@ -24,7 +24,7 @@
 #include "lensgeomlistener.h"
 #include "toolpanel.h"
 
-class Distortion :
+class Distortion final :
     public ToolParamBlock,
     public AdjusterListener,
     public FoldableToolPanel

rtgui/editbuffer.h

@@ -19,9 +19,14 @@
 #pragma once
 
 #include "editid.h"
-#include "../rtengine/coord.h"
 #include <cairomm/cairomm.h>
 
+namespace rtengine {
+
+struct Coord;
+
+}
+
 class EditDataProvider;
 class EditSubscriber;
 

rtgui/editorpanel.cc

@@ -24,6 +24,7 @@
 #include "../rtengine/imagesource.h"
 #include "../rtengine/iccstore.h"
 #include "batchqueue.h"
+#include "batchqueueentry.h"
 #include "soundman.h"
 #include "rtimage.h"
 #include "rtwindow.h"

rtgui/editorpanel.h

@@ -21,7 +21,6 @@
 
 #include <gtkmm.h>
 
-#include "batchqueueentry.h"
 #include "filepanel.h"
 #include "histogrampanel.h"
 #include "history.h"
@@ -35,7 +34,9 @@
 #include "../rtengine/noncopyable.h"
 #include "../rtengine/rtengine.h"
 
+class BatchQueueEntry;
 class EditorPanel;
+class FilePanel;
 class MyProgressBar;
 class Thumbnail;
 class ToolPanelCoordinator;

rtgui/epd.h

@@ -23,7 +23,7 @@
 #include "adjuster.h"
 #include "toolpanel.h"
 
-class EdgePreservingDecompositionUI :
+class EdgePreservingDecompositionUI final :
     public ToolParamBlock,
     public AdjusterListener,
     public FoldableToolPanel

rtgui/fattaltonemap.h

@@ -23,7 +23,7 @@
 #include "adjuster.h"
 #include "toolpanel.h"
 
-class FattalToneMapping: public ToolParamBlock, public AdjusterListener, public FoldableToolPanel
+class FattalToneMapping final : public ToolParamBlock, public AdjusterListener, public FoldableToolPanel
 {
 protected:
     Adjuster *threshold;

rtgui/filebrowserentry.cc

@@ -21,6 +21,7 @@
 #include <cstring>
 #include <iomanip>
 
+#include "cropguilistener.h"
 #include "cursormanager.h"
 #include "guiutils.h"
 #include "inspector.h"
@@ -28,6 +29,7 @@
 #include "threadutils.h"
 #include "thumbbrowserbase.h"
 #include "thumbnail.h"
+#include "toolbar.h"
 
 #include "../rtengine/procparams.h"
 

rtgui/filecatalog.cc

@@ -36,6 +36,7 @@
 #include "renamedlg.h"
 #include "thumbimageupdater.h"
 #include "batchqueue.h"
+#include "batchqueueentry.h"
 #include "placesbrowser.h"
 #include "pathutils.h"
 #include "thumbnail.h"

rtgui/filethumbnailbuttonset.h

@@ -22,7 +22,6 @@
 
 #include <gtkmm.h>
 
-#include "filebrowserentry.h"
 #include "lwbuttonset.h"
 
 class FileBrowserEntry;

rtgui/filmnegative.h

@@ -26,7 +26,6 @@
 #include "editcallbacks.h"
 #include "guiutils.h"
 #include "toolpanel.h"
-#include "wbprovider.h"
 
 class FilmNegProvider
 {
@@ -36,7 +35,7 @@ public:
     virtual bool getFilmNegativeExponents(rtengine::Coord spotA, rtengine::Coord spotB, std::array<float, 3>& newExps) = 0;
 };
 
-class FilmNegative :
+class FilmNegative final :
     public ToolParamBlock,
     public AdjusterListener,
     public FoldableToolPanel,

rtgui/filmsimulation.h

@@ -10,7 +10,7 @@
 #include "guiutils.h"
 #include "toolpanel.h"
 
-class ClutComboBox :
+class ClutComboBox final :
     public MyComboBox
 {
 public:

rtgui/flatcurveeditorsubgroup.cc

@@ -33,6 +33,7 @@
 #include "flatcurveeditorsubgroup.h"
 #include "rtimage.h"
 #include "options.h"
+#include "popuptogglebutton.h"
 
 #include "../rtengine/curves.h"
 

rtgui/flatfield.h

@@ -42,7 +42,7 @@ public:
     // add other info here
 };
 
-class FlatField : public ToolParamBlock, public AdjusterListener, public FoldableToolPanel, public rtengine::FlatFieldAutoClipListener
+class FlatField final : public ToolParamBlock, public AdjusterListener, public FoldableToolPanel, public rtengine::FlatFieldAutoClipListener
 {
 
 protected:

rtgui/gradient.h

@@ -10,7 +10,7 @@
 #include "guiutils.h"
 #include "toolpanel.h"
 
-class Gradient :
+class Gradient final :
     public ToolParamBlock,
     public AdjusterListener,
     public FoldableToolPanel,

rtgui/hsvequalizer.cc

@@ -18,6 +18,8 @@
  */
 #include "hsvequalizer.h"
 
+#include "curveeditor.h"
+#include "curveeditorgroup.h"
 #include "options.h"
 
 #include "../rtengine/color.h"

rtgui/hsvequalizer.h

@@ -22,12 +22,15 @@
 
 #include "adjuster.h"
 #include "colorprovider.h"
-#include "curveeditor.h"
+#include "curvelistener.h"
-#include "curveeditorgroup.h"
 #include "guiutils.h"
 #include "toolpanel.h"
 
-class HSVEqualizer :
+class CurveEditor;
+class CurveEditorGroup;
+class FlatCurveEditor;
+
+class HSVEqualizer final :
     public ToolParamBlock,
     public FoldableToolPanel,
     public CurveListener,

rtgui/icmpanel.h

@@ -36,7 +36,7 @@ public:
     virtual void saveInputICCReference(const Glib::ustring& fname, bool apply_wb) = 0;
 };
 
-class ICMPanel :
+class ICMPanel final :
     public ToolParamBlock,
     public AdjusterListener,
     public FoldableToolPanel

rtgui/imageareatoollistener.h

@@ -18,10 +18,9 @@
  */
 #pragma once
 
-#include "cropguilistener.h"
+class CropGUIListener;
-#include "toolbar.h"
-
 class Thumbnail;
+class ToolBar;
 class ImageAreaToolListener
 {
 

rtgui/impulsedenoise.h

@@ -23,7 +23,7 @@
 #include "adjuster.h"
 #include "toolpanel.h"
 
-class ImpulseDenoise :
+class ImpulseDenoise final :
     public ToolParamBlock,
     public AdjusterListener,
     public FoldableToolPanel

rtgui/labcurve.cc

@@ -20,6 +20,8 @@
 
 #include "labcurve.h"
 
+#include "curveeditor.h"
+#include "curveeditorgroup.h"
 #include "options.h"
 
 #include "../rtengine/color.h"

rtgui/labcurve.h

@@ -22,13 +22,15 @@
 
 #include "adjuster.h"
 #include "colorprovider.h"
-#include "curveeditor.h"
+#include "curvelistener.h"
-#include "curveeditorgroup.h"
 #include "toolpanel.h"
 
+class CurveEditorGroup;
+class DiagonalCurveEditor;
 class EditDataProvider;
+class FlatCurveEditor;
 
-class LCurve :
+class LCurve final :
     public ToolParamBlock,
     public AdjusterListener,
     public FoldableToolPanel,

rtgui/labgrid.h

@@ -43,7 +43,7 @@
 #include "toolpanel.h"
 
 
-class LabGridArea: public Gtk::DrawingArea, public BackBuffer {
+class LabGridArea final : public Gtk::DrawingArea, public BackBuffer {
 private:
     rtengine::ProcEvent evt;
     Glib::ustring evtMsg;

rtgui/lensgeom.h

@@ -23,7 +23,7 @@
 #include "lensgeomlistener.h"
 #include "toolpanel.h"
 
-class LensGeometry :
+class LensGeometry final :
     public ToolParamBlock,
     public FoldableToolPanel
 {

rtgui/lensprofile.h

@@ -21,7 +21,6 @@
 #include <gtkmm.h>
 
 #include "guiutils.h"
-#include "lensgeom.h"
 #include "toolpanel.h"
 
 class LensProfilePanel final :

rtgui/localcontrast.h

@@ -23,7 +23,7 @@
 #include "adjuster.h"
 #include "toolpanel.h"
 
-class LocalContrast: public ToolParamBlock, public AdjusterListener, public FoldableToolPanel
+class LocalContrast final : public ToolParamBlock, public AdjusterListener, public FoldableToolPanel
 {
 private:
     Adjuster *radius;

rtgui/pcvignette.h

@@ -8,7 +8,7 @@
 #include "adjuster.h"
 #include "toolpanel.h"
 
-class PCVignette :
+class PCVignette final :
     public ToolParamBlock,
     public AdjusterListener,
     public FoldableToolPanel

rtgui/perspective.h

@@ -23,7 +23,7 @@
 #include "adjuster.h"
 #include "toolpanel.h"
 
-class PerspCorrection :
+class PerspCorrection final :
     public ToolParamBlock,
     public AdjusterListener,
     public FoldableToolPanel

rtgui/pparamschangelistener.h

@@ -18,10 +18,14 @@
  */
 #pragma once
 
-#include <glibmm/ustring.h>
-
 struct ParamsEdited;
 
+namespace Glib
+{
+
+class ustring;
+
+}
 namespace rtengine
 {
 

rtgui/preprocess.h

@@ -24,7 +24,7 @@
 #include "guiutils.h"
 #include "toolpanel.h"
 
-class PreProcess :
+class PreProcess final :
     public ToolParamBlock,
     public AdjusterListener,
     public FoldableToolPanel

rtgui/profilechangelistener.h

@@ -18,8 +18,12 @@
  */
 #pragma once
 
-#include <glibmm/ustring.h>
+namespace Glib
+{
 
+class ustring;
+
+}
 
 namespace rtengine
 {

rtgui/prsharpening.h

@@ -24,7 +24,7 @@
 #include "thresholdadjuster.h"
 #include "toolpanel.h"
 
-class PrSharpening :
+class PrSharpening final :
     public ToolParamBlock,
     public ThresholdAdjusterListener,
     public AdjusterListener,

rtgui/rawcacorrection.h

@@ -24,7 +24,7 @@
 #include "checkbox.h"
 #include "toolpanel.h"
 
-class RAWCACorr :
+class RAWCACorr final:
     public ToolParamBlock,
     public AdjusterListener,
     public CheckBoxListener,

rtgui/rawexposure.h

@@ -23,7 +23,7 @@
 #include "adjuster.h"
 #include "toolpanel.h"
 
-class RAWExposure :
+class RAWExposure final:
     public ToolParamBlock,
     public AdjusterListener,
     public FoldableToolPanel
@@ -32,8 +32,6 @@ class RAWExposure :
 protected:
     Adjuster* PexPos;
 
-private:
-//  Gtk::CheckButton*  PextwoGreen;
 public:
 
     RAWExposure ();

rtgui/retinex.cc

@@ -2,6 +2,9 @@
  *  This file is part of RawTherapee.
  */
 #include "retinex.h"
+
+#include "curveeditor.h"
+#include "curveeditorgroup.h"
 #include "mycurve.h"
 #include "rtimage.h"
 #include "options.h"

rtgui/retinex.h

@@ -7,13 +7,18 @@
 
 #include "adjuster.h"
 #include "colorprovider.h"
-#include "curveeditor.h"
+#include "curvelistener.h"
 #include "curveeditorgroup.h"
 #include "guiutils.h"
 #include "thresholdadjuster.h"
 #include "toolpanel.h"
 
-class Retinex :
+class CurveEditor;
+class CurveEditorGroup;
+class DiagonalCurveEditor;
+class FlatCurveEditor;
+
+class Retinex final :
     public ToolParamBlock,
     public FoldableToolPanel,
     public rtengine::RetinexListener,

rtgui/rgbcurves.cc

@@ -18,6 +18,8 @@
  */
 #include "rgbcurves.h"
 
+#include "curveeditor.h"
+#include "curveeditorgroup.h"
 #include "options.h"
 
 #include "../rtengine/procparams.h"

rtgui/rgbcurves.h

@@ -22,11 +22,13 @@
 
 #include "adjuster.h"
 #include "colorprovider.h"
-#include "curveeditor.h"
+#include "curvelistener.h"
-#include "curveeditorgroup.h"
 #include "toolpanel.h"
 
-class RGBCurves :
+class CurveEditorGroup;
+class DiagonalCurveEditor;
+
+class RGBCurves final :
     public ToolParamBlock,
     public FoldableToolPanel,
     public CurveListener,

rtgui/rotate.cc

@@ -21,6 +21,7 @@
 #include "rotate.h"
 
 #include "guiutils.h"
+#include "lensgeomlistener.h"
 #include "rtimage.h"
 
 #include "../rtengine/procparams.h"

rtgui/rotate.h

@@ -21,10 +21,10 @@
 #include <gtkmm.h>
 
 #include "adjuster.h"
-#include "lensgeomlistener.h"
 #include "toolpanel.h"
 
-class Rotate :
+class LensGeomListener;
+class Rotate final :
     public ToolParamBlock,
     public AdjusterListener,
     public FoldableToolPanel

rtgui/rtwindow.cc

@@ -29,6 +29,7 @@
 #include "whitebalance.h"
 #include "../rtengine/settings.h"
 #include "batchqueuepanel.h"
+#include "batchqueueentry.h"
 #include "editorpanel.h"
 #include "filepanel.h"
 #include "filmsimulation.h"

rtgui/sensorbayer.h

@@ -22,7 +22,7 @@
 
 #include "toolpanel.h"
 
-class SensorBayer :
+class SensorBayer final :
     public ToolParamBlock,
     public FoldableToolPanel
 {

rtgui/sensorxtrans.h

@@ -22,7 +22,7 @@
 
 #include "toolpanel.h"
 
-class SensorXTrans :
+class SensorXTrans final:
     public ToolParamBlock,
     public FoldableToolPanel
 {

rtgui/shadowshighlights.h

@@ -23,7 +23,7 @@
 #include "adjuster.h"
 #include "toolpanel.h"
 
-class ShadowsHighlights :
+class ShadowsHighlights final :
     public ToolParamBlock,
     public AdjusterListener,
     public FoldableToolPanel

rtgui/sharpenedge.h

@@ -28,7 +28,7 @@
 #include "adjuster.h"
 #include "toolpanel.h"
 
-class SharpenEdge :
+class SharpenEdge final :
     public ToolParamBlock,
     public AdjusterListener,
     public FoldableToolPanel

rtgui/sharpening.h

@@ -24,7 +24,7 @@
 #include "thresholdadjuster.h"
 #include "toolpanel.h"
 
-class Sharpening :
+class Sharpening final:
     public ToolParamBlock,
     public ThresholdAdjusterListener,
     public AdjusterListener,

rtgui/sharpenmicro.h

@@ -28,7 +28,7 @@
 #include "adjuster.h"
 #include "toolpanel.h"
 
-class SharpenMicro :
+class SharpenMicro final :
     public ToolParamBlock,
     public AdjusterListener,
     public FoldableToolPanel

rtgui/softlight.h

@@ -23,7 +23,7 @@
 #include "adjuster.h"
 #include "toolpanel.h"
 
-class SoftLight: public ToolParamBlock, public AdjusterListener, public FoldableToolPanel
+class SoftLight final : public ToolParamBlock, public AdjusterListener, public FoldableToolPanel
 {
 private:
     Adjuster *strength;

rtgui/thumbbrowserbase.cc

@@ -23,6 +23,7 @@
 #include "options.h"
 #include "rtscalable.h"
 #include "thumbbrowserbase.h"
+#include "thumbbrowserentrybase.h"
 
 #include "../rtengine/rt_math.h"
 

rtgui/thumbbrowserbase.h

@@ -24,13 +24,13 @@
 
 #include "guiutils.h"
 #include "options.h"
-#include "thumbbrowserentrybase.h"
 
 /*
  * Class handling the list of ThumbBrowserEntry objects and their position in it's allocated space
  */
 
 class Inspector;
+class ThumbBrowserEntryBase;
 
 class ThumbBrowserBase :
     public Gtk::Grid

rtgui/thumbimageupdater.cc

@@ -23,6 +23,7 @@
 #include <gtkmm.h>
 
 #include "thumbimageupdater.h"
+#include "thumbbrowserentrybase.h"
 
 #include "guiutils.h"
 #include "threadutils.h"

rtgui/thumbimageupdater.h

@@ -20,7 +20,6 @@
 
 #include <glib.h>
 
-#include "thumbbrowserentrybase.h"
 
 #include "../rtengine/noncopyable.h"
 
@@ -36,6 +35,9 @@ namespace procparams
 }
 
 }
+
+class ThumbBrowserEntryBase;
+
 class ThumbImageUpdateListener
 {
 public:

rtgui/tonecurve.cc

@@ -23,6 +23,8 @@
 #include "tonecurve.h"
 
 #include "adjuster.h"
+#include "curveeditor.h"
+#include "curveeditorgroup.h"
 #include "eventmapper.h"
 #include "ppversion.h"
 #include "options.h"

rtgui/tonecurve.h

@@ -21,14 +21,16 @@
 #include <gtkmm.h>
 
 #include "adjuster.h"
-#include "curveeditor.h"
+#include "curvelistener.h"
-#include "curveeditorgroup.h"
 #include "guiutils.h"
 #include "toolpanel.h"
 
+class CurveEditor;
+class CurveEditorGroup;
+class DiagonalCurveEditor;
 class EditDataProvider;
 
-class ToneCurve :
+class ToneCurve final :
     public ToolParamBlock,
     public AdjusterListener,
     public FoldableToolPanel,

rtgui/toolbar.h

@@ -37,7 +37,7 @@ public:
     virtual void editModeSwitchedOff() = 0;
 };
 
-class ToolBar : public Gtk::HBox
+class ToolBar final : public Gtk::HBox
 {
 private:
     std::unique_ptr<RTImage> handimg;

rtgui/toolpanel.h

@@ -41,9 +41,6 @@ class ProcParams;
 }
 }
 
-class FoldableToolPanel;
-class ToolPanel;
-
 class ToolPanelListener
 {
 public:

rtgui/toolpanelcoord.cc

@@ -21,6 +21,7 @@
 #include "metadatapanel.h"
 #include "options.h"
 #include "rtimage.h"
+
 #include "../rtengine/imagesource.h"
 #include "../rtengine/dfmanager.h"
 #include "../rtengine/ffmanager.h"

rtgui/vibrance.cc

@@ -18,6 +18,9 @@
  */
 
 #include "vibrance.h"
+
+#include "curveeditor.h"
+#include "curveeditorgroup.h"
 #include "options.h"
 #include "../rtengine/color.h"
 

rtgui/vibrance.h

@@ -21,12 +21,14 @@
 #include <gtkmm.h>
 
 #include "adjuster.h"
-#include "curveeditor.h"
+#include "curvelistener.h"
-#include "curveeditorgroup.h"
 #include "thresholdadjuster.h"
 #include "toolpanel.h"
 
-class Vibrance :
+class CurveEditorGroup;
+class DiagonalCurveEditor;
+
+class Vibrance final :
     public ToolParamBlock,
     public AdjusterListener,
     public ThresholdCurveProvider,

rtgui/vignetting.h

@@ -23,7 +23,7 @@
 #include "adjuster.h"
 #include "toolpanel.h"
 
-class Vignetting :
+class Vignetting final :
     public ToolParamBlock,
     public AdjusterListener,
     public FoldableToolPanel

rtgui/wavelet.cc

@@ -20,6 +20,8 @@
 #include "wavelet.h"
 #include <cmath>
 
+#include "curveeditor.h"
+#include "curveeditorgroup.h"
 #include "editcallbacks.h"
 #include "guiutils.h"
 #include "rtimage.h"

rtgui/wavelet.h

@@ -22,15 +22,18 @@
 #include <gtkmm.h>
 #include "adjuster.h"
 #include "toolpanel.h"
-#include "curveeditor.h"
+#include "curvelistener.h"
-#include "curveeditorgroup.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,

rtgui/whitebalance.h

@@ -35,7 +35,7 @@ public:
     virtual void spotWBRequested(int size) = 0;
 };
 
-class WhiteBalance : public ToolParamBlock, public AdjusterListener, public FoldableToolPanel, public rtengine::AutoWBListener
+class WhiteBalance final : public ToolParamBlock, public AdjusterListener, public FoldableToolPanel, public rtengine::AutoWBListener
 {
 
     enum WB_LabelType {

rtgui/xtransprocess.h

@@ -25,7 +25,7 @@
 #include "guiutils.h"
 #include "toolpanel.h"
 
-class XTransProcess :
+class XTransProcess final :
     public ToolParamBlock,
     public AdjusterListener,
     public CheckBoxListener,

rtgui/xtransrawexposure.h

@@ -23,7 +23,7 @@
 #include "adjuster.h"
 #include "toolpanel.h"
 
-class XTransRAWExposure :
+class XTransRAWExposure final :
     public ToolParamBlock,
     public AdjusterListener,
     public FoldableToolPanel